Merge branch 'main' into chore/dupe-module-builder

aws · Apr 5, 2023 · 2e2f7d4 · 2e2f7d4
2 parents ff5a888 + 813067c
commit 2e2f7d4
Show file tree

Hide file tree

Showing 27 changed files with 582 additions and 52 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -100,7 +100,7 @@ time, you can execute the following to build it and it's dependencies.
 
 ```console
 $ cd packages/aws-cdk-lib
-$ ../../../scripts/buildup
+$ ../../scripts/buildup
 ```
 
 Note: The `buildup` command is resumable. If your build fails, you can fix the issue and run `buildup --resume` to
@@ -143,7 +143,7 @@ To package a specific module, say the `aws-cdk-lib` module:
 $ cd <root-of-cdk-repo>
 $ docker run --rm --net=host -it -v $PWD:$PWD -w $PWD jsii/superchain:1-buster-slim
 docker$ cd packages/aws-cdk-lib
-docker$ ../../../scripts/foreach.sh --up yarn run package
+docker$ ../../scripts/foreach.sh --up yarn run package
 docker$ exit
 ```
 

diff --git a/...amework-integ/test/aws-ecr/test/integ.basic.js.snapshot/aws-ecr-integ-stack.template.json b/...amework-integ/test/aws-ecr/test/integ.basic.js.snapshot/aws-ecr-integ-stack.template.json
@@ -5,7 +5,19 @@
    "Properties": {
     "LifecyclePolicy": {
      "LifecyclePolicyText": "{\"rules\":[{\"rulePriority\":1,\"selection\":{\"tagStatus\":\"any\",\"countType\":\"imageCountMoreThan\",\"countNumber\":5},\"action\":{\"type\":\"expire\"}}]}"
-    }
+    },
+    "RepositoryPolicyText": {
+      "Statement": [
+       {
+        "Action": "ecr:GetDownloadUrlForLayer",
+        "Effect": "Allow",
+        "Principal": {
+         "AWS": "*"
+        }
+       }
+      ],
+      "Version": "2012-10-17"
+     }
    },
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ecr/test/integ.basic.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-ecr/test/integ.basic.ts
@@ -1,12 +1,17 @@
 import * as cdk from 'aws-cdk-lib';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 import * as ecr from 'aws-cdk-lib/aws-ecr';
+import * as iam from 'aws-cdk-lib/aws-iam';
 
 const app = new cdk.App();
 const stack = new cdk.Stack(app, 'aws-ecr-integ-stack');
 
 const repo = new ecr.Repository(stack, 'Repo');
 repo.addLifecycleRule({ maxImageCount: 5 });
+repo.addToResourcePolicy(new iam.PolicyStatement({
+  actions: ['ecr:GetDownloadUrlForLayer'],
+  principals: [new iam.AnyPrincipal()],
+}));
 
 new cdk.CfnOutput(stack, 'RepositoryURI', {
   value: repo.repositoryUri,

diff --git a/.../framework-integ/test/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.d.ts b/.../framework-integ/test/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/...ng/framework-integ/test/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js b/...ng/framework-integ/test/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js
diff --git a/...e-name.js.snapshot/GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.assets.json b/...e-name.js.snapshot/GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "31.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.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/...name.js.snapshot/GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.template.json b/...name.js.snapshot/GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.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/...g/test/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js.snapshot/cdk.out b/...g/test/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"31.0.0"}
diff --git a/...nteg.globalaccelerator-unique-name.js.snapshot/global-accelerator-unique-name.assets.json b/...nteg.globalaccelerator-unique-name.js.snapshot/global-accelerator-unique-name.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "31.0.0",
+  "files": {
+    "0878b70e8e50789495d8912191b4f71d0564827682a0fffa7801d540fad94e83": {
+      "source": {
+        "path": "global-accelerator-unique-name.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "0878b70e8e50789495d8912191b4f71d0564827682a0fffa7801d540fad94e83.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...eg.globalaccelerator-unique-name.js.snapshot/global-accelerator-unique-name.template.json b/...eg.globalaccelerator-unique-name.js.snapshot/global-accelerator-unique-name.template.json
@@ -0,0 +1,45 @@
+{
+ "Resources": {
+  "Accelerator8EB0B6B1": {
+   "Type": "AWS::GlobalAccelerator::Accelerator",
+   "Properties": {
+    "Name": "globalacceleratoruniquenameAccelerator519EC5EE",
+    "Enabled": true
+   }
+  }
+ },
+ "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/...est/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js.snapshot/integ.json b/...est/aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js.snapshot/integ.json
@@ -0,0 +1,12 @@
+{
+  "version": "31.0.0",
+  "testCases": {
+    "GlobalAcceleratorUniqueName/DefaultTest": {
+      "stacks": [
+        "global-accelerator-unique-name"
+      ],
+      "assertionStack": "GlobalAcceleratorUniqueName/DefaultTest/DeployAssert",
+      "assertionStackName": "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111"
+    }
+  }
+}
diff --git a/.../aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js.snapshot/manifest.json b/.../aws-globalaccelerator/test/integ.globalaccelerator-unique-name.js.snapshot/manifest.json
@@ -0,0 +1,111 @@
+{
+  "version": "31.0.0",
+  "artifacts": {
+    "global-accelerator-unique-name.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "global-accelerator-unique-name.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "global-accelerator-unique-name": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "global-accelerator-unique-name.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}/0878b70e8e50789495d8912191b4f71d0564827682a0fffa7801d540fad94e83.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "global-accelerator-unique-name.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": [
+        "global-accelerator-unique-name.assets"
+      ],
+      "metadata": {
+        "/global-accelerator-unique-name/Accelerator/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Accelerator8EB0B6B1"
+          }
+        ],
+        "/global-accelerator-unique-name/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/global-accelerator-unique-name/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "global-accelerator-unique-name"
+    },
+    "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.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": [
+          "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.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": [
+        "GlobalAcceleratorUniqueNameDefaultTestDeployAssertCA235111.assets"
+      ],
+      "metadata": {
+        "/GlobalAcceleratorUniqueName/DefaultTest/DeployAssert/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/GlobalAcceleratorUniqueName/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "GlobalAcceleratorUniqueName/DefaultTest/DeployAssert"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    }
+  }
+}