From a086e52e59f2dc2f6746dcbd86830ed785b66a1f Mon Sep 17 00:00:00 2001 From: Annamalai Sekar Date: Tue, 10 Oct 2023 15:14:09 -0500 Subject: [PATCH 1/4] Add AmazonPrometheusRemoteWriteAccess policy to stepfnlambdaexecutionrole --- PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts b/PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts index db0f5358..28c4a639 100644 --- a/PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts +++ b/PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts @@ -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') ] }); From 15d9621e77162696cc8758c9658717622cab99e7 Mon Sep 17 00:00:00 2001 From: Imaya Kumar Jagannathan Date: Mon, 2 Oct 2023 20:04:56 -0400 Subject: [PATCH 2/4] dotnet7 --- PetAdoptions/petsite/petsite/Dockerfile | 4 +- PetAdoptions/petsite/petsite/PetSite.csproj | 42 ++++++++++----------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/PetAdoptions/petsite/petsite/Dockerfile b/PetAdoptions/petsite/petsite/Dockerfile index 35eeb724..04a9114b 100644 --- a/PetAdoptions/petsite/petsite/Dockerfile +++ b/PetAdoptions/petsite/petsite/Dockerfile @@ -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" diff --git a/PetAdoptions/petsite/petsite/PetSite.csproj b/PetAdoptions/petsite/petsite/PetSite.csproj index 548e3eac..463932d2 100644 --- a/PetAdoptions/petsite/petsite/PetSite.csproj +++ b/PetAdoptions/petsite/petsite/PetSite.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 a80ee246-1735-4630-bd6a-0fd3d01d8e35 Linux @@ -15,31 +15,29 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + From 32d251e44e282e195db8d1a0386f459aa79e0bfa Mon Sep 17 00:00:00 2001 From: Imaya Kumar Jagannathan Date: Tue, 3 Oct 2023 11:57:55 -0400 Subject: [PATCH 3/4] revert dependencies --- PetAdoptions/petsite/petsite/PetSite.csproj | 40 +++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/PetAdoptions/petsite/petsite/PetSite.csproj b/PetAdoptions/petsite/petsite/PetSite.csproj index 463932d2..39b93b2d 100644 --- a/PetAdoptions/petsite/petsite/PetSite.csproj +++ b/PetAdoptions/petsite/petsite/PetSite.csproj @@ -15,29 +15,31 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + + From 51d0e6b6a50a9d7ac1c876bfb56c8a7af76141d9 Mon Sep 17 00:00:00 2001 From: Imaya Kumar Jagannathan Date: Tue, 3 Oct 2023 16:45:36 -0400 Subject: [PATCH 4/4] update deps --- PetAdoptions/petsite/petsite/PetSite.csproj | 40 ++++++++++----------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/PetAdoptions/petsite/petsite/PetSite.csproj b/PetAdoptions/petsite/petsite/PetSite.csproj index 39b93b2d..463932d2 100644 --- a/PetAdoptions/petsite/petsite/PetSite.csproj +++ b/PetAdoptions/petsite/petsite/PetSite.csproj @@ -15,31 +15,29 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + +