Merge branch 'main' into mrgrain/fix/integ-tests-assertions

aws · Jul 18, 2023 · a3a5f0d · a3a5f0d
2 parents 3d8732b + c8d8421
commit a3a5f0d
Show file tree

Hide file tree

Showing 29 changed files with 1,428 additions and 686 deletions.
diff --git a/...framework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/cdk.out b/...framework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"32.0.0"}
diff --git a/...arm.lit.js.snapshot/codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets.json b/...arm.lit.js.snapshot/codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.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/...m.lit.js.snapshot/codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.template.json b/...m.lit.js.snapshot/codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.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/...mework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/integ.json b/...mework-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/integ.json
@@ -0,0 +1,13 @@
+{
+  "version": "32.0.0",
+  "testCases": {
+    "codebuild-arm-docker-registry/DefaultTest": {
+      "stacks": [
+        "test-codebuild-arm-docker-registry"
+      ],
+      "stackUpdateWorkflow": false,
+      "assertionStack": "codebuild-arm-docker-registry/DefaultTest/DeployAssert",
+      "assertionStackName": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0"
+    }
+  }
+}
diff --git a/...ork-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/manifest.json b/...ork-integ/test/aws-codebuild/test/integ.docker-registry-arm.lit.js.snapshot/manifest.json
@@ -0,0 +1,123 @@
+{
+  "version": "32.0.0",
+  "artifacts": {
+    "test-codebuild-arm-docker-registry.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "test-codebuild-arm-docker-registry.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "test-codebuild-arm-docker-registry": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-codebuild-arm-docker-registry.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}/b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "test-codebuild-arm-docker-registry.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": [
+        "test-codebuild-arm-docker-registry.assets"
+      ],
+      "metadata": {
+        "/test-codebuild-arm-docker-registry/MyProject/Role/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyProjectRole9BBE5233"
+          }
+        ],
+        "/test-codebuild-arm-docker-registry/MyProject/Role/DefaultPolicy/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyProjectRoleDefaultPolicyB19B7C29"
+          }
+        ],
+        "/test-codebuild-arm-docker-registry/MyProject/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyProject39F7B0AE"
+          }
+        ],
+        "/test-codebuild-arm-docker-registry/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/test-codebuild-arm-docker-registry/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "test-codebuild-arm-docker-registry"
+    },
+    "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.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": [
+          "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.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": [
+        "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets"
+      ],
+      "metadata": {
+        "/codebuild-arm-docker-registry/DefaultTest/DeployAssert/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/codebuild-arm-docker-registry/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "codebuild-arm-docker-registry/DefaultTest/DeployAssert"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    }
+  }
+}
diff --git a/.../integ.docker-registry-arm.lit.js.snapshot/test-codebuild-arm-docker-registry.assets.json b/.../integ.docker-registry-arm.lit.js.snapshot/test-codebuild-arm-docker-registry.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6": {
+      "source": {
+        "path": "test-codebuild-arm-docker-registry.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}