Merge pull request #820 from aws/dev

chore: release 1.19
aws · Mar 21, 2024 · 741dff6 · 741dff6
2 parents 5505e40 + 7e89e1d
commit 741dff6
Show file tree

Hide file tree

Showing 24 changed files with 112 additions and 107 deletions.
diff --git a/.github/workflows/DetectCDKBootstrapVersionChanges.yml b/.github/workflows/DetectCDKBootstrapVersionChanges.yml
@@ -3,10 +3,8 @@ name: Detect CDK Bootstrap Version Changes
 on: [pull_request]
 
 jobs:
-  build:
-
+  detect-cdk-bootstrap-changes:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
       with:
@@ -17,11 +15,11 @@ jobs:
     - name: Get Staging Bucket Update/Replace Policy
       id: stagingBucketUpdateReplacePolicy
       run: |
-        echo "::set-output name=update-replace-policy::$(yq '.Resources.StagingBucket.UpdateReplacePolicy' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')"
+        echo "update-replace-policy=$(yq '.Resources.StagingBucket.UpdateReplacePolicy' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')" >> $GITHUB_OUTPUT
     - name: Get Staging Bucket Deletion Policy
       id: stagingBucketDeletionPolicy
       run: |
-        echo "::set-output name=deletion-policy::$(yq '.Resources.StagingBucket.DeletionPolicy' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')"
+        echo "deletion-policy=$(yq '.Resources.StagingBucket.DeletionPolicy' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')" >> $GITHUB_OUTPUT
     - name: Fail If Update/Replace Policy Not 'Delete'
       if: steps.stagingBucketUpdateReplacePolicy.outputs.update-replace-policy != 'Delete'
       run: |
@@ -38,11 +36,11 @@ jobs:
     - name: Get Latest CDK Bootstrap Version
       id: latestBootstrapVersion
       run: |
-        echo "::set-output name=latest-version::$(yq '.Resources.CdkBootstrapVersion.Properties.Value' 'newTemplate.yml')"
+        echo "latest-version=$(yq '.Resources.CdkBootstrapVersion.Properties.Value' 'newTemplate.yml')" >> $GITHUB_OUTPUT
     - name: Get Current CDK Bootstrap Version
       id: currentBootstrapVersion
       run: |
-        echo "::set-output name=current-version::$(yq '.Resources.CdkBootstrapVersion.Properties.Value' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')"
+        echo "current-version=$(yq '.Resources.CdkBootstrapVersion.Properties.Value' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')" >> $GITHUB_OUTPUT
     - name: Fail If CDK Bootstrap Template Changes Detected
       if: steps.currentBootstrapVersion.outputs.current-version != steps.latestBootstrapVersion.outputs.latest-version
       run: |

diff --git a/.github/workflows/DetectDocGeneratorChanges.yml b/.github/workflows/DetectDocGeneratorChanges.yml
@@ -6,10 +6,8 @@ permissions:
   id-token: write
 
 jobs:
-  build:
-
+  detect-documentation-changes:
     runs-on: ubuntu-latest
-
     steps:
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4

diff --git a/.github/workflows/DetectRestAPIClientChanges.yml b/.github/workflows/DetectRestAPIClientChanges.yml
@@ -3,10 +3,8 @@ name: Detect Rest API Client Changes
 on: [pull_request]
 
 jobs:
-  build:
-
+  detect-restapi-client-changes:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
       with:

diff --git a/.github/workflows/closed-issue-message.yml b/.github/workflows/closed-issue-message.yml
@@ -1,17 +1,15 @@
-name: Closed Issue Message
-on:
-    issues:
-       types: [closed]
-jobs:
-    auto_comment:
-        runs-on: ubuntu-latest
-        steps:
-        - uses: aws-actions/closed-issue-message@v1
-          with:
-            # These inputs are both required
-            repo-token: "${{ secrets.GITHUB_TOKEN }}"
-            message: |
-                     ### ⚠️COMMENT VISIBILITY WARNING⚠️ 
-                     Comments on closed issues are hard for our team to see. 
-                     If you need more assistance, please either tag a team member or open a new issue that references this one. 
-                     If you wish to keep having a conversation with other community members under this issue feel free to do so.
+name: Closed Issue Message
+on:
+    issues:
+       types: [closed]
+jobs:
+    auto_comment:
+        runs-on: ubuntu-latest
+        steps:
+        - uses: aws-actions/closed-issue-message@v1
+          with:
+            # These inputs are both required
+            repo-token: "${{ secrets.GITHUB_TOKEN }}"
+            message: |
+              This issue is now closed. Comments on closed issues are hard for our team to see.
+              If you need more assistance, please open a new issue that references this one.
diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml
@@ -16,7 +16,7 @@ permissions:
   id-token: write
 
 jobs:
-  build:
+  run-integration-tests:
     runs-on: ubuntu-latest
     steps:
       - name: Configure AWS Credentials
@@ -35,7 +35,7 @@ jobs:
         id: lambda
         shell: pwsh
         run: |
-          aws lambda invoke response.json --function-name "${{ secrets.CI_TESTING_LOAD_BALANCER_LAMBDA_NAME }}" --cli-binary-format raw-in-base64-out --payload '{\"Roles\": \"${{ secrets.CI_TEST_RUNNER_ACCOUNT_ROLES }}\", \"ProjectName\": \"${{ secrets.CI_TESTING_CODE_BUILD_PROJECT_NAME }}\", \"Branch\": \"${{ github.sha }}\"}'
+          aws lambda invoke response.json --function-name "${{ secrets.CI_TESTING_LOAD_BALANCER_LAMBDA_NAME }}" --cli-binary-format raw-in-base64-out --payload '{"Roles": "${{ secrets.CI_TEST_RUNNER_ACCOUNT_ROLES }}", "ProjectName": "${{ secrets.CI_TESTING_CODE_BUILD_PROJECT_NAME }}", "Branch": "${{ github.sha }}"}'
           $roleArn=$(cat ./response.json)
           "roleArn=$($roleArn -replace '"', '')" >> $env:GITHUB_OUTPUT
 

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -25,7 +25,7 @@ jobs:
       id: read-current-version
       run: |
         version=$(jq -r ".version" version.json)
-        echo "::set-output name=VERSION::$version"
+        echo "VERSION=$version" >> $GITHUB_OUTPUT
 
     - name: Pull Request
       id: pull-request
@@ -52,7 +52,7 @@ jobs:
         version=$(jq -r .version version.json)
         major=$(echo $version | awk '{split($0, components, "."); print components[1]}')
         minor=$(echo $version | awk '{split($0, components, "."); print components[2]+1}')
-        echo "::set-output name=VERSION::$major.$minor"
+        echo "VERSION=$major.$minor" >> $GITHUB_OUTPUT
 
     - name: Commit and Push next version
       id: commit-push
@@ -66,7 +66,7 @@ jobs:
         git add version.json
         git commit -m "build: version bump to ${{ steps.build-next-version.outputs.VERSION }}"
         git push origin $branch
-        echo "::set-output name=BRANCH::$branch"
+        echo "BRANCH=$branch" >> $GITHUB_OUTPUT
 
     - name: pull-request
       uses: repo-sync/pull-request@v2

diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml
@@ -1,55 +1,55 @@
-name: "Close stale issues"
-
-# Controls when the action will run.
-on:
-  schedule:
-  - cron: "0 0/3 * * *"
-
-jobs:
-  cleanup:
-    name: Stale issue job
-    runs-on: ubuntu-latest
-    steps:
-    - uses: aws-actions/stale-issue-cleanup@v6
-      with:
-        # Setting messages to an empty string will cause the automation to skip
-        # that category
-        ancient-issue-message: This is a very old issue that is probably not getting as much
-          attention as it deserves. We encourage you to check if this is still an issue in
-          the latest release and if you find that this is still a problem, please feel free
-          to provide a comment or open a new issue.
-        stale-issue-message: It looks like this issue has not been active for more than 5 days.
-          In the absence of more information, we will be closing this issue soon. If you find
-          that this is still a problem, please add a comment to prevent automatic closure, or
-          if the issue is already closed please feel free to reopen it.
-        stale-pr-message: It looks like this PR has not been active for more than five days. In
-          the absence of more information, we will be closing this PR soon. Please add a
-          comment to prevent automatic closure, or if the PR is already closed please feel
-          free to open a new one.
-
-        # These labels are required
-        stale-issue-label: closing-soon
-        exempt-issue-labels: no-auto-closure
-        stale-pr-label: closing-soon
-        exempt-pr-labels: pr/needs-review
-        response-requested-label: response-requested
-
-        # Don't set closed-for-staleness label to skip closing very old issues
-        # regardless of label
-        closed-for-staleness-label: closed-for-staleness
-
-        # Issue timing
-        days-before-stale: 5
-        days-before-close: 2
-        days-before-ancient: 36500
-
-        # If you don't want to mark a issue as being ancient based on a
-        # threshold of "upvotes", you can set this here. An "upvote" is
-        # the total number of +1, heart, hooray, and rocket reactions
-        # on an issue.
-        minimum-upvotes-to-exempt: 1
-
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        #loglevel: DEBUG
-        # Set dry-run to true to not perform label or close actions.
-        #dry-run: true
+name: "Close stale issues"
+
+# Controls when the action will run.
+on:
+  schedule:
+  - cron: "0 0/3 * * *"
+
+jobs:
+  cleanup:
+    name: Stale issue job
+    runs-on: ubuntu-latest
+    steps:
+    - uses: aws-actions/stale-issue-cleanup@v6
+      with:
+        # Setting messages to an empty string will cause the automation to skip
+        # that category
+        ancient-issue-message: This is a very old issue that is probably not getting as much
+          attention as it deserves. We encourage you to check if this is still an issue in
+          the latest release and if you find that this is still a problem, please feel free
+          to provide a comment or open a new issue.
+        stale-issue-message: It looks like this issue has not been active for more than 5 days.
+          In the absence of more information, we will be closing this issue soon. If you find
+          that this is still a problem, please add a comment to prevent automatic closure, or
+          if the issue is already closed please feel free to reopen it.
+        stale-pr-message: It looks like this PR has not been active for more than five days. In
+          the absence of more information, we will be closing this PR soon. Please add a
+          comment to prevent automatic closure, or if the PR is already closed please feel
+          free to open a new one.
+
+        # These labels are required
+        stale-issue-label: closing-soon
+        exempt-issue-labels: no-auto-closure
+        stale-pr-label: closing-soon
+        exempt-pr-labels: pr/needs-review
+        response-requested-label: response-requested
+
+        # Don't set closed-for-staleness label to skip closing very old issues
+        # regardless of label
+        closed-for-staleness-label: closed-for-staleness
+
+        # Issue timing
+        days-before-stale: 10
+        days-before-close: 4
+        days-before-ancient: 36500
+
+        # If you don't want to mark a issue as being ancient based on a
+        # threshold of "upvotes", you can set this here. An "upvote" is
+        # the total number of +1, heart, hooray, and rocket reactions
+        # on an issue.
+        minimum-upvotes-to-exempt: 1
+
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        #loglevel: DEBUG
+        # Set dry-run to true to not perform label or close actions.
+        #dry-run: true
diff --git 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.CLI/Commands/TypeHints/ExistingSecurityGroupsCommand.cs b/src/AWS.Deploy.CLI/Commands/TypeHints/ExistingSecurityGroupsCommand.cs
@@ -52,7 +52,7 @@ public async Task<TypeHintResourceTable> GetResources(Recommendation recommendat
 
             foreach (var securityGroup in securityGroups.OrderBy(securityGroup => securityGroup.VpcId))
             {
-                var row = new TypeHintResource(securityGroup.GroupId, securityGroup.GroupId);
+                var row = new TypeHintResource(securityGroup.GroupId, $"{securityGroup.GroupName} ({securityGroup.GroupId})");
                 row.ColumnValues.Add(securityGroup.GroupName);
                 row.ColumnValues.Add(securityGroup.GroupId);
                 row.ColumnValues.Add(securityGroup.VpcId);

diff --git a/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml b/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
@@ -501,6 +501,7 @@ Resources:
                 Effect: Allow
                 Action:
                   - ssm:GetParameter
+                  - ssm:GetParameters
                 Resource:
                   - Fn::Sub: arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter${CdkBootstrapVersion}
             Version: "2012-10-17"
@@ -584,7 +585,7 @@ Resources:
       Type: String
       Name:
         Fn::Sub: /cdk-bootstrap/${Qualifier}/version
-      Value: "19"
+      Value: "20"
 Outputs:
   BucketName:
     Description: The name of the S3 bucket owned by the CDK toolkit stack

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
@@ -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
@@ -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
@@ -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/...Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj b/...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/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/...pes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj b/...pes/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/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;

diff --git 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/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;

diff --git a/...pes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj b/...pes/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/...eploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj b/...eploy.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