Merge branch 'main' into doc-custom-resource

aws · Aug 10, 2023 · e89c2c3 · e89c2c3
2 parents 489e46d + 5777c88
commit e89c2c3
Show file tree

Hide file tree

Showing 99 changed files with 6,098 additions and 2,601 deletions.
diff --git a/package.json b/package.json
@@ -24,9 +24,9 @@
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.86.0",
-    "jsii-pacmak": "1.86.0",
-    "jsii-reflect": "1.86.0",
+    "jsii-diff": "1.86.1",
+    "jsii-pacmak": "1.86.1",
+    "jsii-reflect": "1.86.1",
     "jsii-rosetta": "~5.1.9",
     "lerna": "^7.1.4",
     "nx": "^16.6.0",

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1427.0",
+    "aws-sdk": "^2.1432.0",
     "axios": "^0.27.2",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",

diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts
@@ -651,6 +651,18 @@ integTest('cdk diff --security-only --fail exits when security changes are prese
   await expect(fixture.cdk(['diff', '--security-only', '--fail', fixture.fullStackName(stackName)])).rejects.toThrow('exited with error');
 }));
 
+integTest('cdk diff --quiet does not print \'There were no differences\' message for stacks which have no differences', withDefaultFixture(async (fixture) => {
+  // GIVEN
+  await fixture.cdkDeploy('test-1');
+
+  // WHEN
+  const diff = await fixture.cdk(['diff', '--quiet', fixture.fullStackName('test-1')]);
+
+  // THEN
+  expect(diff).not.toContain('Stack test-1');
+  expect(diff).not.toContain('There were no differences');
+}));
+
 integTest('deploy stack with docker asset', withDefaultFixture(async (fixture) => {
   await fixture.cdkDeploy('docker');
 }));

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -39,9 +39,9 @@
     "@aws-cdk/integ-tests-alpha": "0.0.0",
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1427.0",
+    "aws-sdk": "^2.1432.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "^2.30.0",
+    "cdk8s": "^2.38.0",
     "cdk8s-plus-24": "2.12.1",
     "constructs": "^10.0.0"
   },

diff --git a/...asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.d.ts b/...asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.d.ts
diff --git a/...t/asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.js b/...t/asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.js
diff --git a/...t/asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.ts b/...t/asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.ts
@@ -0,0 +1,11 @@
+exports.handler = async (evt: any) => {
+  // eslint-disable-next-line no-console
+  console.error(JSON.stringify(evt, undefined, 2));
+  return {
+    statusCode: 200,
+    body: 'hello, cors!',
+    headers: {
+      'Access-Control-Allow-Origin': '*',
+    },
+  };
+};
diff --git a/...work-integ/test/aws-apigateway/test/integ.cors-allow-multiple-origins.js.snapshot/cdk.out b/...work-integ/test/aws-apigateway/test/integ.cors-allow-multiple-origins.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"33.0.0"}
diff --git a/...k-integ/test/aws-apigateway/test/integ.cors-allow-multiple-origins.js.snapshot/integ.json b/...k-integ/test/aws-apigateway/test/integ.cors-allow-multiple-origins.js.snapshot/integ.json
@@ -0,0 +1,12 @@
+{
+  "version": "33.0.0",
+  "testCases": {
+    "integ-cors-allow-multiple-origins/DefaultTest": {
+      "stacks": [
+        "stack-cors-allow-multiple-origins"
+      ],
+      "assertionStack": "integ-cors-allow-multiple-origins/DefaultTest/DeployAssert",
+      "assertionStackName": "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1"
+    }
+  }
+}
diff --git a/...gins.js.snapshot/integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.assets.json b/...gins.js.snapshot/integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "33.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...ns.js.snapshot/integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.template.json b/...ns.js.snapshot/integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.template.json
@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...nteg/test/aws-apigateway/test/integ.cors-allow-multiple-origins.js.snapshot/manifest.json b/...nteg/test/aws-apigateway/test/integ.cors-allow-multiple-origins.js.snapshot/manifest.json
@@ -0,0 +1,177 @@
+{
+  "version": "33.0.0",
+  "artifacts": {
+    "stack-cors-allow-multiple-origins.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "stack-cors-allow-multiple-origins.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "stack-cors-allow-multiple-origins": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "stack-cors-allow-multiple-origins.template.json",
+        "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}/1680a1a109d409e5d8dfb509472821013a45d099b60b8498e38e31ac2cb1562b.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "stack-cors-allow-multiple-origins.assets"
+        ],
+        "lookupRole": {
+          "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+          "requiresBootstrapStackVersion": 8,
+          "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+        }
+      },
+      "dependencies": [
+        "stack-cors-allow-multiple-origins.assets"
+      ],
+      "metadata": {
+        "/stack-cors-allow-multiple-origins/cors-api-test/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitest8682546E"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Deployment/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestDeployment2BF1633Ad72428c37c88b8c23ef39eebb5b7e9fd"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/DeploymentStage.prod/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestDeploymentStageprod8F31F2AB"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Endpoint": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestEndpointE63606AE"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Default/OPTIONS/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestOPTIONS15560589"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Default/my-resource/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestmyresource73D41BDD"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Default/my-resource/OPTIONS/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestmyresourceOPTIONSD5275318"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Default/my-resource/GET/ApiPermission.stackcorsallowmultipleoriginscorsapitestC473FAE8.GET..my-resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestmyresourceGETApiPermissionstackcorsallowmultipleoriginscorsapitestC473FAE8GETmyresourceB82B6C26"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Default/my-resource/GET/ApiPermission.Test.stackcorsallowmultipleoriginscorsapitestC473FAE8.GET..my-resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestmyresourceGETApiPermissionTeststackcorsallowmultipleoriginscorsapitestC473FAE8GETmyresource29B41ABB"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/cors-api-test/Default/my-resource/GET/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "corsapitestmyresourceGET844C52EA"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/handler/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "handlerServiceRole187D5A5A"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/handler/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "handlerE1533BD5"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/stack-cors-allow-multiple-origins/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "stack-cors-allow-multiple-origins"
+    },
+    "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.template.json",
+        "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.assets"
+        ],
+        "lookupRole": {
+          "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+          "requiresBootstrapStackVersion": 8,
+          "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+        }
+      },
+      "dependencies": [
+        "integcorsallowmultipleoriginsDefaultTestDeployAssertEBF0A1B1.assets"
+      ],
+      "metadata": {
+        "/integ-cors-allow-multiple-origins/DefaultTest/DeployAssert/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/integ-cors-allow-multiple-origins/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "integ-cors-allow-multiple-origins/DefaultTest/DeployAssert"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    }
+  }
+}
diff --git a/...teg.cors-allow-multiple-origins.js.snapshot/stack-cors-allow-multiple-origins.assets.json b/...teg.cors-allow-multiple-origins.js.snapshot/stack-cors-allow-multiple-origins.assets.json
@@ -0,0 +1,32 @@
+{
+  "version": "33.0.0",
+  "files": {
+    "c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f": {
+      "source": {
+        "path": "asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "1680a1a109d409e5d8dfb509472821013a45d099b60b8498e38e31ac2cb1562b": {
+      "source": {
+        "path": "stack-cors-allow-multiple-origins.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "1680a1a109d409e5d8dfb509472821013a45d099b60b8498e38e31ac2cb1562b.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}