Merge branch 'main' into feat/aws-cdk-lib-sdk-v3

aws · Jul 6, 2023 · d3b0b32 · d3b0b32
2 parents ae6a2b0 + 1520d77
commit d3b0b32
Show file tree

Hide file tree

Showing 13 changed files with 1,445 additions and 72 deletions.
diff --git a/...framework-integ/test/aws-ec2/test/integ.instance-public-and-privateip.js.snapshot/cdk.out b/...framework-integ/test/aws-ec2/test/integ.instance-public-and-privateip.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"32.0.0"}
diff --git a/...-public-and-privateip.js.snapshot/instancetestDefaultTestDeployAssert5516EAF1.assets.json b/...-public-and-privateip.js.snapshot/instancetestDefaultTestDeployAssert5516EAF1.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "instancetestDefaultTestDeployAssert5516EAF1.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/...ublic-and-privateip.js.snapshot/instancetestDefaultTestDeployAssert5516EAF1.template.json b/...ublic-and-privateip.js.snapshot/instancetestDefaultTestDeployAssert5516EAF1.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/...s-ec2/test/integ.instance-public-and-privateip.js.snapshot/integ-ec2-instance.assets.json b/...s-ec2/test/integ.instance-public-and-privateip.js.snapshot/integ-ec2-instance.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "b7b36b2bd774d01d7de716607fa5f4847417a7478d4e5d968305579a1d2dbabc": {
+      "source": {
+        "path": "integ-ec2-instance.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "b7b36b2bd774d01d7de716607fa5f4847417a7478d4e5d968305579a1d2dbabc.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}