Merge branch 'main' into fix/#26811-fix-cross-region-import-secret-po…

…licy-arn
aws · Aug 23, 2023 · 8d94045 · 8d94045
2 parents 32c62f7 + 9b93635
commit 8d94045
Show file tree

Hide file tree

Showing 211 changed files with 20,929 additions and 2,251 deletions.
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -98,3 +98,8 @@ Owner: Core CDK team
 
 [repo-metrics.yml](repo-metrics.yml): GitHub action that runs monthly to report on metrics for issues and PRs created last month.
 Owner: Core CDK team
+
+### Contributors File
+
+[update-contributors.yml](update-contributors.yml): GitHub action that runs monthly to create a pull request for updating a CONTRIBUTORS file with the top contributors.
+Owner: Core CDK team
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@87697c0dca7dd44e37a2b79a79489332556ff1f3
+        uses: tj-actions/changed-files@a0585ff9904b77d046192a7846e59783d6ea287b
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
@@ -0,0 +1,31 @@
+
+name: Update CONTRIBUTORS file
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+jobs:
+  main:
+    # this workflow will always fail in forks; bail if this isn't running in the upstream
+    if: github.repository == 'aws/aws-cdk'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: minicli/action-contributors@v3.3
+        name: "Update a projects CONTRIBUTORS file"
+        env:
+          CONTRIB_REPOSITORY: 'aws/aws-cdk'
+          CONTRIB_OUTPUT_FILE: 'CONTRIBUTORS.md'
+      - name: Create a PR
+        uses: peter-evans/create-pull-request@v5
+        with:
+          # Git commit details
+          branch: automation/update-contributors
+          author: aws-cdk-automation <aws-cdk-automation@users.noreply.github.com>
+          commit-message: chore: update Contributors File
+          # Pull Request details
+          title: 'chore: update Contributors File'
+          labels: auto-approve
+          # Github prevents further Github actions to be run if the default Github token is used.
+          # Instead use a privileged token here, so further GH actions can be triggered on this PR.
+          token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
diff --git a/allowed-breaking-changes.txt b/allowed-breaking-changes.txt
@@ -173,3 +173,18 @@ removed:aws-cdk-lib.aws_ecs.CfnTaskSet.LoadBalancerProperty.loadBalancerName
 # Introduction of a new feature
 # Previously only BlueGreenUpdatePolicy could be set, now BlueGreenUpdatePolicy or new RollingUpdatePolicy can be provided
 weakened:aws-cdk-lib.aws_sagemaker.CfnEndpoint.DeploymentConfigProperty
