From 6b2e896b3388e04a5cadcccacbff754963b7424f Mon Sep 17 00:00:00 2001
From: Alex Shovlin <shovlia@amazon.com>
Date: Fri, 8 Mar 2024 12:40:21 -0500
Subject: [PATCH 1/3] chore: Update the version of Amazon.CDK.Lib that is
referenced by the recipe CDK projects
---
THIRD_PARTY_LICENSES | 2 +-
.../AWS.Deploy.Recipes.CDK.Common.csproj | 2 +-
.../CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj | 2 +-
.../CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj | 2 +-
.../AspNetAppElasticBeanstalkLinux.csproj | 2 +-
.../AspNetAppElasticBeanstalkWindows.csproj | 2 +-
.../CdkTemplates/BlazorWasm/BlazorWasm.csproj | 2 +-
.../ConsoleAppECSFargateScheduleTask.csproj | 2 +-
.../ConsoleAppEcsFargateService.csproj | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES
index 006de2029..643a80768 100644
--- a/THIRD_PARTY_LICENSES
+++ b/THIRD_PARTY_LICENSES
@@ -21,7 +21,7 @@
** AWSSDK.ElasticLoadBalancingV2; version 3.7.201.27 -- https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/
** AWSSDK.Core; version 3.7.202.11 -- https://www.nuget.org/packages/AWSSDK.Core
** AWSSDK.CloudWatchLogs; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.CloudWatchLogs
-** Amazon.CDK.Lib; version 2.43.1 -- https://www.nuget.org/packages/Amazon.CDK.Lib/
+** Amazon.CDK.Lib; version 2.131.0 -- https://www.nuget.org/packages/Amazon.CDK.Lib/
Apache License
Version 2.0, January 2004
diff --git a/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj b/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj
index b583b8dde..cca2e6df5 100644
--- a/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj
+++ b/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj
@@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
</ItemGroup>
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj
index b0330fe93..f9eadfa62 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj
@@ -24,7 +24,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj
index 94a5adaa0..591ce57e9 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj
index e19155942..7095f9c56 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.200.42" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj
index e19155942..7095f9c56 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.200.42" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj
index d2825cbc0..c49ae4190 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj
index d2825cbc0..c49ae4190 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj
index d2825cbc0..c49ae4190 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<!-- CDK Construct Library dependencies -->
- <PackageReference Include="Amazon.CDK.Lib" Version="2.43.1" />
+ <PackageReference Include="Amazon.CDK.Lib" Version="2.131.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
From 69026ed84ac48c1db5bd4a28c5ad0de385b966c6 Mon Sep 17 00:00:00 2001
From: Alex Shovlin <shovlia@amazon.com>
Date: Mon, 11 Mar 2024 11:01:37 -0400
Subject: [PATCH 2/3] Replace deprecated CDK call
---
.../AspNetAppElasticBeanstalkLinux/Generated/Recipe.cs | 2 +-
.../AspNetAppElasticBeanstalkWindows/Generated/Recipe.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/Generated/Recipe.cs b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/Generated/Recipe.cs
index 6750e49ba..7c096d5d3 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/Generated/Recipe.cs
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/Generated/Recipe.cs
@@ -193,7 +193,7 @@ private string ConfigureApplication(Configuration settings)
ApplicationName = beanstalkApplicationName
}));
- ApplicationVersion.AddDependsOn(BeanstalkApplication);
+ ApplicationVersion.AddDependency(BeanstalkApplication);
}
return beanstalkApplicationName;
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/Generated/Recipe.cs b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/Generated/Recipe.cs
index 53250f788..e5c6eec3a 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/Generated/Recipe.cs
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/Generated/Recipe.cs
@@ -193,7 +193,7 @@ private string ConfigureApplication(Configuration settings)
ApplicationName = beanstalkApplicationName
}));
- ApplicationVersion.AddDependsOn(BeanstalkApplication);
+ ApplicationVersion.AddDependency(BeanstalkApplication);
}
return beanstalkApplicationName;
From db28b6477e0336582d479dd955f34c85904e167c Mon Sep 17 00:00:00 2001
From: Alex Shovlin <shovlia@amazon.com>
Date: Wed, 20 Mar 2024 15:40:18 -0400
Subject: [PATCH 3/3] fix: Configure permissions to allow CloudFront to write
to the access log S3 bucket when creating a new bucket for the Blazor
WebAssembly App recipe
---
.../CdkTemplates/BlazorWasm/Generated/Recipe.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs
index b207527f1..8b5718aab 100644
--- a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs
+++ b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs
@@ -132,6 +132,7 @@ private void ConfigureCloudFrontDistribution(Configuration settings)
var loggingBucket = new Bucket(this, nameof(AccessLoggingBucket), InvokeCustomizeCDKPropsEvent(nameof(AccessLoggingBucket), this, new BucketProps
{
RemovalPolicy = RemovalPolicy.RETAIN,
+ AccessControl = BucketAccessControl.LOG_DELIVERY_WRITE
}));
distributionProps.LogBucket = loggingBucket;