Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump staging to main #254

Merged
merged 5 commits into from
Oct 12, 2023
Merged

Bump staging to main #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a086e52
Add AmazonPrometheusRemoteWriteAccess policy to stepfnlambdaexecution…
Oct 10, 2023
858c137
Merge branch 'main' into 'main'
Oct 11, 2023
15d9621
dotnet7
awsimaya Oct 3, 2023
32d251e
revert dependencies
awsimaya Oct 3, 2023
51d0e6b
update deps
awsimaya Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export class PetAdoptionsStepFn extends Construct {
iam.ManagedPolicy.fromManagedPolicyArn(this, 'second', 'arn:aws:iam::aws:policy/AmazonSSMReadOnlyAccess'),
iam.ManagedPolicy.fromManagedPolicyArn(this, 'third', 'arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess'),
iam.ManagedPolicy.fromManagedPolicyArn(this, 'fourth', 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
iam.ManagedPolicy.fromManagedPolicyArn(this, 'fifth', 'arn:aws:iam::aws:policy/CloudWatchLambdaInsightsExecutionRolePolicy')
iam.ManagedPolicy.fromManagedPolicyArn(this, 'fifth', 'arn:aws:iam::aws:policy/CloudWatchLambdaInsightsExecutionRolePolicy'),
iam.ManagedPolicy.fromManagedPolicyArn(this, 'sixth', 'arn:aws:iam::aws:policy/AmazonPrometheusRemoteWriteAccess')
]
});

Expand Down
4 changes: 2 additions & 2 deletions PetAdoptions/petsite/petsite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim AS base
FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim-amd64 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim-amd64 AS build
WORKDIR /src
COPY . .
RUN dotnet restore "PetSite.csproj"
Expand Down
42 changes: 20 additions & 22 deletions PetAdoptions/petsite/petsite/PetSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<UserSecretsId>a80ee246-1735-4630-bd6a-0fd3d01d8e35</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
Expand All @@ -15,31 +15,29 @@
<None Include="compilerconfig.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Amazon.Extensions.Configuration.SystemsManager" Version="2.0.0" />
<PackageReference Include="AWSSDK.Core" Version="3.5.2.3" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.101" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.5.1.36" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.5.9.6" />
<PackageReference Include="AWSSDK.SQS" Version="3.5.1.13" />
<PackageReference Include="AWSSDK.StepFunctions" Version="3.5.3.22" />
<PackageReference Include="AWSSDK.XRay" Version="3.5.4.29" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.5.1.44" />
<PackageReference Include="AWSXRayRecorder.Core" Version="2.10.1" />
<PackageReference Include="AWSXRayRecorder.Handlers.AspNetCore" Version="2.7.1" />
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.8.1" />
<PackageReference Include="AWSXRayRecorder.Handlers.System.Net" Version="2.7.1" />
<PackageReference Include="Amazon.Extensions.Configuration.SystemsManager" Version="6.0.0" />
<PackageReference Include="AWSSDK.Core" Version="3.7.202.18" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.7" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.200.49" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.201.4" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.200.50" />
<PackageReference Include="AWSSDK.StepFunctions" Version="3.7.200.49" />
<PackageReference Include="AWSSDK.XRay" Version="3.7.201.11" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.202" />
<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
<PackageReference Include="AWSXRayRecorder.Handlers.AspNetCore" Version="2.11.0" />
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
<PackageReference Include="AWSXRayRecorder.Handlers.System.Net" Version="2.11.0" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
<PackageReference Include="prometheus-net" Version="4.1.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="4.1.1" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="3.4.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
<PackageReference Include="prometheus-net" Version="8.0.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="PutParams.cs" />
Expand Down