+
+# Removed for being unused
+removed:@aws-cdk/region-info.FactName.DEFAULT_CR_NODE_VERSION
+removed:aws-cdk-lib.region_info.FactName.DEFAULT_CR_NODE_VERSION
+
+# These should have been marked external
+weakened:aws-cdk-lib.aws_events.CfnRule.RedshiftDataParametersProperty
+weakened:aws-cdk-lib.aws_ivs.CfnRecordingConfiguration.DestinationConfigurationProperty
+weakened:aws-cdk-lib.aws_ivs.CfnRecordingConfiguration.ThumbnailConfigurationProperty
+removed:aws-cdk-lib.aws_sam.CfnFunction.AlexaSkillEventProperty.variables
+strengthened:aws-cdk-lib.aws_sam.CfnFunction.AlexaSkillEventProperty
+removed:aws-cdk-lib.aws_cloudwatch.CfnAlarm.attrId
+removed:aws-cdk-lib.aws_ec2.CfnNetworkInterface.enablePrimaryIpv6
+removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceAttachment.attrId
+removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceProps.enablePrimaryIpv6
diff --git a/...st/integ.restapi.js.snapshot/apigatewayrestapiDefaultTestDeployAssert6A9696A7.assets.json b/...st/integ.restapi.js.snapshot/apigatewayrestapiDefaultTestDeployAssert6A9696A7.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {

diff --git a/...ws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/cdk.out b/...ws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"30.0.0"}
+{"version":"32.0.0"}
diff --git a/...cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/integ.json b/...cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "testCases": {
     "apigateway-restapi/DefaultTest": {
       "stacks": [

diff --git a/...-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "artifacts": {
     "test-apigateway-restapi.assets": {
       "type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/94f416193221135915e06201345d08e3db001c8bbf22b073f16ec02d3b8fba4b.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c00b67076079aca10705c26d8b2f87803ff864e13c715f333bcec05a6e7021af.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -54,7 +54,7 @@
         "/test-apigateway-restapi/my-api/Deployment/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb"
+            "data": "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6"
           }
         ],
         "/test-apigateway-restapi/my-api/DeploymentStage.beta/Resource": [
@@ -198,7 +198,7 @@
         "/test-apigateway-restapi/TestDeployment/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1"
+            "data": "TestDeploymentD77B56865531eba1e8fde4b8e6988d5af7b2efd6"
           }
         ],
         "/test-apigateway-restapi/TestStage/Resource": [
@@ -225,19 +225,19 @@
             "data": "CheckBootstrapVersion"
           }
         ],
-        "myapiDeployment92F2CB4996088bac04ec19d9db88f146f3d88bca": [
+        "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "myapiDeployment92F2CB4996088bac04ec19d9db88f146f3d88bca",
+            "data": "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb",
             "trace": [
               "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
             ]
           }
         ],
-        "TestDeploymentD77B56866f3141cef1e8fea8ab3b3b8bc90df36d": [
+        "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "TestDeploymentD77B56866f3141cef1e8fea8ab3b3b8bc90df36d",
+            "data": "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1",
             "trace": [
               "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
             ]

diff --git a/...eg/test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.assets.json b/...eg/test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "files": {
-    "94f416193221135915e06201345d08e3db001c8bbf22b073f16ec02d3b8fba4b": {
+    "c00b67076079aca10705c26d8b2f87803ff864e13c715f333bcec05a6e7021af": {
       "source": {
         "path": "test-apigateway-restapi.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "94f416193221135915e06201345d08e3db001c8bbf22b073f16ec02d3b8fba4b.json",
+          "objectKey": "c00b67076079aca10705c26d8b2f87803ff864e13c715f333bcec05a6e7021af.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/.../test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.template.json b/.../test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.template.json
@@ -3,6 +3,7 @@
   "myapi4C7BF186": {
    "Type": "AWS::ApiGateway::RestApi",
    "Properties": {
+    "Description": "api description",
     "MinimumCompressionSize": 1024,
     "Name": "my-api"
    }
@@ -56,13 +57,13 @@
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
   },
-  "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb": {
+  "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6": {
    "Type": "AWS::ApiGateway::Deployment",
    "Properties": {
     "RestApiId": {
      "Ref": "myapi4C7BF186"
     },
-    "Description": "Automatically created by the RestApi construct"
+    "Description": "beta stage"
    },
    "DependsOn": [
     "myapiv1appliancesallGETC4DF552D",
@@ -88,7 +89,7 @@
     "CacheClusterEnabled": true,
     "CacheClusterSize": "0.5",
     "DeploymentId": {
-     "Ref": "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb"
+     "Ref": "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6"
     },
     "Description": "beta stage",
     "MethodSettings": [
@@ -673,7 +674,7 @@
     "MyHandlerServiceRoleFFA06653"
    ]
   },
-  "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1": {
+  "TestDeploymentD77B56865531eba1e8fde4b8e6988d5af7b2efd6": {
    "Type": "AWS::ApiGateway::Deployment",
    "Properties": {
     "RestApiId": {
@@ -696,7 +697,7 @@
      "Ref": "myapi4C7BF186"
     },
     "DeploymentId": {
-     "Ref": "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1"
+     "Ref": "TestDeploymentD77B56865531eba1e8fde4b8e6988d5af7b2efd6"
     },
     "StageName": "prod"
    },