diff --git a/.github/workflows/yarn-upgrade-v1main.yml b/.github/workflows/yarn-upgrade-v1main.yml deleted file mode 100644 index 7f8d203e77e89..0000000000000 --- a/.github/workflows/yarn-upgrade-v1main.yml +++ /dev/null @@ -1,127 +0,0 @@ -name: Yarn Upgrade v1-main - -on: - workflow_dispatch: {} - -jobs: - upgrade: - name: Yarn Upgrade - permissions: - contents: read - runs-on: ubuntu-latest - steps: - - - name: Check Out - uses: actions/checkout@v3 - with: - ref: v1-main - - - name: Set up Node - uses: actions/setup-node@v3 - with: - node-version: 14 - - - name: Locate Yarn cache - id: yarn-cache - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - name: Restore Yarn cache - uses: actions/cache@v3 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: |- - ${{ runner.os }}-yarn- - - name: Yarn Install - run: yarn install --frozen-lockfile - - name: Install Tools - run: |- - npm -g install npm-check-updates - - name: Build CLI - run: npx lerna run build --scope aws-cdk --include-dependencies --stream - - name: Build Integ Runner - run: npx lerna run build --scope @aws-cdk/integ-runner --include-dependencies --stream - - name: List Mono-Repo Packages - id: list-packages - # These need to be ignored from the `ncu` runs! - run: |- - echo "list=$(npx lerna ls --all --json 2>/dev/null | jq -r 'map(.name) | join(",")')" >> $GITHUB_OUTPUT - - name: Run "ncu -u" - # We special-case some @types because they need to be pinned to specific versions due to breaking changes in minor upgrades https://github.com/DefinitelyTyped/DefinitelyTyped/issues/64266 - # We special-case typescript because it's not semantically versioned - # We special-case constructs because we want to stay in control of the minimum compatible version - # We special-case lerna because we have a patch on it that stops applying if Lerna upgrades. Remove this once https://github.com/lerna/lerna/pull/2874 releases. - # We special-case aws-sdk-mock because of breaking changes in type exports https://github.com/dwyl/aws-sdk-mock/pull/260. We are not respecting `@ts-ignore` - run: |- - # Upgrade dependencies at repository root - ncu --upgrade --filter=typescript --target=patch - ncu --upgrade --reject=@types/node,@types/prettier,constructs,typescript,lerna --target=minor - # Upgrade all the packages - npx lerna exec --parallel ncu -- --upgrade --filter=typescript,lerna --target=patch - npx lerna exec --parallel ncu -- --upgrade --reject='@types/conventional-commits-parser,@types/node,@types/prettier,constructs,typescript,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor - - # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run) - - name: Run "yarn install" - run: yarn install - - - name: Run "yarn upgrade" - run: yarn upgrade - - - name: Regenerate CLI attributions - run: cd packages/aws-cdk && yarn pkglint - - name: Regenerate Integ Runner attributions - run: cd packages/@aws-cdk/integ-runner && yarn pkglint - - # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request - # Creating a pull request requires write permissions and it's best to keep write privileges isolated. - - name: Create Patch - run: |- - git add . - git diff --patch --staged > ${{ runner.temp }}/upgrade.patch - - name: Upload Patch - uses: actions/upload-artifact@v3 - with: - name: upgrade.patch - path: ${{ runner.temp }}/upgrade.patch - - pr: - name: Create Pull Request - needs: upgrade - permissions: - contents: write - pull-requests: write - runs-on: ubuntu-latest - steps: - - name: Check Out - uses: actions/checkout@v3 - with: - ref: v1-main - - - name: Download patch - uses: actions/download-artifact@v3 - with: - name: upgrade.patch - path: ${{ runner.temp }} - - - name: Apply patch - run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp - }}/upgrade.patch || echo "Empty patch. Skipping."' - - - name: Make Pull Request - uses: peter-evans/create-pull-request@v5 - with: - # Git commit details - branch: automation/yarn-upgrade-v1 - author: aws-cdk-automation - commit-message: |- - chore: npm-check-updates && yarn upgrade - Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date. - # Pull Request details - title: 'chore: npm-check-updates && yarn upgrade' - body: |- - Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date. - labels: contribution/core,dependencies,auto-approve - team-reviewers: aws-cdk-team - # 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/package.json b/package.json index eb23cd4c49436..3ea3b84700a2b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@types/node": "18.11.19", "@types/prettier": "2.6.0", "@yarnpkg/lockfile": "^1.1.0", - "cdk-generate-synthetic-examples": "^0.1.287", + "cdk-generate-synthetic-examples": "^0.1.291", "conventional-changelog-cli": "^2.2.2", "fs-extra": "^9.1.0", "graceful-fs": "^4.2.11", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json index f122859f14c37..d02c81d62a037 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json @@ -27,7 +27,7 @@ } } }, - "9f5b5c07b59d14129fb944d5873e7123bd1d5503291b842d691d7f3deb40f917": { + "08c25f680a202dc8635a9be1cb4f95b91c4155f46e7a6857b11eaf621a4b35c7": { "source": { "path": "awscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json", "packaging": "file" @@ -35,12 +35,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "9f5b5c07b59d14129fb944d5873e7123bd1d5503291b842d691d7f3deb40f917.json", + "objectKey": "08c25f680a202dc8635a9be1cb4f95b91c4155f46e7a6857b11eaf621a4b35c7.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "d81aa5f1c458333209741287a5755fe92d4fcb92f27c01afe0df806cb9fa343f": { + "108400a7d890987dd303c4b58b4e8313c7f496d2f7445eac124a87d660d1052b": { "source": { "path": "aws-cdk-dynamodb-global-replicas-provisioned.template.json", "packaging": "file" @@ -48,7 +48,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d81aa5f1c458333209741287a5755fe92d4fcb92f27c01afe0df806cb9fa343f.json", + "objectKey": "108400a7d890987dd303c4b58b4e8313c7f496d2f7445eac124a87d660d1052b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json index 802b87adb0af8..3f6b12d91d469 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json @@ -3,16 +3,16 @@ "TableCD117FA1": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "hashKey", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "KeySchema": [ { "AttributeName": "hashKey", - "AttributeType": "S" + "KeyType": "HASH" } ], "ProvisionedThroughput": { @@ -29,6 +29,18 @@ "TableSourceTableAttachedManagedPolicyawscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderOnEventHandlerServiceRoleD9856B771F8F2CCB": { "Type": "AWS::IAM::ManagedPolicy", "Properties": { + "Description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "Path": "/", "PolicyDocument": { "Statement": [ { @@ -87,18 +99,6 @@ ], "Version": "2012-10-17" }, - "Description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "Path": "/", "Roles": [ { "Fn::GetAtt": [ @@ -112,6 +112,18 @@ "TableSourceTableAttachedManagedPolicyawscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderIsCompleteHandlerServiceRoleBE2B1C1A5DC546D2": { "Type": "AWS::IAM::ManagedPolicy", "Properties": { + "Description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "Path": "/", "PolicyDocument": { "Statement": [ { @@ -132,18 +144,6 @@ ], "Version": "2012-10-17" }, - "Description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "Path": "/", "Roles": [ { "Fn::GetAtt": [ @@ -231,8 +231,6 @@ ] ] }, - "ScalableDimension": "dynamodb:table:WriteCapacityUnits", - "ServiceNamespace": "dynamodb", "RoleARN": { "Fn::Join": [ "", @@ -248,7 +246,9 @@ ":role/aws-service-role/dynamodb.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_DynamoDBTable" ] ] - } + }, + "ScalableDimension": "dynamodb:table:WriteCapacityUnits", + "ServiceNamespace": "dynamodb" } }, "TableWriteScalingTargetTrackingD78DCCD8": { @@ -270,6 +270,11 @@ "awscdkawsdynamodbReplicaProviderNestedStackawscdkawsdynamodbReplicaProviderNestedStackResource18E3F12D": { "Type": "AWS::CloudFormation::Stack", "Properties": { + "Parameters": { + "referencetoawscdkdynamodbglobalreplicasprovisionedTable12280A12Ref": { + "Ref": "TableCD117FA1" + } + }, "TemplateURL": { "Fn::Join": [ "", @@ -286,14 +291,9 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/9f5b5c07b59d14129fb944d5873e7123bd1d5503291b842d691d7f3deb40f917.json" + "/08c25f680a202dc8635a9be1cb4f95b91c4155f46e7a6857b11eaf621a4b35c7.json" ] ] - }, - "Parameters": { - "referencetoawscdkdynamodbglobalreplicasprovisionedTable12280A12Ref": { - "Ref": "TableCD117FA1" - } } }, "UpdateReplacePolicy": "Delete", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/awscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/awscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json index 1952124fb94d2..306db03c1bab2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/awscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/awscdkdynamodbglobalreplicasprovisionedawscdkawsdynamodbReplicaProviderEA32CB30.nested.template.json @@ -128,13 +128,13 @@ }, "S3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "Handler": "index.onEventHandler", "Role": { "Fn::GetAtt": [ "OnEventHandlerServiceRole15A26729", "Arn" ] }, - "Handler": "index.onEventHandler", "Runtime": "nodejs18.x", "Timeout": 300 }, @@ -183,13 +183,13 @@ }, "S3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "Handler": "index.isCompleteHandler", "Role": { "Fn::GetAtt": [ "IsCompleteHandlerServiceRole5810CC58", "Arn" ] }, - "Handler": "index.isCompleteHandler", "Runtime": "nodejs18.x", "Timeout": 30 }, @@ -306,12 +306,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "Environment": { "Variables": { @@ -333,6 +327,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -443,12 +443,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "Environment": { "Variables": { @@ -467,6 +461,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -577,12 +577,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "Environment": { "Variables": { @@ -601,6 +595,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/integ.json index 9072ca3c38194..1a4ab3166aaba 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-dynamodb-global-replicas-provisioned" ], + "diffAssets": true, "assertionStack": "aws-cdk-dynamodb-global-replicas-provisioned-test/DefaultTest/DeployAssert", "assertionStackName": "awscdkdynamodbglobalreplicasprovisionedtestDefaultTestDeployAssertE7F91F54" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/manifest.json index 9a84c14edb374..36d124289a168 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/manifest.json @@ -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}/d81aa5f1c458333209741287a5755fe92d4fcb92f27c01afe0df806cb9fa343f.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/108400a7d890987dd303c4b58b4e8313c7f496d2f7445eac124a87d660d1052b.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/tree.json index 535b8bf9a68cb..6facc28953e0d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/tree.json @@ -18,16 +18,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::DynamoDB::Table", "aws:cdk:cloudformation:props": { - "keySchema": [ + "attributeDefinitions": [ { "attributeName": "hashKey", - "keyType": "HASH" + "attributeType": "S" } ], - "attributeDefinitions": [ + "keySchema": [ { "attributeName": "hashKey", - "attributeType": "S" + "keyType": "HASH" } ], "provisionedThroughput": { @@ -74,6 +74,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::ManagedPolicy", "aws:cdk:cloudformation:props": { + "description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "path": "/", "policyDocument": { "Statement": [ { @@ -132,18 +144,6 @@ ], "Version": "2012-10-17" }, - "description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "path": "/", "roles": [ { "Fn::GetAtt": [ @@ -193,6 +193,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::ManagedPolicy", "aws:cdk:cloudformation:props": { + "description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "path": "/", "policyDocument": { "Statement": [ { @@ -213,18 +225,6 @@ ], "Version": "2012-10-17" }, - "description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "path": "/", "roles": [ { "Fn::GetAtt": [ @@ -331,8 +331,6 @@ ] ] }, - "scalableDimension": "dynamodb:table:WriteCapacityUnits", - "serviceNamespace": "dynamodb", "roleArn": { "Fn::Join": [ "", @@ -348,7 +346,9 @@ ":role/aws-service-role/dynamodb.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_DynamoDBTable" ] ] - } + }, + "scalableDimension": "dynamodb:table:WriteCapacityUnits", + "serviceNamespace": "dynamodb" } }, "constructInfo": { @@ -617,13 +617,13 @@ }, "s3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "handler": "index.onEventHandler", "role": { "Fn::GetAtt": [ "OnEventHandlerServiceRole15A26729", "Arn" ] }, - "handler": "index.onEventHandler", "runtime": "nodejs18.x", "timeout": 300 } @@ -712,13 +712,13 @@ }, "s3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "handler": "index.isCompleteHandler", "role": { "Fn::GetAtt": [ "IsCompleteHandlerServiceRole5810CC58", "Arn" ] }, - "handler": "index.isCompleteHandler", "runtime": "nodejs18.x", "timeout": 30 } @@ -924,12 +924,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "environment": { "variables": { @@ -951,6 +945,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -1145,12 +1145,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "environment": { "variables": { @@ -1169,6 +1163,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -1363,12 +1363,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "environment": { "variables": { @@ -1387,6 +1381,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -1597,6 +1597,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { + "parameters": { + "referencetoawscdkdynamodbglobalreplicasprovisionedTable12280A12Ref": { + "Ref": "TableCD117FA1" + } + }, "templateUrl": { "Fn::Join": [ "", @@ -1613,14 +1618,9 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/9f5b5c07b59d14129fb944d5873e7123bd1d5503291b842d691d7f3deb40f917.json" + "/08c25f680a202dc8635a9be1cb4f95b91c4155f46e7a6857b11eaf621a4b35c7.json" ] ] - }, - "parameters": { - "referencetoawscdkdynamodbglobalreplicasprovisionedTable12280A12Ref": { - "Ref": "TableCD117FA1" - } } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.assets.json index d959d2382e417..a79641e7c8fd4 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.assets.json @@ -29,7 +29,7 @@ } } }, - "e119a0c77ec5825863ba2bfd453003b0562e23ae8ae9b14309d25e6d53aae74a": { + "f06621c87ca38c58225fd81149e467141f986deaf4239406e2284fb7b4b58f11": { "source": { "path": "cdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderB281C954.nested.template.json", "packaging": "file" @@ -37,13 +37,13 @@ "destinations": { "current_account-eu-west-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1", - "objectKey": "e119a0c77ec5825863ba2bfd453003b0562e23ae8ae9b14309d25e6d53aae74a.json", + "objectKey": "f06621c87ca38c58225fd81149e467141f986deaf4239406e2284fb7b4b58f11.json", "region": "eu-west-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-eu-west-1" } } }, - "eb8851cc1e0615ec2a9fd3adc2cc398a82199c308f625e7608fd481ec64fbfc7": { + "df6dc6e0475b28469b14be979abecaaf983f9049e2f8c04903098a2e5d546c3d": { "source": { "path": "cdk-dynamodb-global-20191121.template.json", "packaging": "file" @@ -51,7 +51,7 @@ "destinations": { "current_account-eu-west-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1", - "objectKey": "eb8851cc1e0615ec2a9fd3adc2cc398a82199c308f625e7608fd481ec64fbfc7.json", + "objectKey": "df6dc6e0475b28469b14be979abecaaf983f9049e2f8c04903098a2e5d546c3d.json", "region": "eu-west-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-eu-west-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.template.json index 0326543685950..505319422bc61 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdk-dynamodb-global-20191121.template.json @@ -3,12 +3,6 @@ "TableCD117FA1": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ - { - "AttributeName": "id", - "KeyType": "HASH" - } - ], "AttributeDefinitions": [ { "AttributeName": "id", @@ -34,6 +28,12 @@ } } ], + "KeySchema": [ + { + "AttributeName": "id", + "KeyType": "HASH" + } + ], "StreamSpecification": { "StreamViewType": "NEW_AND_OLD_IMAGES" } @@ -44,6 +44,18 @@ "TableSourceTableAttachedManagedPolicycdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderOnEventHandlerServiceRole6F43DF4A23250B4C": { "Type": "AWS::IAM::ManagedPolicy", "Properties": { + "Description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "Path": "/", "PolicyDocument": { "Statement": [ { @@ -105,18 +117,6 @@ ], "Version": "2012-10-17" }, - "Description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "Path": "/", "Roles": [ { "Fn::GetAtt": [ @@ -130,6 +130,18 @@ "TableSourceTableAttachedManagedPolicycdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderIsCompleteHandlerServiceRole3971612857304880": { "Type": "AWS::IAM::ManagedPolicy", "Properties": { + "Description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "Path": "/", "PolicyDocument": { "Statement": [ { @@ -161,18 +173,6 @@ ], "Version": "2012-10-17" }, - "Description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "Path": "/", "Roles": [ { "Fn::GetAtt": [ @@ -229,6 +229,11 @@ "awscdkawsdynamodbReplicaProviderNestedStackawscdkawsdynamodbReplicaProviderNestedStackResource18E3F12D": { "Type": "AWS::CloudFormation::Stack", "Properties": { + "Parameters": { + "referencetocdkdynamodbglobal20191121TableB640876BRef": { + "Ref": "TableCD117FA1" + } + }, "TemplateURL": { "Fn::Join": [ "", @@ -241,14 +246,9 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1" }, - "/e119a0c77ec5825863ba2bfd453003b0562e23ae8ae9b14309d25e6d53aae74a.json" + "/f06621c87ca38c58225fd81149e467141f986deaf4239406e2284fb7b4b58f11.json" ] ] - }, - "Parameters": { - "referencetocdkdynamodbglobal20191121TableB640876BRef": { - "Ref": "TableCD117FA1" - } } }, "UpdateReplacePolicy": "Delete", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderB281C954.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderB281C954.nested.template.json index 8de40e554e499..7bf4abd098599 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderB281C954.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/cdkdynamodbglobal20191121awscdkawsdynamodbReplicaProviderB281C954.nested.template.json @@ -124,13 +124,13 @@ }, "S3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "Handler": "index.onEventHandler", "Role": { "Fn::GetAtt": [ "OnEventHandlerServiceRole15A26729", "Arn" ] }, - "Handler": "index.onEventHandler", "Runtime": "nodejs18.x", "Timeout": 300 }, @@ -179,13 +179,13 @@ }, "S3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "Handler": "index.isCompleteHandler", "Role": { "Fn::GetAtt": [ "IsCompleteHandlerServiceRole5810CC58", "Arn" ] }, - "Handler": "index.isCompleteHandler", "Runtime": "nodejs18.x", "Timeout": 30 }, @@ -302,12 +302,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "Environment": { "Variables": { @@ -329,6 +323,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -439,12 +439,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "Environment": { "Variables": { @@ -463,6 +457,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -573,12 +573,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "Environment": { "Variables": { @@ -597,6 +591,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/integ.json index cbaf5f0ba4ec9..cc74affd40d14 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "cdk-dynamodb-global-20191121" ], + "diffAssets": true, "assertionStack": "cdk-dynamodb-global-20191121-test/DefaultTest/DeployAssert", "assertionStackName": "cdkdynamodbglobal20191121testDefaultTestDeployAssert469C3611" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/manifest.json index 14ee5bafb0a10..51dae1fe4c459 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-eu-west-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-eu-west-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1/eb8851cc1e0615ec2a9fd3adc2cc398a82199c308f625e7608fd481ec64fbfc7.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1/df6dc6e0475b28469b14be979abecaaf983f9049e2f8c04903098a2e5d546c3d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/tree.json index 7d019ce2405ae..31a2ef00a80a3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global.js.snapshot/tree.json @@ -18,12 +18,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::DynamoDB::Table", "aws:cdk:cloudformation:props": { - "keySchema": [ - { - "attributeName": "id", - "keyType": "HASH" - } - ], "attributeDefinitions": [ { "attributeName": "id", @@ -49,6 +43,12 @@ } } ], + "keySchema": [ + { + "attributeName": "id", + "keyType": "HASH" + } + ], "streamSpecification": { "streamViewType": "NEW_AND_OLD_IMAGES" } @@ -89,6 +89,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::ManagedPolicy", "aws:cdk:cloudformation:props": { + "description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "path": "/", "policyDocument": { "Statement": [ { @@ -150,18 +162,6 @@ ], "Version": "2012-10-17" }, - "description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "path": "/", "roles": [ { "Fn::GetAtt": [ @@ -211,6 +211,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::ManagedPolicy", "aws:cdk:cloudformation:props": { + "description": { + "Fn::Join": [ + "", + [ + "DynamoDB replication managed policy for table ", + { + "Ref": "TableCD117FA1" + } + ] + ] + }, + "path": "/", "policyDocument": { "Statement": [ { @@ -242,18 +254,6 @@ ], "Version": "2012-10-17" }, - "description": { - "Fn::Join": [ - "", - [ - "DynamoDB replication managed policy for table ", - { - "Ref": "TableCD117FA1" - } - ] - ] - }, - "path": "/", "roles": [ { "Fn::GetAtt": [ @@ -528,13 +528,13 @@ }, "s3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "handler": "index.onEventHandler", "role": { "Fn::GetAtt": [ "OnEventHandlerServiceRole15A26729", "Arn" ] }, - "handler": "index.onEventHandler", "runtime": "nodejs18.x", "timeout": 300 } @@ -623,13 +623,13 @@ }, "s3Key": "760886bc5e09df8d8ecf794d3b9604739062c355e50ca5ae1b07e70ec9233e8b.zip" }, + "handler": "index.isCompleteHandler", "role": { "Fn::GetAtt": [ "IsCompleteHandlerServiceRole5810CC58", "Arn" ] }, - "handler": "index.isCompleteHandler", "runtime": "nodejs18.x", "timeout": 30 } @@ -835,12 +835,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "environment": { "variables": { @@ -862,6 +856,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -1056,12 +1056,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "environment": { "variables": { @@ -1080,6 +1074,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -1274,12 +1274,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)", "environment": { "variables": { @@ -1298,6 +1292,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -1508,6 +1508,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { + "parameters": { + "referencetocdkdynamodbglobal20191121TableB640876BRef": { + "Ref": "TableCD117FA1" + } + }, "templateUrl": { "Fn::Join": [ "", @@ -1520,14 +1525,9 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1" }, - "/e119a0c77ec5825863ba2bfd453003b0562e23ae8ae9b14309d25e6d53aae74a.json" + "/f06621c87ca38c58225fd81149e467141f986deaf4239406e2284fb7b4b58f11.json" ] ] - }, - "parameters": { - "referencetocdkdynamodbglobal20191121TableB640876BRef": { - "Ref": "TableCD117FA1" - } } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.assets.json new file mode 100644 index 0000000000000..b6889c4e6c697 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.assets.json @@ -0,0 +1,19 @@ +{ + "version": "32.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.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": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "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." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/__entrypoint__.js b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/__entrypoint__.js new file mode 100644 index 0000000000000..c83ecebaaadac --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/__entrypoint__.js @@ -0,0 +1,147 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.withRetries = exports.handler = exports.external = void 0; +const https = require("https"); +const url = require("url"); +// for unit tests +exports.external = { + sendHttpRequest: defaultSendHttpRequest, + log: defaultLog, + includeStackTraces: true, + userHandlerIndex: './index', +}; +const CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED'; +const MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID'; +async function handler(event, context) { + const sanitizedEvent = { ...event, ResponseURL: '...' }; + exports.external.log(JSON.stringify(sanitizedEvent, undefined, 2)); + // ignore DELETE event when the physical resource ID is the marker that + // indicates that this DELETE is a subsequent DELETE to a failed CREATE + // operation. + if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) { + exports.external.log('ignoring DELETE event caused by a failed CREATE event'); + await submitResponse('SUCCESS', event); + return; + } + try { + // invoke the user handler. this is intentionally inside the try-catch to + // ensure that if there is an error it's reported as a failure to + // cloudformation (otherwise cfn waits). + // eslint-disable-next-line @typescript-eslint/no-require-imports + const userHandler = require(exports.external.userHandlerIndex).handler; + const result = await userHandler(sanitizedEvent, context); + // validate user response and create the combined event + const responseEvent = renderResponse(event, result); + // submit to cfn as success + await submitResponse('SUCCESS', responseEvent); + } + catch (e) { + const resp = { + ...event, + Reason: exports.external.includeStackTraces ? e.stack : e.message, + }; + if (!resp.PhysicalResourceId) { + // special case: if CREATE fails, which usually implies, we usually don't + // have a physical resource id. in this case, the subsequent DELETE + // operation does not have any meaning, and will likely fail as well. to + // address this, we use a marker so the provider framework can simply + // ignore the subsequent DELETE. + if (event.RequestType === 'Create') { + exports.external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored'); + resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER; + } + else { + // otherwise, if PhysicalResourceId is not specified, something is + // terribly wrong because all other events should have an ID. + exports.external.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(event)}`); + } + } + // this is an actual error, fail the activity altogether and exist. + await submitResponse('FAILED', resp); + } +} +exports.handler = handler; +function renderResponse(cfnRequest, handlerResponse = {}) { + // if physical ID is not returned, we have some defaults for you based + // on the request type. + const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId; + // if we are in DELETE and physical ID was changed, it's an error. + if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) { + throw new Error(`DELETE: cannot change the physical resource ID from "${cfnRequest.PhysicalResourceId}" to "${handlerResponse.PhysicalResourceId}" during deletion`); + } + // merge request event and result event (result prevails). + return { + ...cfnRequest, + ...handlerResponse, + PhysicalResourceId: physicalResourceId, + }; +} +async function submitResponse(status, event) { + const json = { + Status: status, + Reason: event.Reason ?? status, + StackId: event.StackId, + RequestId: event.RequestId, + PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER, + LogicalResourceId: event.LogicalResourceId, + NoEcho: event.NoEcho, + Data: event.Data, + }; + exports.external.log('submit response to cloudformation', json); + const responseBody = JSON.stringify(json); + const parsedUrl = url.parse(event.ResponseURL); + const req = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { + 'content-type': '', + 'content-length': Buffer.byteLength(responseBody, 'utf8'), + }, + }; + const retryOptions = { + attempts: 5, + sleep: 1000, + }; + await withRetries(retryOptions, exports.external.sendHttpRequest)(req, responseBody); +} +async function defaultSendHttpRequest(options, responseBody) { + return new Promise((resolve, reject) => { + try { + const request = https.request(options, _ => resolve()); + request.on('error', reject); + request.write(responseBody); + request.end(); + } + catch (e) { + reject(e); + } + }); +} +function defaultLog(fmt, ...params) { + // eslint-disable-next-line no-console + console.log(fmt, ...params); +} +function withRetries(options, fn) { + return async (...xs) => { + let attempts = options.attempts; + let ms = options.sleep; + while (true) { + try { + return await fn(...xs); + } + catch (e) { + if (attempts-- <= 0) { + throw e; + } + await sleep(Math.floor(Math.random() * ms)); + ms *= 2; + } + } + }; +} +exports.withRetries = withRetries; +async function sleep(ms) { + return new Promise((ok) => setTimeout(ok, ms)); +} +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodejs-entrypoint.js","sourceRoot":"","sources":["nodejs-entrypoint.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAA2B;AAE3B,iBAAiB;AACJ,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,sBAAsB;IACvC,GAAG,EAAE,UAAU;IACf,kBAAkB,EAAE,IAAI;IACxB,gBAAgB,EAAE,SAAS;CAC5B,CAAC;AAEF,MAAM,gCAAgC,GAAG,wDAAwD,CAAC;AAClG,MAAM,0BAA0B,GAAG,8DAA8D,CAAC;AAW3F,KAAK,UAAU,OAAO,CAAC,KAAkD,EAAE,OAA0B;IAC1G,MAAM,cAAc,GAAG,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACxD,gBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3D,uEAAuE;IACvE,uEAAuE;IACvE,aAAa;IACb,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,kBAAkB,KAAK,gCAAgC,EAAE;QACnG,gBAAQ,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACtE,MAAM,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO;KACR;IAED,IAAI;QACF,yEAAyE;QACzE,iEAAiE;QACjE,wCAAwC;QACxC,iEAAiE;QACjE,MAAM,WAAW,GAAY,OAAO,CAAC,gBAAQ,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAE1D,uDAAuD;QACvD,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpD,2BAA2B;QAC3B,MAAM,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;KAChD;IAAC,OAAO,CAAM,EAAE;QACf,MAAM,IAAI,GAAa;YACrB,GAAG,KAAK;YACR,MAAM,EAAE,gBAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;SAC1D,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,yEAAyE;YACzE,mEAAmE;YACnE,wEAAwE;YACxE,qEAAqE;YACrE,gCAAgC;YAChC,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,EAAE;gBAClC,gBAAQ,CAAC,GAAG,CAAC,4GAA4G,CAAC,CAAC;gBAC3H,IAAI,CAAC,kBAAkB,GAAG,gCAAgC,CAAC;aAC5D;iBAAM;gBACL,kEAAkE;gBAClE,6DAA6D;gBAC7D,gBAAQ,CAAC,GAAG,CAAC,6DAA6D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACpG;SACF;QAED,mEAAmE;QACnE,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KACtC;AACH,CAAC;AAnDD,0BAmDC;AAED,SAAS,cAAc,CACrB,UAAyF,EACzF,kBAA0C,EAAG;IAE7C,sEAAsE;IACtE,uBAAuB;IACvB,MAAM,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,IAAI,UAAU,CAAC,kBAAkB,IAAI,UAAU,CAAC,SAAS,CAAC;IAEvH,kEAAkE;IAClE,IAAI,UAAU,CAAC,WAAW,KAAK,QAAQ,IAAI,kBAAkB,KAAK,UAAU,CAAC,kBAAkB,EAAE;QAC/F,MAAM,IAAI,KAAK,CAAC,wDAAwD,UAAU,CAAC,kBAAkB,SAAS,eAAe,CAAC,kBAAkB,mBAAmB,CAAC,CAAC;KACtK;IAED,0DAA0D;IAC1D,OAAO;QACL,GAAG,UAAU;QACb,GAAG,eAAe;QAClB,kBAAkB,EAAE,kBAAkB;KACvC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,MAA4B,EAAE,KAAe;IACzE,MAAM,IAAI,GAAmD;QAC3D,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;QAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,IAAI,0BAA0B;QAC1E,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IAEF,gBAAQ,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG;QACV,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,EAAE;YAClB,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC;SAC1D;KACF,CAAC;IAEF,MAAM,YAAY,GAAG;QACnB,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,IAAI;KACZ,CAAC;IACF,MAAM,WAAW,CAAC,YAAY,EAAE,gBAAQ,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAC/E,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,OAA6B,EAAE,YAAoB;IACvF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI;YACF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,GAAG,MAAa;IAC/C,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAC9B,CAAC;AASD,SAAgB,WAAW,CAA0B,OAAqB,EAAE,EAA4B;IACtG,OAAO,KAAK,EAAE,GAAG,EAAK,EAAE,EAAE;QACxB,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QACvB,OAAO,IAAI,EAAE;YACX,IAAI;gBACF,OAAO,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aACxB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,QAAQ,EAAE,IAAI,CAAC,EAAE;oBACnB,MAAM,CAAC,CAAC;iBACT;gBACD,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC5C,EAAE,IAAI,CAAC,CAAC;aACT;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAhBD,kCAgBC;AAED,KAAK,UAAU,KAAK,CAAC,EAAU;IAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC","sourcesContent":["import * as https from 'https';\nimport * as url from 'url';\n\n// for unit tests\nexport const external = {\n  sendHttpRequest: defaultSendHttpRequest,\n  log: defaultLog,\n  includeStackTraces: true,\n  userHandlerIndex: './index',\n};\n\nconst CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';\nconst MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';\n\nexport type Response = AWSLambda.CloudFormationCustomResourceEvent & HandlerResponse;\nexport type Handler = (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) => Promise<HandlerResponse | void>;\nexport type HandlerResponse = undefined | {\n  Data?: any;\n  PhysicalResourceId?: string;\n  Reason?: string;\n  NoEcho?: boolean;\n};\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  const sanitizedEvent = { ...event, ResponseURL: '...' };\n  external.log(JSON.stringify(sanitizedEvent, undefined, 2));\n\n  // ignore DELETE event when the physical resource ID is the marker that\n  // indicates that this DELETE is a subsequent DELETE to a failed CREATE\n  // operation.\n  if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {\n    external.log('ignoring DELETE event caused by a failed CREATE event');\n    await submitResponse('SUCCESS', event);\n    return;\n  }\n\n  try {\n    // invoke the user handler. this is intentionally inside the try-catch to\n    // ensure that if there is an error it's reported as a failure to\n    // cloudformation (otherwise cfn waits).\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const userHandler: Handler = require(external.userHandlerIndex).handler;\n    const result = await userHandler(sanitizedEvent, context);\n\n    // validate user response and create the combined event\n    const responseEvent = renderResponse(event, result);\n\n    // submit to cfn as success\n    await submitResponse('SUCCESS', responseEvent);\n  } catch (e: any) {\n    const resp: Response = {\n      ...event,\n      Reason: external.includeStackTraces ? e.stack : e.message,\n    };\n\n    if (!resp.PhysicalResourceId) {\n      // special case: if CREATE fails, which usually implies, we usually don't\n      // have a physical resource id. in this case, the subsequent DELETE\n      // operation does not have any meaning, and will likely fail as well. to\n      // address this, we use a marker so the provider framework can simply\n      // ignore the subsequent DELETE.\n      if (event.RequestType === 'Create') {\n        external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');\n        resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;\n      } else {\n        // otherwise, if PhysicalResourceId is not specified, something is\n        // terribly wrong because all other events should have an ID.\n        external.log(`ERROR: Malformed event. \"PhysicalResourceId\" is required: ${JSON.stringify(event)}`);\n      }\n    }\n\n    // this is an actual error, fail the activity altogether and exist.\n    await submitResponse('FAILED', resp);\n  }\n}\n\nfunction renderResponse(\n  cfnRequest: AWSLambda.CloudFormationCustomResourceEvent & { PhysicalResourceId?: string },\n  handlerResponse: void | HandlerResponse = { }): Response {\n\n  // if physical ID is not returned, we have some defaults for you based\n  // on the request type.\n  const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId;\n\n  // if we are in DELETE and physical ID was changed, it's an error.\n  if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {\n    throw new Error(`DELETE: cannot change the physical resource ID from \"${cfnRequest.PhysicalResourceId}\" to \"${handlerResponse.PhysicalResourceId}\" during deletion`);\n  }\n\n  // merge request event and result event (result prevails).\n  return {\n    ...cfnRequest,\n    ...handlerResponse,\n    PhysicalResourceId: physicalResourceId,\n  };\n}\n\nasync function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {\n  const json: AWSLambda.CloudFormationCustomResourceResponse = {\n    Status: status,\n    Reason: event.Reason ?? status,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,\n    LogicalResourceId: event.LogicalResourceId,\n    NoEcho: event.NoEcho,\n    Data: event.Data,\n  };\n\n  external.log('submit response to cloudformation', json);\n\n  const responseBody = JSON.stringify(json);\n  const parsedUrl = url.parse(event.ResponseURL);\n  const req = {\n    hostname: parsedUrl.hostname,\n    path: parsedUrl.path,\n    method: 'PUT',\n    headers: {\n      'content-type': '',\n      'content-length': Buffer.byteLength(responseBody, 'utf8'),\n    },\n  };\n\n  const retryOptions = {\n    attempts: 5,\n    sleep: 1000,\n  };\n  await withRetries(retryOptions, external.sendHttpRequest)(req, responseBody);\n}\n\nasync function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    try {\n      const request = https.request(options, _ => resolve());\n      request.on('error', reject);\n      request.write(responseBody);\n      request.end();\n    } catch (e) {\n      reject(e);\n    }\n  });\n}\n\nfunction defaultLog(fmt: string, ...params: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...params);\n}\n\nexport interface RetryOptions {\n  /** How many retries (will at least try once) */\n  readonly attempts: number;\n  /** Sleep base, in ms */\n  readonly sleep: number;\n}\n\nexport function withRetries<A extends Array<any>, B>(options: RetryOptions, fn: (...xs: A) => Promise<B>): (...xs: A) => Promise<B> {\n  return async (...xs: A) => {\n    let attempts = options.attempts;\n    let ms = options.sleep;\n    while (true) {\n      try {\n        return await fn(...xs);\n      } catch (e) {\n        if (attempts-- <= 0) {\n          throw e;\n        }\n        await sleep(Math.floor(Math.random() * ms));\n        ms *= 2;\n      }\n    }\n  };\n}\n\nasync function sleep(ms: number): Promise<void> {\n  return new Promise((ok) => setTimeout(ok, ms));\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/index.js new file mode 100644 index 0000000000000..cf597f535efd3 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd/index.js @@ -0,0 +1,81 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.handler = void 0; +// eslint-disable-next-line import/no-extraneous-dependencies +const aws_sdk_1 = require("aws-sdk"); +const ec2 = new aws_sdk_1.EC2(); +/** + * The default security group ingress rule. This can be used to both revoke and authorize the rules + */ +function ingressRuleParams(groupId, account) { + return { + GroupId: groupId, + IpPermissions: [{ + UserIdGroupPairs: [{ + GroupId: groupId, + UserId: account, + }], + IpProtocol: '-1', + }], + }; +} +/** + * The default security group egress rule. This can be used to both revoke and authorize the rules + */ +function egressRuleParams(groupId) { + return { + GroupId: groupId, + IpPermissions: [{ + IpRanges: [{ + CidrIp: '0.0.0.0/0', + }], + IpProtocol: '-1', + }], + }; +} +/** + * Process a custom resource request to restrict the default security group + * ingress & egress rules. + * + * When someone turns off the property then this custom resource will be deleted in which + * case we should add back the rules that were removed. + */ +async function handler(event) { + const securityGroupId = event.ResourceProperties.DefaultSecurityGroupId; + const account = event.ResourceProperties.Account; + switch (event.RequestType) { + case 'Create': + return revokeRules(securityGroupId, account); + case 'Update': + return onUpdate(event); + case 'Delete': + return authorizeRules(securityGroupId, account); + } +} +exports.handler = handler; +async function onUpdate(event) { + const oldSg = event.OldResourceProperties.DefaultSecurityGroupId; + const newSg = event.ResourceProperties.DefaultSecurityGroupId; + if (oldSg !== newSg) { + await authorizeRules(oldSg, event.ResourceProperties.Account); + await revokeRules(newSg, event.ResourceProperties.Account); + } + return; +} +/** + * Revoke both ingress and egress rules + */ +async function revokeRules(groupId, account) { + await ec2.revokeSecurityGroupEgress(egressRuleParams(groupId)).promise(); + await ec2.revokeSecurityGroupIngress(ingressRuleParams(groupId, account)).promise(); + return; +} +/** + * Authorize both ingress and egress rules + */ +async function authorizeRules(groupId, account) { + await ec2.authorizeSecurityGroupIngress(ingressRuleParams(groupId, account)).promise(); + await ec2.authorizeSecurityGroupEgress(egressRuleParams(groupId)).promise(); + return; +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2REFBNkQ7QUFDN0QscUNBQThCO0FBRTlCLE1BQU0sR0FBRyxHQUFHLElBQUksYUFBRyxFQUFFLENBQUM7QUFFdEI7O0dBRUc7QUFDSCxTQUFTLGlCQUFpQixDQUFDLE9BQWUsRUFBRSxPQUFlO0lBQ3pELE9BQU87UUFDTCxPQUFPLEVBQUUsT0FBTztRQUNoQixhQUFhLEVBQUUsQ0FBQztnQkFDZCxnQkFBZ0IsRUFBRSxDQUFDO3dCQUNqQixPQUFPLEVBQUUsT0FBTzt3QkFDaEIsTUFBTSxFQUFFLE9BQU87cUJBQ2hCLENBQUM7Z0JBQ0YsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQztLQUNILENBQUM7QUFDSixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxTQUFTLGdCQUFnQixDQUFDLE9BQWU7SUFDdkMsT0FBTztRQUNMLE9BQU8sRUFBRSxPQUFPO1FBQ2hCLGFBQWEsRUFBRSxDQUFDO2dCQUNkLFFBQVEsRUFBRSxDQUFDO3dCQUNULE1BQU0sRUFBRSxXQUFXO3FCQUNwQixDQUFDO2dCQUNGLFVBQVUsRUFBRSxJQUFJO2FBQ2pCLENBQUM7S0FDSCxDQUFDO0FBQ0osQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNJLEtBQUssVUFBVSxPQUFPLENBQUMsS0FBa0Q7SUFDOUUsTUFBTSxlQUFlLEdBQUcsS0FBSyxDQUFDLGtCQUFrQixDQUFDLHNCQUFzQixDQUFDO0lBQ3hFLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUM7SUFDakQsUUFBUSxLQUFLLENBQUMsV0FBVyxFQUFFO1FBQ3pCLEtBQUssUUFBUTtZQUNYLE9BQU8sV0FBVyxDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUMvQyxLQUFLLFFBQVE7WUFDWCxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6QixLQUFLLFFBQVE7WUFDWCxPQUFPLGNBQWMsQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDLENBQUM7S0FDbkQ7QUFDSCxDQUFDO0FBWEQsMEJBV0M7QUFDRCxLQUFLLFVBQVUsUUFBUSxDQUFDLEtBQXdEO0lBQzlFLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxzQkFBc0IsQ0FBQztJQUNqRSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsa0JBQWtCLENBQUMsc0JBQXNCLENBQUM7SUFDOUQsSUFBSSxLQUFLLEtBQUssS0FBSyxFQUFFO1FBQ25CLE1BQU0sY0FBYyxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDOUQsTUFBTSxXQUFXLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztLQUM1RDtJQUNELE9BQU87QUFDVCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsV0FBVyxDQUFDLE9BQWUsRUFBRSxPQUFlO0lBQ3pELE1BQU0sR0FBRyxDQUFDLHlCQUF5QixDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDekUsTUFBTSxHQUFHLENBQUMsMEJBQTBCLENBQUMsaUJBQWlCLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDcEYsT0FBTztBQUNULENBQUM7QUFFRDs7R0FFRztBQUNILEtBQUssVUFBVSxjQUFjLENBQUMsT0FBZSxFQUFFLE9BQWU7SUFDNUQsTUFBTSxHQUFHLENBQUMsNkJBQTZCLENBQUMsaUJBQWlCLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDdkYsTUFBTSxHQUFHLENBQUMsNEJBQTRCLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUM1RSxPQUFPO0FBQ1QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBpbXBvcnQvbm8tZXh0cmFuZW91cy1kZXBlbmRlbmNpZXNcbmltcG9ydCB7IEVDMiB9IGZyb20gJ2F3cy1zZGsnO1xuXG5jb25zdCBlYzIgPSBuZXcgRUMyKCk7XG5cbi8qKlxuICogVGhlIGRlZmF1bHQgc2VjdXJpdHkgZ3JvdXAgaW5ncmVzcyBydWxlLiBUaGlzIGNhbiBiZSB1c2VkIHRvIGJvdGggcmV2b2tlIGFuZCBhdXRob3JpemUgdGhlIHJ1bGVzXG4gKi9cbmZ1bmN0aW9uIGluZ3Jlc3NSdWxlUGFyYW1zKGdyb3VwSWQ6IHN0cmluZywgYWNjb3VudDogc3RyaW5nKTogRUMyLlJldm9rZVNlY3VyaXR5R3JvdXBJbmdyZXNzUmVxdWVzdCB8IEVDMi5BdXRob3JpemVTZWN1cml0eUdyb3VwSW5ncmVzc1JlcXVlc3Qge1xuICByZXR1cm4ge1xuICAgIEdyb3VwSWQ6IGdyb3VwSWQsXG4gICAgSXBQZXJtaXNzaW9uczogW3tcbiAgICAgIFVzZXJJZEdyb3VwUGFpcnM6IFt7XG4gICAgICAgIEdyb3VwSWQ6IGdyb3VwSWQsXG4gICAgICAgIFVzZXJJZDogYWNjb3VudCxcbiAgICAgIH1dLFxuICAgICAgSXBQcm90b2NvbDogJy0xJyxcbiAgICB9XSxcbiAgfTtcbn1cblxuLyoqXG4gKiBUaGUgZGVmYXVsdCBzZWN1cml0eSBncm91cCBlZ3Jlc3MgcnVsZS4gVGhpcyBjYW4gYmUgdXNlZCB0byBib3RoIHJldm9rZSBhbmQgYXV0aG9yaXplIHRoZSBydWxlc1xuICovXG5mdW5jdGlvbiBlZ3Jlc3NSdWxlUGFyYW1zKGdyb3VwSWQ6IHN0cmluZyk6IEVDMi5SZXZva2VTZWN1cml0eUdyb3VwRWdyZXNzUmVxdWVzdCB8IEVDMi5BdXRob3JpemVTZWN1cml0eUdyb3VwRWdyZXNzUmVxdWVzdCB7XG4gIHJldHVybiB7XG4gICAgR3JvdXBJZDogZ3JvdXBJZCxcbiAgICBJcFBlcm1pc3Npb25zOiBbe1xuICAgICAgSXBSYW5nZXM6IFt7XG4gICAgICAgIENpZHJJcDogJzAuMC4wLjAvMCcsXG4gICAgICB9XSxcbiAgICAgIElwUHJvdG9jb2w6ICctMScsXG4gICAgfV0sXG4gIH07XG59XG5cbi8qKlxuICogUHJvY2VzcyBhIGN1c3RvbSByZXNvdXJjZSByZXF1ZXN0IHRvIHJlc3RyaWN0IHRoZSBkZWZhdWx0IHNlY3VyaXR5IGdyb3VwXG4gKiBpbmdyZXNzICYgZWdyZXNzIHJ1bGVzLlxuICpcbiAqIFdoZW4gc29tZW9uZSB0dXJucyBvZmYgdGhlIHByb3BlcnR5IHRoZW4gdGhpcyBjdXN0b20gcmVzb3VyY2Ugd2lsbCBiZSBkZWxldGVkIGluIHdoaWNoXG4gKiBjYXNlIHdlIHNob3VsZCBhZGQgYmFjayB0aGUgcnVsZXMgdGhhdCB3ZXJlIHJlbW92ZWQuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBoYW5kbGVyKGV2ZW50OiBBV1NMYW1iZGEuQ2xvdWRGb3JtYXRpb25DdXN0b21SZXNvdXJjZUV2ZW50KTogUHJvbWlzZTx2b2lkPiB7XG4gIGNvbnN0IHNlY3VyaXR5R3JvdXBJZCA9IGV2ZW50LlJlc291cmNlUHJvcGVydGllcy5EZWZhdWx0U2VjdXJpdHlHcm91cElkO1xuICBjb25zdCBhY2NvdW50ID0gZXZlbnQuUmVzb3VyY2VQcm9wZXJ0aWVzLkFjY291bnQ7XG4gIHN3aXRjaCAoZXZlbnQuUmVxdWVzdFR5cGUpIHtcbiAgICBjYXNlICdDcmVhdGUnOlxuICAgICAgcmV0dXJuIHJldm9rZVJ1bGVzKHNlY3VyaXR5R3JvdXBJZCwgYWNjb3VudCk7XG4gICAgY2FzZSAnVXBkYXRlJzpcbiAgICAgIHJldHVybiBvblVwZGF0ZShldmVudCk7XG4gICAgY2FzZSAnRGVsZXRlJzpcbiAgICAgIHJldHVybiBhdXRob3JpemVSdWxlcyhzZWN1cml0eUdyb3VwSWQsIGFjY291bnQpO1xuICB9XG59XG5hc3luYyBmdW5jdGlvbiBvblVwZGF0ZShldmVudDogQVdTTGFtYmRhLkNsb3VkRm9ybWF0aW9uQ3VzdG9tUmVzb3VyY2VVcGRhdGVFdmVudCk6IFByb21pc2U8dm9pZD4ge1xuICBjb25zdCBvbGRTZyA9IGV2ZW50Lk9sZFJlc291cmNlUHJvcGVydGllcy5EZWZhdWx0U2VjdXJpdHlHcm91cElkO1xuICBjb25zdCBuZXdTZyA9IGV2ZW50LlJlc291cmNlUHJvcGVydGllcy5EZWZhdWx0U2VjdXJpdHlHcm91cElkO1xuICBpZiAob2xkU2cgIT09IG5ld1NnKSB7XG4gICAgYXdhaXQgYXV0aG9yaXplUnVsZXMob2xkU2csIGV2ZW50LlJlc291cmNlUHJvcGVydGllcy5BY2NvdW50KTtcbiAgICBhd2FpdCByZXZva2VSdWxlcyhuZXdTZywgZXZlbnQuUmVzb3VyY2VQcm9wZXJ0aWVzLkFjY291bnQpO1xuICB9XG4gIHJldHVybjtcbn1cblxuLyoqXG4gKiBSZXZva2UgYm90aCBpbmdyZXNzIGFuZCBlZ3Jlc3MgcnVsZXNcbiAqL1xuYXN5bmMgZnVuY3Rpb24gcmV2b2tlUnVsZXMoZ3JvdXBJZDogc3RyaW5nLCBhY2NvdW50OiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+IHtcbiAgYXdhaXQgZWMyLnJldm9rZVNlY3VyaXR5R3JvdXBFZ3Jlc3MoZWdyZXNzUnVsZVBhcmFtcyhncm91cElkKSkucHJvbWlzZSgpO1xuICBhd2FpdCBlYzIucmV2b2tlU2VjdXJpdHlHcm91cEluZ3Jlc3MoaW5ncmVzc1J1bGVQYXJhbXMoZ3JvdXBJZCwgYWNjb3VudCkpLnByb21pc2UoKTtcbiAgcmV0dXJuO1xufVxuXG4vKipcbiAqIEF1dGhvcml6ZSBib3RoIGluZ3Jlc3MgYW5kIGVncmVzcyBydWxlc1xuICovXG5hc3luYyBmdW5jdGlvbiBhdXRob3JpemVSdWxlcyhncm91cElkOiBzdHJpbmcsIGFjY291bnQ6IHN0cmluZyk6IFByb21pc2U8dm9pZD4ge1xuICBhd2FpdCBlYzIuYXV0aG9yaXplU2VjdXJpdHlHcm91cEluZ3Jlc3MoaW5ncmVzc1J1bGVQYXJhbXMoZ3JvdXBJZCwgYWNjb3VudCkpLnByb21pc2UoKTtcbiAgYXdhaXQgZWMyLmF1dGhvcml6ZVNlY3VyaXR5R3JvdXBFZ3Jlc3MoZWdyZXNzUnVsZVBhcmFtcyhncm91cElkKSkucHJvbWlzZSgpO1xuICByZXR1cm47XG59XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/aws-cdk-vpc-no-default-igw.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/aws-cdk-vpc-no-default-igw.assets.json new file mode 100644 index 0000000000000..3a7f4b4ecdc3b --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/aws-cdk-vpc-no-default-igw.assets.json @@ -0,0 +1,32 @@ +{ + "version": "32.0.0", + "files": { + "ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd": { + "source": { + "path": "asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "2b0168fea675c106b8a4f9e2e05c38b1ed7c1a032ed9ba0a40438b4686f0647d": { + "source": { + "path": "aws-cdk-vpc-no-default-igw.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "2b0168fea675c106b8a4f9e2e05c38b1ed7c1a032ed9ba0a40438b4686f0647d.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/aws-cdk-vpc-no-default-igw.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/aws-cdk-vpc-no-default-igw.template.json new file mode 100644 index 0000000000000..590b48899ad22 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/aws-cdk-vpc-no-default-igw.template.json @@ -0,0 +1,283 @@ +{ + "Resources": { + "MyVpcF9F0CA6F": { + "Type": "AWS::EC2::VPC", + "Properties": { + "CidrBlock": "10.0.0.0/16", + "EnableDnsHostnames": true, + "EnableDnsSupport": true, + "InstanceTenancy": "default", + "Tags": [ + { + "Key": "Name", + "Value": "aws-cdk-vpc-no-default-igw/MyVpc" + } + ] + } + }, + "MyVpcPublicSubnet1SubnetF6608456": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "VpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.0.0/17", + "MapPublicIpOnLaunch": true, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Public" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1" + } + ] + } + }, + "MyVpcPublicSubnet1RouteTableC46AB2F4": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "VpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "Tags": [ + { + "Key": "Name", + "Value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1" + } + ] + } + }, + "MyVpcPublicSubnet1RouteTableAssociation2ECEE1CB": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "MyVpcPublicSubnet1RouteTableC46AB2F4" + }, + "SubnetId": { + "Ref": "MyVpcPublicSubnet1SubnetF6608456" + } + } + }, + "MyVpcPublicSubnet2Subnet492B6BFB": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "VpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.128.0/17", + "MapPublicIpOnLaunch": true, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Public" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2" + } + ] + } + }, + "MyVpcPublicSubnet2RouteTable1DF17386": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "VpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "Tags": [ + { + "Key": "Name", + "Value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2" + } + ] + } + }, + "MyVpcPublicSubnet2RouteTableAssociation227DE78D": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "MyVpcPublicSubnet2RouteTable1DF17386" + }, + "SubnetId": { + "Ref": "MyVpcPublicSubnet2Subnet492B6BFB" + } + } + }, + "MyVpcRestrictDefaultSecurityGroupCustomResourceA4FCCD62": { + "Type": "Custom::VpcRestrictDefaultSG", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E", + "Arn" + ] + }, + "DefaultSecurityGroupId": { + "Fn::GetAtt": [ + "MyVpcF9F0CA6F", + "DefaultSecurityGroup" + ] + }, + "Account": { + "Ref": "AWS::AccountId" + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ], + "Policies": [ + { + "PolicyName": "Inline", + "PolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "ec2:AuthorizeSecurityGroupIngress", + "ec2:AuthorizeSecurityGroupEgress", + "ec2:RevokeSecurityGroupIngress", + "ec2:RevokeSecurityGroupEgress" + ], + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":ec2:", + { + "Ref": "AWS::Region" + }, + ":", + { + "Ref": "AWS::AccountId" + }, + ":security-group/", + { + "Fn::GetAtt": [ + "MyVpcF9F0CA6F", + "DefaultSecurityGroup" + ] + } + ] + ] + } + ] + } + ] + } + } + ] + } + }, + "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "__entrypoint__.handler", + "Role": { + "Fn::GetAtt": [ + "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0", + "Arn" + ] + }, + "Runtime": "nodejs16.x", + "Description": "Lambda function for removing all inbound/outbound rules from the VPC default security group" + }, + "DependsOn": [ + "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0" + ] + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "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." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/cdk.out new file mode 100644 index 0000000000000..f0b901e7c06e5 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"32.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/integ.json new file mode 100644 index 0000000000000..2bb4d81bb1057 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "32.0.0", + "testCases": { + "VpcNoDefaultIgw/DefaultTest": { + "stacks": [ + "aws-cdk-vpc-no-default-igw" + ], + "assertionStack": "VpcNoDefaultIgw/DefaultTest/DeployAssert", + "assertionStackName": "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/manifest.json new file mode 100644 index 0000000000000..9ea1feb0f5fb5 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/manifest.json @@ -0,0 +1,165 @@ +{ + "version": "32.0.0", + "artifacts": { + "aws-cdk-vpc-no-default-igw.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "aws-cdk-vpc-no-default-igw.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "aws-cdk-vpc-no-default-igw": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "aws-cdk-vpc-no-default-igw.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}/2b0168fea675c106b8a4f9e2e05c38b1ed7c1a032ed9ba0a40438b4686f0647d.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "aws-cdk-vpc-no-default-igw.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": [ + "aws-cdk-vpc-no-default-igw.assets" + ], + "metadata": { + "/aws-cdk-vpc-no-default-igw/MyVpc/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcF9F0CA6F" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcPublicSubnet1SubnetF6608456" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcPublicSubnet1RouteTableC46AB2F4" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcPublicSubnet1RouteTableAssociation2ECEE1CB" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcPublicSubnet2Subnet492B6BFB" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcPublicSubnet2RouteTable1DF17386" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcPublicSubnet2RouteTableAssociation227DE78D" + } + ], + "/aws-cdk-vpc-no-default-igw/MyVpc/RestrictDefaultSecurityGroupCustomResource/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "MyVpcRestrictDefaultSecurityGroupCustomResourceA4FCCD62" + } + ], + "/aws-cdk-vpc-no-default-igw/Custom::VpcRestrictDefaultSGCustomResourceProvider/Role": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0" + } + ], + "/aws-cdk-vpc-no-default-igw/Custom::VpcRestrictDefaultSGCustomResourceProvider/Handler": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E" + } + ], + "/aws-cdk-vpc-no-default-igw/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/aws-cdk-vpc-no-default-igw/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "aws-cdk-vpc-no-default-igw" + }, + "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.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": [ + "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.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": [ + "VpcNoDefaultIgwDefaultTestDeployAssertDB3FDBEB.assets" + ], + "metadata": { + "/VpcNoDefaultIgw/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/VpcNoDefaultIgw/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "VpcNoDefaultIgw/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/tree.json new file mode 100644 index 0000000000000..ae5c3a8d11b01 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.js.snapshot/tree.json @@ -0,0 +1,384 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "aws-cdk-vpc-no-default-igw": { + "id": "aws-cdk-vpc-no-default-igw", + "path": "aws-cdk-vpc-no-default-igw", + "children": { + "MyVpc": { + "id": "MyVpc", + "path": "aws-cdk-vpc-no-default-igw/MyVpc", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPC", + "aws:cdk:cloudformation:props": { + "cidrBlock": "10.0.0.0/16", + "enableDnsHostnames": true, + "enableDnsSupport": true, + "instanceTenancy": "default", + "tags": [ + { + "key": "Name", + "value": "aws-cdk-vpc-no-default-igw/MyVpc" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", + "version": "0.0.0" + } + }, + "PublicSubnet1": { + "id": "PublicSubnet1", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.0.0/17", + "mapPublicIpOnLaunch": true, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Public" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "MyVpcPublicSubnet1RouteTableC46AB2F4" + }, + "subnetId": { + "Ref": "MyVpcPublicSubnet1SubnetF6608456" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "PublicSubnet2": { + "id": "PublicSubnet2", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.128.0/17", + "mapPublicIpOnLaunch": true, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Public" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "MyVpcF9F0CA6F" + }, + "tags": [ + { + "key": "Name", + "value": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/PublicSubnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "MyVpcPublicSubnet2RouteTable1DF17386" + }, + "subnetId": { + "Ref": "MyVpcPublicSubnet2Subnet492B6BFB" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "RestrictDefaultSecurityGroupCustomResource": { + "id": "RestrictDefaultSecurityGroupCustomResource", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/RestrictDefaultSecurityGroupCustomResource", + "children": { + "Default": { + "id": "Default", + "path": "aws-cdk-vpc-no-default-igw/MyVpc/RestrictDefaultSecurityGroupCustomResource/Default", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CustomResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.Vpc", + "version": "0.0.0" + } + }, + "Custom::VpcRestrictDefaultSGCustomResourceProvider": { + "id": "Custom::VpcRestrictDefaultSGCustomResourceProvider", + "path": "aws-cdk-vpc-no-default-igw/Custom::VpcRestrictDefaultSGCustomResourceProvider", + "children": { + "Staging": { + "id": "Staging", + "path": "aws-cdk-vpc-no-default-igw/Custom::VpcRestrictDefaultSGCustomResourceProvider/Staging", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "Role": { + "id": "Role", + "path": "aws-cdk-vpc-no-default-igw/Custom::VpcRestrictDefaultSGCustomResourceProvider/Role", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + }, + "Handler": { + "id": "Handler", + "path": "aws-cdk-vpc-no-default-igw/Custom::VpcRestrictDefaultSGCustomResourceProvider/Handler", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CustomResourceProvider", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-vpc-no-default-igw/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-vpc-no-default-igw/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "VpcNoDefaultIgw": { + "id": "VpcNoDefaultIgw", + "path": "VpcNoDefaultIgw", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "VpcNoDefaultIgw/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "VpcNoDefaultIgw/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.55" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "VpcNoDefaultIgw/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "VpcNoDefaultIgw/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "VpcNoDefaultIgw/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.55" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.ts new file mode 100644 index 0000000000000..d20d0c638c153 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-no-default-igw.ts @@ -0,0 +1,23 @@ +import * as cdk from 'aws-cdk-lib'; +import * as integ from '@aws-cdk/integ-tests-alpha'; +import * as ec2 from 'aws-cdk-lib/aws-ec2'; + +const app = new cdk.App(); + +const stack = new cdk.Stack(app, 'aws-cdk-vpc-no-default-igw'); + +new ec2.Vpc(stack, 'MyVpc', { + createInternetGateway: false, + subnetConfiguration: [ + { + subnetType: ec2.SubnetType.PUBLIC, + name: 'Public', + }, + ], +}); + +new integ.IntegTest(app, 'VpcNoDefaultIgw', { + testCases: [stack], +}); + +app.synth(); diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json index 0cd7d4c8ac54d..6add6d166f74c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json @@ -118,7 +118,7 @@ } } }, - "5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d": { + "03d17cf4c28db537b0022c15973dfcbf24c64d601c8683ad6048973e86263845": { "source": { "path": "awscdkeksclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json", "packaging": "file" @@ -126,12 +126,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d.json", + "objectKey": "03d17cf4c28db537b0022c15973dfcbf24c64d601c8683ad6048973e86263845.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "2475eaed1adaed8421c75fb7a497d8f1b0d697c9ba742619b8b3ebc492e71cd0": { + "ef91cf38027fbab9acc28eafb2336c591805c0cfbb3b8c5aa5cf7ab254ae7f0a": { "source": { "path": "awscdkeksclusteralbcontrollertestawscdkawseksKubectlProviderA1AC28D1.nested.template.json", "packaging": "file" @@ -139,12 +139,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "2475eaed1adaed8421c75fb7a497d8f1b0d697c9ba742619b8b3ebc492e71cd0.json", + "objectKey": "ef91cf38027fbab9acc28eafb2336c591805c0cfbb3b8c5aa5cf7ab254ae7f0a.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "d22501e675c0b5ebc6b919ce32ebad5790ef1f1c3a24785733a1ea78217ecc54": { + "62754c7e6bb26968937daae6e96929d03d6698fc78121759b492fa275c70254b": { "source": { "path": "aws-cdk-eks-cluster-alb-controller-test.template.json", "packaging": "file" @@ -152,7 +152,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d22501e675c0b5ebc6b919ce32ebad5790ef1f1c3a24785733a1ea78217ecc54.json", + "objectKey": "62754c7e6bb26968937daae6e96929d03d6698fc78121759b492fa275c70254b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json index f9ff6c069ec46..bffea8d634481 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -83,12 +83,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -207,12 +207,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -222,9 +222,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -252,15 +249,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -270,7 +267,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -287,21 +287,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,15 +326,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -347,7 +344,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -364,12 +364,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -387,11 +387,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -931,15 +931,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -947,17 +957,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "Clusterechoserver5815619F": { @@ -1055,7 +1055,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d.json" + "/03d17cf4c28db537b0022c15973dfcbf24c64d601c8683ad6048973e86263845.json" ] ] } @@ -1066,36 +1066,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/2475eaed1adaed8421c75fb7a497d8f1b0d697c9ba742619b8b3ebc492e71cd0.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusteralbcontrollertestVpcPrivateSubnet1Subnet7C7DBEE5Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1108,6 +1088,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/ef91cf38027fbab9acc28eafb2336c591805c0cfbb3b8c5aa5cf7ab254ae7f0a.json" + ] + ] } }, "DependsOn": [ @@ -1713,13 +1713,13 @@ }, "S3Key": "5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636d.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "IngressPingerFunctionServiceRoleD01E9C19", "Arn" ] }, - "Handler": "index.handler", "Runtime": "python3.9", "Timeout": 600, "VpcConfig": { @@ -1838,12 +1838,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "IngressPingerProviderframeworkonEventServiceRole89300FAD", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-alb-controller-test/IngressPinger/Provider)", "Environment": { "Variables": { @@ -1856,6 +1850,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "IngressPingerProviderframeworkonEventServiceRole89300FAD", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json index 50702707589eb..ed6cbd00f552e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksClusterResourceProvider5DBBAFBB.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksKubectlProviderA1AC28D1.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksKubectlProviderA1AC28D1.nested.template.json index 8136ec1156218..70fad39f3fe86 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksKubectlProviderA1AC28D1.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkeksclusteralbcontrollertestawscdkawseksKubectlProviderA1AC28D1.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": { + "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { "Type": "String" }, - "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { + "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": { "Type": "String" }, "referencetoawscdkeksclusteralbcontrollertestVpcPrivateSubnet1Subnet7C7DBEE5Ref": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/integ.json index 280db71d59c22..c4962e994f896 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-alb-controller-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-cluster-alb-controller/DefaultTest/DeployAssert", "assertionStackName": "awscdkclusteralbcontrollerDefaultTestDeployAssert78AE94CA" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json index 19739beab8d4d..68c7429365325 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json @@ -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}/d22501e675c0b5ebc6b919ce32ebad5790ef1f1c3a24785733a1ea78217ecc54.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/62754c7e6bb26968937daae6e96929d03d6698fc78121759b492fa275c70254b.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -417,16 +417,16 @@ "data": "awscdkeksclusteralbcontrollertestawscdkawseksKubectlProviderframeworkonEvent4AFC769CArn" } ], - "/aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": [ + "/aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn" + "data": "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref" } ], - "/aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": [ + "/aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref" + "data": "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn" } ], "/aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestVpcPrivateSubnet1Subnet7C7DBEE5Ref": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/tree.json index 236ae017e3559..805465973aeb6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/tree.json @@ -45,9 +45,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -75,7 +72,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -97,9 +97,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -109,7 +106,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -142,12 +142,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -186,15 +186,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -228,9 +228,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -258,7 +255,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -280,9 +280,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -292,7 +289,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -325,12 +325,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -355,9 +355,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -385,7 +382,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -407,9 +407,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -419,7 +416,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -452,12 +452,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -482,9 +482,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -512,7 +509,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -534,9 +534,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -546,7 +543,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-alb-controller-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -579,12 +579,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -624,11 +624,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1304,15 +1304,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1320,17 +1330,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1565,12 +1565,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1583,6 +1577,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1697,12 +1697,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1715,6 +1709,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1920,12 +1920,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -1947,6 +1941,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2141,12 +2141,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2165,6 +2159,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2359,12 +2359,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2383,6 +2377,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2601,7 +2601,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/5668822355521ba6595d0d082996b9c5c1d1b047f32bd57bf98780960aadea2d.json" + "/03d17cf4c28db537b0022c15973dfcbf24c64d601c8683ad6048973e86263845.json" ] ] } @@ -2664,9 +2664,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2678,6 +2675,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -2955,12 +2955,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -2973,6 +2967,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3017,17 +3017,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": { - "id": "reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn", - "path": "aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn", + "reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { + "id": "reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref", + "path": "aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { - "id": "reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref", - "path": "aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref", + "reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": { + "id": "reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn", + "path": "aws-cdk-eks-cluster-alb-controller-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3073,36 +3073,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/2475eaed1adaed8421c75fb7a497d8f1b0d697c9ba742619b8b3ebc492e71cd0.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusteralbcontrollertestClusterKubectlHandlerRole205F60D2Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusteralbcontrollertestKubectlLayerD13282C5Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusteralbcontrollertestVpcPrivateSubnet1Subnet7C7DBEE5Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3115,6 +3095,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/ef91cf38027fbab9acc28eafb2336c591805c0cfbb3b8c5aa5cf7ab254ae7f0a.json" + ] + ] } } }, @@ -3726,13 +3726,13 @@ }, "s3Key": "5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636d.zip" }, + "handler": "index.handler", "role": { "Fn::GetAtt": [ "IngressPingerFunctionServiceRoleD01E9C19", "Arn" ] }, - "handler": "index.handler", "runtime": "python3.9", "timeout": 600, "vpcConfig": { @@ -3929,12 +3929,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "IngressPingerProviderframeworkonEventServiceRole89300FAD", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-alb-controller-test/IngressPinger/Provider)", "environment": { "variables": { @@ -3947,6 +3941,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "IngressPingerProviderframeworkonEventServiceRole89300FAD", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.assets.json index 9fda6fa1a86c7..1bcc402a8bd7a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.assets.json @@ -79,7 +79,7 @@ } } }, - "c5d1910d2052114b90153ddce3507c2be8d8fc32658cc5f6f26479c2d9b4c04d": { + "bdf702e57b56cbfa0d04058257f2cf794def3496ab3121b25a1632b7e7d2016b": { "source": { "path": "awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "c5d1910d2052114b90153ddce3507c2be8d8fc32658cc5f6f26479c2d9b4c04d.json", + "objectKey": "bdf702e57b56cbfa0d04058257f2cf794def3496ab3121b25a1632b7e7d2016b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "f8757b6cec7292c3ef915e2e81011667ac5732ed877b1b81db216cd5c7414e23": { + "796ff19246e8d3cbe41a8bb2f1ce3b5dedb5687958765fad3a3031a77e0c3362": { "source": { "path": "awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "f8757b6cec7292c3ef915e2e81011667ac5732ed877b1b81db216cd5c7414e23.json", + "objectKey": "796ff19246e8d3cbe41a8bb2f1ce3b5dedb5687958765fad3a3031a77e0c3362.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "fbd0f01bbe40374113346ddb25746368edcaabb360cd23458c2205e39e46ec24": { + "10e329ef469b98a93b5919c149a66826866f25aec7efd58f05998bc90f2cd311": { "source": { "path": "aws-cdk-eks-cluster-bottlerocket-ng-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "fbd0f01bbe40374113346ddb25746368edcaabb360cd23458c2205e39e46ec24.json", + "objectKey": "10e329ef469b98a93b5919c149a66826866f25aec7efd58f05998bc90f2cd311.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.template.json index 8dc61d2e3b0e4..fb8208ebb9520 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.template.json @@ -50,9 +50,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -80,15 +77,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -98,7 +95,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -146,15 +146,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -174,9 +174,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -204,15 +201,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -222,7 +219,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -239,12 +239,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -254,9 +254,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -284,15 +281,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -302,7 +299,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -319,21 +319,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -361,15 +358,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -379,7 +376,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -396,12 +396,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -419,11 +419,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -961,15 +961,22 @@ "ClusterNodegroupBottlerocketNG1B78D1784": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "BOTTLEROCKET_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupBottlerocketNG1NodeGroupRoleF0E6A2C6", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -977,14 +984,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "BOTTLEROCKET_x86_64", - "ForceUpdateEnabled": true, - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 1 - } + ] } }, "ClusterNodegroupBottlerocketNG2NodeGroupRole8BD62EDB": { @@ -1045,15 +1045,22 @@ "ClusterNodegroupBottlerocketNG299226DAB": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "BOTTLEROCKET_ARM_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupBottlerocketNG2NodeGroupRole8BD62EDB", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1061,14 +1068,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "BOTTLEROCKET_ARM_64", - "ForceUpdateEnabled": true, - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 1 - } + ] } }, "awscdkawseksClusterResourceProviderNestedStackawscdkawseksClusterResourceProviderNestedStackResource9827C454": { @@ -1090,7 +1090,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/c5d1910d2052114b90153ddce3507c2be8d8fc32658cc5f6f26479c2d9b4c04d.json" + "/bdf702e57b56cbfa0d04058257f2cf794def3496ab3121b25a1632b7e7d2016b.json" ] ] } @@ -1101,36 +1101,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/f8757b6cec7292c3ef915e2e81011667ac5732ed877b1b81db216cd5c7414e23.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterbottlerocketngtestVpcPrivateSubnet1Subnet2EA4083BRef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1143,6 +1123,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/796ff19246e8d3cbe41a8bb2f1ce3b5dedb5687958765fad3a3031a77e0c3362.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json index 4441a8fa22160..74aaac95963f3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksClusterResourceProvider7EC04E81.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json index 79592e758c36a..a14bd873f5644 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderE02BC096.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": { + "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { "Type": "String" }, - "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { + "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": { "Type": "String" }, "referencetoawscdkeksclusterbottlerocketngtestVpcPrivateSubnet1Subnet2EA4083BRef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/integ.json index 308fcf700c2f2..98b3e61f699e5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-bottlerocket-ng-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-cluster-bottlerocket-ng/DefaultTest/DeployAssert", "assertionStackName": "awscdkeksclusterbottlerocketngDefaultTestDeployAssert6C42FFE7" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/manifest.json index a69a39f82ed83..022384ef7f4ac 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/manifest.json @@ -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}/fbd0f01bbe40374113346ddb25746368edcaabb360cd23458c2205e39e46ec24.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/10e329ef469b98a93b5919c149a66826866f25aec7efd58f05998bc90f2cd311.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -429,16 +429,16 @@ "data": "awscdkeksclusterbottlerocketngtestawscdkawseksKubectlProviderframeworkonEvent3ECB1FCDArn" } ], - "/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": [ + "/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn" + "data": "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref" } ], - "/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": [ + "/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref" + "data": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn" } ], "/aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestVpcPrivateSubnet1Subnet2EA4083BRef": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/tree.json index 095f232499971..1623bb150c641 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.js.snapshot/tree.json @@ -103,9 +103,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -133,7 +130,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -155,9 +155,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -167,7 +164,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -200,12 +200,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -244,15 +244,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -286,9 +286,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -316,7 +313,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -338,9 +338,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -350,7 +347,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -383,12 +383,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -413,9 +413,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -443,7 +440,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -465,9 +465,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -477,7 +474,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -510,12 +510,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -540,9 +540,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -570,7 +567,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -592,9 +592,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -604,7 +601,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-bottlerocket-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -637,12 +637,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -682,11 +682,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1350,15 +1350,22 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "BOTTLEROCKET_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupBottlerocketNG1NodeGroupRoleF0E6A2C6", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1366,14 +1373,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "BOTTLEROCKET_x86_64", - "forceUpdateEnabled": true, - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -1478,15 +1478,22 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "BOTTLEROCKET_ARM_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupBottlerocketNG2NodeGroupRole8BD62EDB", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1494,14 +1501,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "BOTTLEROCKET_ARM_64", - "forceUpdateEnabled": true, - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -1680,12 +1680,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1698,6 +1692,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1812,12 +1812,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1830,6 +1824,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -2035,12 +2035,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2062,6 +2056,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2256,12 +2256,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2280,6 +2274,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2474,12 +2474,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2498,6 +2492,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2716,7 +2716,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/c5d1910d2052114b90153ddce3507c2be8d8fc32658cc5f6f26479c2d9b4c04d.json" + "/bdf702e57b56cbfa0d04058257f2cf794def3496ab3121b25a1632b7e7d2016b.json" ] ] } @@ -2779,9 +2779,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2793,6 +2790,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3070,12 +3070,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3088,6 +3082,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3132,17 +3132,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": { - "id": "reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn", - "path": "aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn", + "reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { + "id": "reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref", + "path": "aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { - "id": "reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref", - "path": "aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref", + "reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": { + "id": "reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn", + "path": "aws-cdk-eks-cluster-bottlerocket-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3188,36 +3188,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/f8757b6cec7292c3ef915e2e81011667ac5732ed877b1b81db216cd5c7414e23.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterbottlerocketngtestClusterKubectlHandlerRoleF0C5857AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterbottlerocketngtestKubectlLayer779BB176Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterbottlerocketngtestVpcPrivateSubnet1Subnet2EA4083BRef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3230,6 +3210,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/796ff19246e8d3cbe41a8bb2f1ce3b5dedb5687958765fad3a3031a77e0c3362.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.assets.json index 6975c3128bbe1..0ab5ec9ff370d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.assets.json @@ -79,7 +79,7 @@ } } }, - "3af4e4f5c4f27ade6e70f80b92bc9f1cb1d3bf760e2c5d983b2488c37e4d2893": { + "8424daa9cfcccc73abb4d66980ab63605a3ee5ce37f4abe1c57eae0711a049b4": { "source": { "path": "awscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "3af4e4f5c4f27ade6e70f80b92bc9f1cb1d3bf760e2c5d983b2488c37e4d2893.json", + "objectKey": "8424daa9cfcccc73abb4d66980ab63605a3ee5ce37f4abe1c57eae0711a049b4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "f0553233c8bc498ac0bf02b2025951aa313d03d16381ef35b46b858a6ee0989e": { + "458ef586f4450721bfb17837974eac5e52e9e1a5d2921c1dc251b38ab2192fea": { "source": { "path": "awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "f0553233c8bc498ac0bf02b2025951aa313d03d16381ef35b46b858a6ee0989e.json", + "objectKey": "458ef586f4450721bfb17837974eac5e52e9e1a5d2921c1dc251b38ab2192fea.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "949210bce6bda422c9d512ed3cf617562040ad2808849d5b190bdecc112bdeaa": { + "957237d98b62add081e745fac7caa18a6dd4dfdc97c53ce3eb35418abbf16e2a": { "source": { "path": "aws-cdk-eks-handlers-in-vpc-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "949210bce6bda422c9d512ed3cf617562040ad2808849d5b190bdecc112bdeaa.json", + "objectKey": "957237d98b62add081e745fac7caa18a6dd4dfdc97c53ce3eb35418abbf16e2a.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json index 6b73da8d4583e..aa898452ec988 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json @@ -31,9 +31,6 @@ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1SubnetEA05A5C7": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -61,15 +58,15 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1RouteTable183714C5": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -79,7 +76,10 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1RouteTableAssociation1012ACB8": { @@ -96,12 +96,12 @@ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1DefaultRoute8E294BC5": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1RouteTable183714C5" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" + }, + "RouteTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1RouteTable183714C5" } }, "DependsOn": [ @@ -127,15 +127,15 @@ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1NATGatewayFD57AC6C": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1SubnetEA05A5C7" - }, "AllocationId": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1EIP9380B54C", "AllocationId" ] }, + "SubnetId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1SubnetEA05A5C7" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -155,9 +155,6 @@ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2Subnet8A9F7D50": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -185,15 +182,15 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2RouteTableE4762B74": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -203,7 +200,10 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2RouteTableAssociation5DFA3BFD": { @@ -220,12 +220,12 @@ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2DefaultRouteC7B27F81": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2RouteTableE4762B74" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" + }, + "RouteTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2RouteTableE4762B74" } }, "DependsOn": [ @@ -251,15 +251,15 @@ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2NATGatewayEC0B8252": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2Subnet8A9F7D50" - }, "AllocationId": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2EIP9186922F", "AllocationId" ] }, + "SubnetId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2Subnet8A9F7D50" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -279,9 +279,6 @@ "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -309,15 +306,15 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1RouteTableF214D04E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -327,7 +324,10 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1RouteTableAssociationC09E4B48": { @@ -344,21 +344,18 @@ "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1DefaultRoute27B45BF6": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1RouteTableF214D04E" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1NATGatewayFD57AC6C" + }, + "RouteTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1RouteTableF214D04E" } } }, "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -386,15 +383,15 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2RouteTable22627B70": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -404,7 +401,10 @@ "Key": "Name", "Value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2RouteTableAssociation475205D6": { @@ -421,12 +421,12 @@ "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2DefaultRoute8A741F7F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2RouteTable22627B70" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2NATGatewayEC0B8252" + }, + "RouteTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2RouteTable22627B70" } } }, @@ -444,11 +444,11 @@ "EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "InternetGatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" + }, + "VpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" } } }, @@ -916,15 +916,25 @@ "EksAllHandlersInVpcStackNodegroupDefaultCapacityD8DD5ECF": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "EksAllHandlersInVpcStack9ED695D7" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackNodegroupDefaultCapacityNodeGroupRoleFFBF949C", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" @@ -932,17 +942,7 @@ { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "EksAllHandlersInVpcStackAwsAuthmanifest66335CD9": { @@ -990,6 +990,17 @@ "awscdkawseksClusterResourceProviderNestedStackawscdkawseksClusterResourceProviderNestedStackResource9827C454": { "Type": "AWS::CloudFormation::Stack", "Properties": { + "Parameters": { + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcE40EA7ACRef": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + }, + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" + }, + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet2Subnet9480A740Ref": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3" + } + }, "TemplateURL": { "Fn::Join": [ "", @@ -1006,20 +1017,9 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/3af4e4f5c4f27ade6e70f80b92bc9f1cb1d3bf760e2c5d983b2488c37e4d2893.json" + "/8424daa9cfcccc73abb4d66980ab63605a3ee5ce37f4abe1c57eae0711a049b4.json" ] ] - }, - "Parameters": { - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcE40EA7ACRef": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" - }, - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet2Subnet9480A740Ref": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3" - } } }, "DependsOn": [ @@ -1034,36 +1034,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/f0553233c8bc498ac0bf02b2025951aa313d03d16381ef35b46b858a6ee0989e.json" - ] - ] - }, "Parameters": { + "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackKubectlHandlerRole8F0B14B8", "Arn" ] }, - "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" }, @@ -1076,6 +1056,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/458ef586f4450721bfb17837974eac5e52e9e1a5d2921c1dc251b38ab2192fea.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json index 3f8b759d660ec..74ce1ac71ec8e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksClusterResourceProvider9260AB35.nested.template.json @@ -80,12 +80,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -98,6 +92,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60, "VpcConfig": { @@ -191,12 +191,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -209,6 +203,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60, "VpcConfig": { @@ -371,12 +371,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -398,6 +392,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -554,12 +554,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -578,6 +572,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -734,12 +734,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -758,6 +752,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json index 082644bc6a14e..5f178a77e6d6d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/awscdkekshandlersinvpctestawscdkawseksKubectlProvider72227111.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": { + "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": { "Type": "String" }, - "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": { + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": { "Type": "String" }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/integ.json index faa554db0f324..db1a0e39bb8ec 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-handlers-in-vpc-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-handlers-in-vpc/DefaultTest/DeployAssert", "assertionStackName": "awscdkekshandlersinvpcDefaultTestDeployAssert40766711" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/manifest.json index 0f8d4fa58966b..41d3f147b370f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/manifest.json @@ -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}/949210bce6bda422c9d512ed3cf617562040ad2808849d5b190bdecc112bdeaa.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/957237d98b62add081e745fac7caa18a6dd4dfdc97c53ce3eb35418abbf16e2a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -459,16 +459,16 @@ "data": "awscdkekshandlersinvpctestawscdkawseksKubectlProviderframeworkonEventB8D0A5E7Arn" } ], - "/aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": [ + "/aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn" + "data": "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef" } ], - "/aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef": [ + "/aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef" + "data": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn" } ], "/aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/tree.json index 591ed9b9e4083..551d0ca42a25a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/tree.json @@ -106,9 +106,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -136,7 +133,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -158,9 +158,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -170,7 +167,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -203,12 +203,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1RouteTable183714C5" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" + }, + "routeTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1RouteTable183714C5" } } }, @@ -247,15 +247,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1SubnetEA05A5C7" - }, "allocationId": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1EIP9380B54C", "AllocationId" ] }, + "subnetId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1SubnetEA05A5C7" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -289,9 +289,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -319,7 +316,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -341,9 +341,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -353,7 +350,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -386,12 +386,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2RouteTableE4762B74" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" + }, + "routeTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2RouteTableE4762B74" } } }, @@ -430,15 +430,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2Subnet8A9F7D50" - }, "allocationId": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2EIP9186922F", "AllocationId" ] }, + "subnetId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2Subnet8A9F7D50" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -472,9 +472,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -502,7 +499,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -524,9 +524,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -536,7 +533,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -569,12 +569,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1RouteTableF214D04E" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1NATGatewayFD57AC6C" + }, + "routeTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1RouteTableF214D04E" } } }, @@ -599,9 +599,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -629,7 +626,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -651,9 +651,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -663,7 +660,10 @@ "key": "Name", "value": "aws-cdk-eks-handlers-in-vpc-test/EksAllHandlersInVpcStack/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + } } }, "constructInfo": { @@ -696,12 +696,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2RouteTable22627B70" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2NATGatewayEC0B8252" + }, + "routeTableId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2RouteTable22627B70" } } }, @@ -741,11 +741,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, "internetGatewayId": { "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" + }, + "vpcId": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" } } }, @@ -1294,15 +1294,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "EksAllHandlersInVpcStack9ED695D7" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackNodegroupDefaultCapacityNodeGroupRoleFFBF949C", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" @@ -1310,17 +1320,7 @@ { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1583,12 +1583,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1601,6 +1595,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60, "vpcConfig": { @@ -1779,12 +1779,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1797,6 +1791,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60, "vpcConfig": { @@ -2066,12 +2066,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2093,6 +2087,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -2351,12 +2351,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2375,6 +2369,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -2633,12 +2633,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2657,6 +2651,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -2901,6 +2901,17 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { + "parameters": { + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcE40EA7ACRef": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" + }, + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" + }, + "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet2Subnet9480A740Ref": { + "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3" + } + }, "templateUrl": { "Fn::Join": [ "", @@ -2917,20 +2928,9 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/3af4e4f5c4f27ade6e70f80b92bc9f1cb1d3bf760e2c5d983b2488c37e4d2893.json" + "/8424daa9cfcccc73abb4d66980ab63605a3ee5ce37f4abe1c57eae0711a049b4.json" ] ] - }, - "parameters": { - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcE40EA7ACRef": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" - }, - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" - }, - "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet2Subnet9480A740Ref": { - "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet2SubnetFBAAF3E3" - } } } }, @@ -2991,9 +2991,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -3005,6 +3002,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3282,12 +3282,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3300,6 +3294,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3344,17 +3344,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": { - "id": "reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn", - "path": "aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn", + "reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef": { + "id": "reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef", + "path": "aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef": { - "id": "reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef", - "path": "aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestKubectlLayerAD42127BRef", + "reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": { + "id": "reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn", + "path": "aws-cdk-eks-handlers-in-vpc-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3400,36 +3400,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/f0553233c8bc498ac0bf02b2025951aa313d03d16381ef35b46b858a6ee0989e.json" - ] - ] - }, "parameters": { + "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackKubectlHandlerRole12BCDBC7Arn": { "Fn::GetAtt": [ "EksAllHandlersInVpcStackKubectlHandlerRole8F0B14B8", "Arn" ] }, - "referencetoawscdkekshandlersinvpctestKubectlLayerAD42127BRef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" }, @@ -3442,6 +3422,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/458ef586f4450721bfb17837974eac5e52e9e1a5d2921c1dc251b38ab2192fea.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.assets.json index d6d37bb094d98..4ed62dbb62c17 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.assets.json @@ -118,7 +118,7 @@ } } }, - "160cbfd74172100e122360e2a22d4e73adb815b232c9dc133d615a65d2387071": { + "d49a28b4a2bdf4c01ccd1d3b6850da410d69e434e5ebb1c0e4a6a79c58999709": { "source": { "path": "awscdkeksimportclustertestawscdkawseksClusterResourceProvider7AA2A5F4.nested.template.json", "packaging": "file" @@ -126,12 +126,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "160cbfd74172100e122360e2a22d4e73adb815b232c9dc133d615a65d2387071.json", + "objectKey": "d49a28b4a2bdf4c01ccd1d3b6850da410d69e434e5ebb1c0e4a6a79c58999709.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "b571289f1ed05b3bb654ce21dd6f218c6b09acec971b056b3b62e50abfe6f9e1": { + "bb48ed13f0eca488ce3f5d4f6dc253477544aaee9844f55e6742966db334fba7": { "source": { "path": "awscdkeksimportclustertestawscdkawseksKubectlProvider31F66FBD.nested.template.json", "packaging": "file" @@ -139,12 +139,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b571289f1ed05b3bb654ce21dd6f218c6b09acec971b056b3b62e50abfe6f9e1.json", + "objectKey": "bb48ed13f0eca488ce3f5d4f6dc253477544aaee9844f55e6742966db334fba7.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "b5cf24e2f61ed0423b825356bf3ec6cbc05e6f2210ba2fdabb487985d07196e8": { + "1bc81e193fc17b39e9cf938d6f06aa21800fefb6651bb4330f10e4c69032a7b0": { "source": { "path": "aws-cdk-eks-import-cluster-test.template.json", "packaging": "file" @@ -152,7 +152,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b5cf24e2f61ed0423b825356bf3ec6cbc05e6f2210ba2fdabb487985d07196e8.json", + "objectKey": "1bc81e193fc17b39e9cf938d6f06aa21800fefb6651bb4330f10e4c69032a7b0.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json index bad565ec552d9..c18a96a1afc68 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -83,12 +83,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -207,12 +207,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -222,9 +222,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -252,15 +249,15 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -270,7 +267,10 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -287,21 +287,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,15 +326,15 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -347,7 +344,10 @@ "Key": "Name", "Value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -364,12 +364,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -387,11 +387,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -996,15 +996,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1012,17 +1022,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "ClusterOpenIdConnectProviderE7EB0530": { @@ -1067,7 +1067,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/160cbfd74172100e122360e2a22d4e73adb815b232c9dc133d615a65d2387071.json" + "/d49a28b4a2bdf4c01ccd1d3b6850da410d69e434e5ebb1c0e4a6a79c58999709.json" ] ] } @@ -1078,36 +1078,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/b571289f1ed05b3bb654ce21dd6f218c6b09acec971b056b3b62e50abfe6f9e1.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksimportclustertestVpcPrivateSubnet1Subnet8DEF468ERef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1120,6 +1100,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/bb48ed13f0eca488ce3f5d4f6dc253477544aaee9844f55e6742966db334fba7.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksClusterResourceProvider7AA2A5F4.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksClusterResourceProvider7AA2A5F4.nested.template.json index 86f4c89a4283a..31d35d479e85b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksClusterResourceProvider7AA2A5F4.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksClusterResourceProvider7AA2A5F4.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksKubectlProvider31F66FBD.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksKubectlProvider31F66FBD.nested.template.json index 99ef60cbefd55..c9c2ed5e1fb39 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksKubectlProvider31F66FBD.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/awscdkeksimportclustertestawscdkawseksKubectlProvider31F66FBD.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": { + "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref": { "Type": "String" }, - "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref": { + "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": { "Type": "String" }, "referencetoawscdkeksimportclustertestVpcPrivateSubnet1Subnet8DEF468ERef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/integ.json index 25af9532a1e31..ec280eb0cda09 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-import-cluster-test" ], + "diffAssets": true, "cdkCommandOptions": { "deploy": { "args": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/manifest.json index 1910b5c790d78..9f362900b0da7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/manifest.json @@ -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}/b5cf24e2f61ed0423b825356bf3ec6cbc05e6f2210ba2fdabb487985d07196e8.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1bc81e193fc17b39e9cf938d6f06aa21800fefb6651bb4330f10e4c69032a7b0.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -423,16 +423,16 @@ "data": "awscdkeksimportclustertestawscdkawseksKubectlProviderframeworkonEvent301ACD4FArn" } ], - "/aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": [ + "/aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn" + "data": "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref" } ], - "/aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref": [ + "/aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref" + "data": "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn" } ], "/aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestVpcPrivateSubnet1Subnet8DEF468ERef": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/tree.json index 8fc183ed1a242..ddb2ad8b03378 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/tree.json @@ -45,9 +45,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -75,7 +72,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -97,9 +97,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -109,7 +106,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -142,12 +142,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -186,15 +186,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -228,9 +228,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -258,7 +255,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -280,9 +280,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -292,7 +289,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -325,12 +325,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -355,9 +355,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -385,7 +382,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -407,9 +407,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -419,7 +416,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -452,12 +452,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -482,9 +482,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -512,7 +509,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -534,9 +534,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -546,7 +543,10 @@ "key": "Name", "value": "aws-cdk-eks-import-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -579,12 +579,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -624,11 +624,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1376,15 +1376,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1392,17 +1402,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1625,12 +1625,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1643,6 +1637,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1757,12 +1757,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1775,6 +1769,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1980,12 +1980,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2007,6 +2001,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2201,12 +2201,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2225,6 +2219,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2419,12 +2419,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2443,6 +2437,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2661,7 +2661,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/160cbfd74172100e122360e2a22d4e73adb815b232c9dc133d615a65d2387071.json" + "/d49a28b4a2bdf4c01ccd1d3b6850da410d69e434e5ebb1c0e4a6a79c58999709.json" ] ] } @@ -2724,9 +2724,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2738,6 +2735,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3015,12 +3015,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3033,6 +3027,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3077,17 +3077,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": { - "id": "reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn", - "path": "aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn", + "reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref": { + "id": "reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref", + "path": "aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref": { - "id": "reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref", - "path": "aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestKubectlLayer51952008Ref", + "reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": { + "id": "reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn", + "path": "aws-cdk-eks-import-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3133,36 +3133,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/b571289f1ed05b3bb654ce21dd6f218c6b09acec971b056b3b62e50abfe6f9e1.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksimportclustertestClusterKubectlHandlerRole18502D21Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksimportclustertestKubectlLayer51952008Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksimportclustertestVpcPrivateSubnet1Subnet8DEF468ERef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3175,6 +3155,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/bb48ed13f0eca488ce3f5d4f6dc253477544aaee9844f55e6742966db334fba7.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.assets.json index 7509fc095c26f..5f8d41dedf525 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.assets.json @@ -127,7 +127,7 @@ } } }, - "519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14": { + "38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01": { "source": { "path": "awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json", "packaging": "file" @@ -135,13 +135,13 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14.json", + "objectKey": "38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } } }, - "feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104": { + "c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9": { "source": { "path": "awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json", "packaging": "file" @@ -149,13 +149,13 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104.json", + "objectKey": "c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } } }, - "d3529c1d4f247264cf0b12bcdd06f5aba7983b85b1ea267b6fd8b0569ea3a767": { + "2e89414f1121ee451ba0a62318b9f3ddecd3f8b5b7dc3c2d74b75df1e328a3af": { "source": { "path": "aws-cdk-eks-cluster-test.template.json", "packaging": "file" @@ -163,7 +163,7 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "d3529c1d4f247264cf0b12bcdd06f5aba7983b85b1ea267b6fd8b0569ea3a767.json", + "objectKey": "2e89414f1121ee451ba0a62318b9f3ddecd3f8b5b7dc3c2d74b75df1e328a3af.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.template.json index 3230da9828ae4..9b2ce6125c72a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-test.template.json @@ -77,9 +77,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AssignIpv6AddressOnCreation": true, "AvailabilityZone": { "Fn::Select": [ @@ -130,7 +127,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -139,9 +139,6 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -151,7 +148,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -174,12 +174,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -209,15 +209,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -238,9 +238,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AssignIpv6AddressOnCreation": true, "AvailabilityZone": { "Fn::Select": [ @@ -291,7 +288,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -300,9 +300,6 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -312,7 +309,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -335,12 +335,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AssignIpv6AddressOnCreation": true, "AvailabilityZone": { "Fn::Select": [ @@ -404,7 +401,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -413,9 +413,6 @@ "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -425,7 +422,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -448,12 +448,12 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } }, "DependsOn": [ @@ -463,9 +463,6 @@ "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AssignIpv6AddressOnCreation": true, "AvailabilityZone": { "Fn::Select": [ @@ -516,7 +513,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -525,9 +525,6 @@ "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -537,7 +534,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "DependsOn": [ "CIDR6" @@ -560,12 +560,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } }, "DependsOn": [ @@ -586,21 +586,21 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, "CIDR6": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { + "AmazonProvidedIpv6CidrBlock": true, "VpcId": { "Ref": "Vpc8378EB38" - }, - "AmazonProvidedIpv6CidrBlock": true + } } }, "KubectlLayer600207B5": { @@ -863,7 +863,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54443795AF111": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "FromPort": 443, "GroupId": { @@ -872,6 +871,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -887,7 +887,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A324439DAF9D77": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -896,6 +895,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -911,7 +911,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858443B84847DA": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "FromPort": 443, "GroupId": { @@ -920,6 +919,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -935,7 +935,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914443ECEF3F30": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "FromPort": 443, "GroupId": { @@ -944,6 +943,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -959,7 +959,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D474431DE5485F": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "FromPort": 443, "GroupId": { @@ -968,6 +967,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1284,7 +1284,6 @@ "ClusterClusterSecurityGroupfromIndirectPeerALLTRAFFICB574992D": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "CidrIpv6": { "Fn::Select": [ 0, @@ -1321,7 +1320,8 @@ "Cluster9EE0221C", "ClusterSecurityGroupId" ] - } + }, + "IpProtocol": "-1" }, "DependsOn": [ "CIDR6" @@ -1330,7 +1330,6 @@ "ClusterClusterSecurityGroupfrom100008ALLTRAFFIC1289F1DD": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "CidrIp": "10.0.0.0/8", "Description": "from 10.0.0.0/8:ALL TRAFFIC", "GroupId": { @@ -1338,7 +1337,8 @@ "Cluster9EE0221C", "ClusterSecurityGroupId" ] - } + }, + "IpProtocol": "-1" }, "DependsOn": [ "CIDR6" @@ -1347,7 +1347,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C544432C10EDB4": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "FromPort": 443, "GroupId": { @@ -1356,6 +1355,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1371,7 +1371,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54ALLTRAFFICA14EDC2C": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1379,6 +1378,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1393,7 +1393,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443175FB542": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -1402,6 +1401,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1417,7 +1417,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301344439997E64B": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -1426,6 +1425,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1441,7 +1441,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A321025655359034D5F2": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -1450,6 +1449,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1465,7 +1465,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134102565535D0C036C4": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -1474,6 +1473,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1489,7 +1489,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC3F547F1B": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1497,6 +1496,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1511,7 +1511,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858443A88C1345": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "FromPort": 443, "GroupId": { @@ -1520,6 +1519,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1535,7 +1535,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858ALLTRAFFIC18C2F6D7": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1543,6 +1542,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1557,7 +1557,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914443A80EB501": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "FromPort": 443, "GroupId": { @@ -1566,6 +1565,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1581,7 +1581,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914ALLTRAFFIC40B17035": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1589,6 +1588,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1603,7 +1603,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D474432A818F38": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "FromPort": 443, "GroupId": { @@ -1612,6 +1611,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1627,7 +1627,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47ALLTRAFFICDB5CD664": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1635,6 +1634,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1861,15 +1861,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1877,17 +1887,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] }, "DependsOn": [ "CIDR6" @@ -1993,7 +1993,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54ALLTRAFFICBC5FBE2E": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2001,6 +2000,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -2015,7 +2015,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443DC7FAF39": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -2024,6 +2023,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2039,7 +2039,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134443AE10EB12": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -2048,6 +2047,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2063,7 +2063,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32102565535D6A46ADB": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -2072,6 +2071,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2087,7 +2087,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301341025655359F401D0D": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -2096,6 +2095,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2111,7 +2111,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC14EF5815": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2119,6 +2118,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2365,8 +2365,6 @@ "ClusterNodesASGF172BD19": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "3", - "MinSize": "3", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterNodesLaunchTemplateD1028D0D" @@ -2378,6 +2376,8 @@ ] } }, + "MaxSize": "3", + "MinSize": "3", "Tags": [ { "Key": { @@ -2446,7 +2446,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858ALLTRAFFIC83BB7106": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2454,6 +2453,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -2468,7 +2468,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443AC8AE5BF": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -2477,6 +2476,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2492,7 +2492,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F13013444328ED4211": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -2501,6 +2500,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2516,7 +2516,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32102565535F5718241": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -2525,6 +2524,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2540,7 +2540,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F13013410256553586052D07": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -2549,6 +2548,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2564,7 +2564,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC655074AB": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2572,6 +2571,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2818,8 +2818,6 @@ "ClusterNodesArmASG40A593D0": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "1", - "MinSize": "1", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterNodesArmLaunchTemplateB6CFBA44" @@ -2831,6 +2829,8 @@ ] } }, + "MaxSize": "1", + "MinSize": "1", "Tags": [ { "Key": { @@ -2899,7 +2899,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914ALLTRAFFIC7B6353A7": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2907,6 +2906,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -2921,7 +2921,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443D1686B16": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -2930,6 +2929,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2945,7 +2945,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134443A6D43789": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -2954,6 +2953,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2969,7 +2969,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32102565535674E85A7": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -2978,6 +2977,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2993,7 +2993,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301341025655352CE8AD9A": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -3002,6 +3001,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3017,7 +3017,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFICFAF900F2": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -3025,6 +3024,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3271,8 +3271,6 @@ "ClusterBottlerocketNodesASGA27A9B70": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "2", - "MinSize": "2", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterBottlerocketNodesLaunchTemplate54246C29" @@ -3284,6 +3282,8 @@ ] } }, + "MaxSize": "2", + "MinSize": "2", "Tags": [ { "Key": { @@ -3352,7 +3352,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47ALLTRAFFIC2B1A12D9": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -3360,6 +3359,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -3374,7 +3374,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A324438F751704": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -3383,6 +3382,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3398,7 +3398,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301344430650F325": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -3407,6 +3406,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3422,7 +3422,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A321025655350D837827": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -3431,6 +3430,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3446,7 +3446,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134102565535C7203235": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -3455,6 +3454,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3470,7 +3470,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC59C23477": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -3478,6 +3477,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3730,8 +3730,6 @@ "ClusterspotASG857494B6": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "10", - "MinSize": "1", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterspotLaunchTemplate5652F38D" @@ -3743,6 +3741,8 @@ ] } }, + "MaxSize": "10", + "MinSize": "1", "Tags": [ { "Key": { @@ -3904,15 +3904,25 @@ "ClusterNodegroupextrangF9406A09": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "t3.small" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangNodeGroupRole23AE23D0", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 1, + "MaxSize": 1, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -3920,17 +3930,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "t3.small" - ], - "ScalingConfig": { - "DesiredSize": 1, - "MaxSize": 1, - "MinSize": 1 - } + ] }, "DependsOn": [ "CIDR6" @@ -4024,15 +4024,28 @@ "ClusterNodegroupextrangspotB327AE6B": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", + "CapacityType": "SPOT", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "c5.large", + "c5a.large", + "c5d.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangspotNodeGroupRoleB53B4857", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 3, + "MaxSize": 3, + "MinSize": 3 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4040,20 +4053,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "CapacityType": "SPOT", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "c5.large", - "c5a.large", - "c5d.large" - ], - "ScalingConfig": { - "DesiredSize": 3, - "MaxSize": 3, - "MinSize": 3 - } + ] }, "DependsOn": [ "CIDR6" @@ -4147,15 +4147,25 @@ "ClusterNodegroupextrangarm7773987A": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_ARM_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m6g.medium" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarmNodeGroupRoleADF5749F", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 1, + "MaxSize": 1, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4163,17 +4173,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_ARM_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m6g.medium" - ], - "ScalingConfig": { - "DesiredSize": 1, - "MaxSize": 1, - "MinSize": 1 - } + ] }, "DependsOn": [ "CIDR6" @@ -4267,15 +4267,25 @@ "ClusterNodegroupextrangarm327128311": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_ARM_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "c7g.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarm3NodeGroupRole3A6AB3EC", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 1, + "MaxSize": 1, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4283,17 +4293,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_ARM_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "c7g.large" - ], - "ScalingConfig": { - "DesiredSize": 1, - "MaxSize": 1, - "MinSize": 1 - } + ] }, "DependsOn": [ "CIDR6" @@ -4305,20 +4305,6 @@ "ClusterName": { "Ref": "Cluster9EE0221C" }, - "NodeRole": { - "Fn::GetAtt": [ - "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", - "Arn" - ] - }, - "Subnets": [ - { - "Ref": "VpcPrivateSubnet1Subnet536B997A" - }, - { - "Ref": "VpcPrivateSubnet2Subnet3788AAA1" - } - ], "ForceUpdateEnabled": true, "LaunchTemplate": { "Id": { @@ -4331,11 +4317,25 @@ ] } }, + "NodeRole": { + "Fn::GetAtt": [ + "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", + "Arn" + ] + }, "ScalingConfig": { "DesiredSize": 1, "MaxSize": 1, "MinSize": 1 - } + }, + "Subnets": [ + { + "Ref": "VpcPrivateSubnet1Subnet536B997A" + }, + { + "Ref": "VpcPrivateSubnet2Subnet3788AAA1" + } + ] }, "DependsOn": [ "CIDR6" @@ -4821,7 +4821,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "/519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14.json" + "/38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01.json" ] ] } @@ -4832,32 +4832,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.us-east-1.", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" - }, - "/feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -4870,6 +4854,22 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.us-east-1.", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" + }, + "/c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json index 9c0f53e86bcbb..4c46d5dc8c88a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json index e2af00433ec0b..32e261dbf363c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { + "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { "Type": "String" }, - "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { + "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { "Type": "String" }, "referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/integ.json index da43f497e587e..0a8e97417e938 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-test" ], + "diffAssets": true, "cdkCommandOptions": { "deploy": { "args": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/manifest.json index abc036022df2c..2954a4d6ac7ad 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/d3529c1d4f247264cf0b12bcdd06f5aba7983b85b1ea267b6fd8b0569ea3a767.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/2e89414f1121ee451ba0a62318b9f3ddecd3f8b5b7dc3c2d74b75df1e328a3af.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -1017,16 +1017,16 @@ "data": "awscdkeksclustertestawscdkawseksKubectlProviderframeworkonEventC681B49AArn" } ], - "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": [ + "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" + "data": "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef" } ], - "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": [ + "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef" + "data": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" } ], "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": [ @@ -1160,42 +1160,6 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } - ], - "ClusterNodesLaunchConfig7C420A27": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterNodesLaunchConfig7C420A27", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "ClusterNodesArmLaunchConfigAAF61344": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterNodesArmLaunchConfigAAF61344", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "ClusterBottlerocketNodesLaunchConfig76D7BEBE": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterBottlerocketNodesLaunchConfig76D7BEBE", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "ClusterspotLaunchConfigCC19F2E6": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterspotLaunchConfigCC19F2E6", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } ] }, "displayName": "aws-cdk-eks-cluster-test" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/tree.json index 51138d3b82b6f..3c4103bcf86e8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/tree.json @@ -146,9 +146,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "assignIpv6AddressOnCreation": true, "availabilityZone": { "Fn::Select": [ @@ -199,7 +196,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -221,9 +221,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -233,7 +230,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -266,12 +266,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -310,15 +310,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -352,9 +352,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "assignIpv6AddressOnCreation": true, "availabilityZone": { "Fn::Select": [ @@ -405,7 +402,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -427,9 +427,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -439,7 +436,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -472,12 +472,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -502,9 +502,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "assignIpv6AddressOnCreation": true, "availabilityZone": { "Fn::Select": [ @@ -555,7 +552,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -577,9 +577,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -589,7 +586,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -622,12 +622,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -652,9 +652,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "assignIpv6AddressOnCreation": true, "availabilityZone": { "Fn::Select": [ @@ -705,7 +702,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -727,9 +727,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -739,7 +736,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -772,12 +772,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -817,11 +817,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -842,10 +842,10 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { + "amazonProvidedIpv6CidrBlock": true, "vpcId": { "Ref": "Vpc8378EB38" - }, - "amazonProvidedIpv6CidrBlock": true + } } }, "constructInfo": { @@ -1234,7 +1234,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "fromPort": 443, "groupId": { @@ -1243,6 +1242,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1263,7 +1263,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -1272,6 +1271,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1292,7 +1292,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "fromPort": 443, "groupId": { @@ -1301,6 +1300,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1321,7 +1321,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "fromPort": 443, "groupId": { @@ -1330,6 +1329,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1350,7 +1350,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "fromPort": 443, "groupId": { @@ -1359,6 +1358,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1593,7 +1593,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "cidrIpv6": { "Fn::Select": [ 0, @@ -1630,7 +1629,8 @@ "Cluster9EE0221C", "ClusterSecurityGroupId" ] - } + }, + "ipProtocol": "-1" } }, "constructInfo": { @@ -1644,7 +1644,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "cidrIp": "10.0.0.0/8", "description": "from 10.0.0.0/8:ALL TRAFFIC", "groupId": { @@ -1652,7 +1651,8 @@ "Cluster9EE0221C", "ClusterSecurityGroupId" ] - } + }, + "ipProtocol": "-1" } }, "constructInfo": { @@ -1666,7 +1666,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "fromPort": 443, "groupId": { @@ -1675,6 +1674,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1695,7 +1695,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1703,6 +1702,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1722,7 +1722,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -1731,6 +1730,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1751,7 +1751,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -1760,6 +1759,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1780,7 +1780,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -1789,6 +1788,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1809,7 +1809,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -1818,6 +1817,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1838,7 +1838,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1846,6 +1845,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1865,7 +1865,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "fromPort": 443, "groupId": { @@ -1874,6 +1873,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1894,7 +1894,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1902,6 +1901,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1921,7 +1921,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "fromPort": 443, "groupId": { @@ -1930,6 +1929,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1950,7 +1950,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1958,6 +1957,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1977,7 +1977,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "fromPort": 443, "groupId": { @@ -1986,6 +1985,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -2006,7 +2006,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2014,6 +2013,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -2212,15 +2212,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -2228,17 +2238,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -2397,7 +2397,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2405,6 +2404,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -2424,7 +2424,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -2433,6 +2432,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2453,7 +2453,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -2462,6 +2461,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2482,7 +2482,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -2491,6 +2490,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2511,7 +2511,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -2520,6 +2519,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2540,7 +2540,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2548,6 +2547,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2686,6 +2686,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/Nodes/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/Nodes/LaunchTemplate", @@ -2847,8 +2855,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "3", - "minSize": "3", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterNodesLaunchTemplateD1028D0D" @@ -2860,6 +2866,8 @@ ] } }, + "maxSize": "3", + "minSize": "3", "tags": [ { "key": { @@ -2947,7 +2955,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2955,6 +2962,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -2974,7 +2982,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -2983,6 +2990,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3003,7 +3011,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -3012,6 +3019,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3032,7 +3040,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -3041,6 +3048,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3061,7 +3069,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -3070,6 +3077,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3090,7 +3098,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3098,6 +3105,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3236,6 +3244,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/NodesArm/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/NodesArm/LaunchTemplate", @@ -3397,8 +3413,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "1", - "minSize": "1", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterNodesArmLaunchTemplateB6CFBA44" @@ -3410,6 +3424,8 @@ ] } }, + "maxSize": "1", + "minSize": "1", "tags": [ { "key": { @@ -3497,7 +3513,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3505,6 +3520,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -3524,7 +3540,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -3533,6 +3548,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3553,7 +3569,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -3562,6 +3577,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3582,7 +3598,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -3591,6 +3606,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3611,7 +3627,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -3620,6 +3635,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3640,7 +3656,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3648,6 +3663,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3786,6 +3802,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/BottlerocketNodes/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/BottlerocketNodes/LaunchTemplate", @@ -3947,8 +3971,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "2", - "minSize": "2", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterBottlerocketNodesLaunchTemplate54246C29" @@ -3960,6 +3982,8 @@ ] } }, + "maxSize": "2", + "minSize": "2", "tags": [ { "key": { @@ -4047,7 +4071,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -4055,6 +4078,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -4074,7 +4098,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -4083,6 +4106,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -4103,7 +4127,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -4112,6 +4135,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -4132,7 +4156,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -4141,6 +4164,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -4161,7 +4185,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -4170,6 +4193,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -4190,7 +4214,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -4198,6 +4221,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -4336,6 +4360,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/spot/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/spot/LaunchTemplate", @@ -4503,8 +4535,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "10", - "minSize": "1", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterspotLaunchTemplate5652F38D" @@ -4516,6 +4546,8 @@ ] } }, + "maxSize": "10", + "minSize": "1", "tags": [ { "key": { @@ -4720,15 +4752,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "t3.small" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangNodeGroupRole23AE23D0", "Arn" ] }, + "scalingConfig": { + "desiredSize": 1, + "maxSize": 1, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4736,17 +4778,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "t3.small" - ], - "scalingConfig": { - "desiredSize": 1, - "maxSize": 1, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -4893,15 +4925,28 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", + "capacityType": "SPOT", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "c5.large", + "c5a.large", + "c5d.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangspotNodeGroupRoleB53B4857", "Arn" ] }, + "scalingConfig": { + "desiredSize": 3, + "maxSize": 3, + "minSize": 3 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4909,20 +4954,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "capacityType": "SPOT", - "forceUpdateEnabled": true, - "instanceTypes": [ - "c5.large", - "c5a.large", - "c5d.large" - ], - "scalingConfig": { - "desiredSize": 3, - "maxSize": 3, - "minSize": 3 - } + ] } }, "constructInfo": { @@ -5069,15 +5101,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_ARM_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m6g.medium" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarmNodeGroupRoleADF5749F", "Arn" ] }, + "scalingConfig": { + "desiredSize": 1, + "maxSize": 1, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -5085,17 +5127,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_ARM_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m6g.medium" - ], - "scalingConfig": { - "desiredSize": 1, - "maxSize": 1, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -5242,15 +5274,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_ARM_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "c7g.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarm3NodeGroupRole3A6AB3EC", "Arn" ] }, + "scalingConfig": { + "desiredSize": 1, + "maxSize": 1, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -5258,17 +5300,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_ARM_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "c7g.large" - ], - "scalingConfig": { - "desiredSize": 1, - "maxSize": 1, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -5295,20 +5327,6 @@ "clusterName": { "Ref": "Cluster9EE0221C" }, - "nodeRole": { - "Fn::GetAtt": [ - "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", - "Arn" - ] - }, - "subnets": [ - { - "Ref": "VpcPrivateSubnet1Subnet536B997A" - }, - { - "Ref": "VpcPrivateSubnet2Subnet3788AAA1" - } - ], "forceUpdateEnabled": true, "launchTemplate": { "id": { @@ -5321,11 +5339,25 @@ ] } }, + "nodeRole": { + "Fn::GetAtt": [ + "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", + "Arn" + ] + }, "scalingConfig": { "desiredSize": 1, "maxSize": 1, "minSize": 1 - } + }, + "subnets": [ + { + "Ref": "VpcPrivateSubnet1Subnet536B997A" + }, + { + "Ref": "VpcPrivateSubnet2Subnet3788AAA1" + } + ] } }, "constructInfo": { @@ -5938,12 +5970,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -5956,6 +5982,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -6070,12 +6102,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -6088,6 +6114,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -6293,12 +6325,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -6320,6 +6346,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -6514,12 +6546,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -6538,6 +6564,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -6732,12 +6764,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -6756,6 +6782,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -6970,7 +7002,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "/519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14.json" + "/38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01.json" ] ] } @@ -7033,9 +7065,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -7047,6 +7076,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -7324,12 +7356,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -7342,6 +7368,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -7386,17 +7418,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { - "id": "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", - "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", + "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": { + "id": "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", + "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": { - "id": "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", - "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", + "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { + "id": "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", + "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -7442,32 +7474,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.us-east-1.", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" - }, - "/feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -7480,6 +7496,22 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.us-east-1.", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" + }, + "/c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.assets.json index 658822f58f681..5ca246d3ac590 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.assets.json @@ -79,7 +79,7 @@ } } }, - "070b346893b4194bfaec91745ff73ca4475d3996f82fc8955ed74b9bfac7f0fa": { + "482ca8a889ef1b56f0a620923f8132a8bdd7297b08cbe4c2d8d207f274ee62a9": { "source": { "path": "awscdkeksclusterprivateendpointtestawscdkawseksClusterResourceProvider67118CB1.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "070b346893b4194bfaec91745ff73ca4475d3996f82fc8955ed74b9bfac7f0fa.json", + "objectKey": "482ca8a889ef1b56f0a620923f8132a8bdd7297b08cbe4c2d8d207f274ee62a9.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "4b6db60b11ae942dff6cc0a23e2f39d28ba20032ddc336c5dfd7c904539a2511": { + "1e580f91d69c74093aff26f7bb90dbeb04feb11a0d17ba14922f8b9e334317b5": { "source": { "path": "awscdkeksclusterprivateendpointtestawscdkawseksKubectlProvider421F287E.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "4b6db60b11ae942dff6cc0a23e2f39d28ba20032ddc336c5dfd7c904539a2511.json", + "objectKey": "1e580f91d69c74093aff26f7bb90dbeb04feb11a0d17ba14922f8b9e334317b5.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "7d5edfb70c6610868f03af6e39c138e914bde7efd7585f62febb7caf5dc2f395": { + "fc662ff101c9c7a89278d91b6c762243af2e2bc4c1eb0ae7bfd1e109371ab23a": { "source": { "path": "aws-cdk-eks-cluster-private-endpoint-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "7d5edfb70c6610868f03af6e39c138e914bde7efd7585f62febb7caf5dc2f395.json", + "objectKey": "fc662ff101c9c7a89278d91b6c762243af2e2bc4c1eb0ae7bfd1e109371ab23a.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.template.json index 57c78cf9754d8..b9f9b76088277 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/aws-cdk-eks-cluster-private-endpoint-test.template.json @@ -50,9 +50,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -80,15 +77,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -98,7 +95,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -146,15 +146,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -174,9 +174,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -204,15 +201,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -222,7 +219,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -239,12 +239,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -254,9 +254,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -284,15 +281,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -302,7 +299,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -319,21 +319,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -361,15 +358,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -379,7 +376,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -396,12 +396,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -419,11 +419,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -953,15 +953,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -969,17 +979,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "Clustermanifestconfigmap3F180550": { @@ -1027,7 +1027,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/070b346893b4194bfaec91745ff73ca4475d3996f82fc8955ed74b9bfac7f0fa.json" + "/482ca8a889ef1b56f0a620923f8132a8bdd7297b08cbe4c2d8d207f274ee62a9.json" ] ] } @@ -1038,36 +1038,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/4b6db60b11ae942dff6cc0a23e2f39d28ba20032ddc336c5dfd7c904539a2511.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterprivateendpointtestVpcPrivateSubnet1Subnet94DAD769Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1080,6 +1060,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/1e580f91d69c74093aff26f7bb90dbeb04feb11a0d17ba14922f8b9e334317b5.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksClusterResourceProvider67118CB1.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksClusterResourceProvider67118CB1.nested.template.json index 37bfa161349cc..64cfe39c16fda 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksClusterResourceProvider67118CB1.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksClusterResourceProvider67118CB1.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksKubectlProvider421F287E.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksKubectlProvider421F287E.nested.template.json index d1eb43964dad3..60db8918250a0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksKubectlProvider421F287E.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/awscdkeksclusterprivateendpointtestawscdkawseksKubectlProvider421F287E.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": { + "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { "Type": "String" }, - "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { + "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": { "Type": "String" }, "referencetoawscdkeksclusterprivateendpointtestVpcPrivateSubnet1Subnet94DAD769Ref": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/integ.json index 4d3b2571140be..99df94a99698e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-private-endpoint-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-cluster-private-endpoint/DefaultTest/DeployAssert", "assertionStackName": "awscdkeksclusterprivateendpointDefaultTestDeployAssert3C16DBEA" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/manifest.json index d3ef333206ade..a4e9eb0df9fc3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/manifest.json @@ -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}/7d5edfb70c6610868f03af6e39c138e914bde7efd7585f62febb7caf5dc2f395.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fc662ff101c9c7a89278d91b6c762243af2e2bc4c1eb0ae7bfd1e109371ab23a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -423,16 +423,16 @@ "data": "awscdkeksclusterprivateendpointtestawscdkawseksKubectlProviderframeworkonEventC2C76E2FArn" } ], - "/aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": [ + "/aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn" + "data": "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef" } ], - "/aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": [ + "/aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef" + "data": "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn" } ], "/aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestVpcPrivateSubnet1Subnet94DAD769Ref": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/tree.json index 7525b7d66aaa9..0091976bb9462 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.js.snapshot/tree.json @@ -103,9 +103,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -133,7 +130,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -155,9 +155,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -167,7 +164,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -200,12 +200,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -244,15 +244,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -286,9 +286,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -316,7 +313,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -338,9 +338,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -350,7 +347,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -383,12 +383,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -413,9 +413,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -443,7 +440,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -465,9 +465,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -477,7 +474,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -510,12 +510,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -540,9 +540,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -570,7 +567,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -592,9 +592,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -604,7 +601,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-private-endpoint-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -637,12 +637,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -682,11 +682,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1334,15 +1334,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1350,17 +1360,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1583,12 +1583,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1601,6 +1595,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1715,12 +1715,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1733,6 +1727,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1938,12 +1938,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -1965,6 +1959,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2159,12 +2159,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2183,6 +2177,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2377,12 +2377,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2401,6 +2395,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2619,7 +2619,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/070b346893b4194bfaec91745ff73ca4475d3996f82fc8955ed74b9bfac7f0fa.json" + "/482ca8a889ef1b56f0a620923f8132a8bdd7297b08cbe4c2d8d207f274ee62a9.json" ] ] } @@ -2682,9 +2682,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2696,6 +2693,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -2973,12 +2973,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -2991,6 +2985,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3035,17 +3035,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": { - "id": "reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn", - "path": "aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn", + "reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { + "id": "reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef", + "path": "aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { - "id": "reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef", - "path": "aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef", + "reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": { + "id": "reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn", + "path": "aws-cdk-eks-cluster-private-endpoint-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3091,36 +3091,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/4b6db60b11ae942dff6cc0a23e2f39d28ba20032ddc336c5dfd7c904539a2511.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterprivateendpointtestClusterKubectlHandlerRole67774AF8Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterprivateendpointtestKubectlLayer9A0EA6BCRef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterprivateendpointtestVpcPrivateSubnet1Subnet94DAD769Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3133,6 +3113,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/1e580f91d69c74093aff26f7bb90dbeb04feb11a0d17ba14922f8b9e334317b5.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json index 076fa058c0102..b5ce6d7b798fe 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json @@ -127,7 +127,7 @@ } } }, - "519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14": { + "38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01": { "source": { "path": "awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json", "packaging": "file" @@ -135,13 +135,13 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14.json", + "objectKey": "38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } } }, - "feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104": { + "c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9": { "source": { "path": "awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json", "packaging": "file" @@ -149,13 +149,13 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104.json", + "objectKey": "c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } } }, - "92e7811f3ede075c99f523985e6cbe19e21b6e4dbffc8c126fb7a9d36411c8f3": { + "f31b43cc8398fae82f2ea5a4c05ea276c03263a1e24694d018494d08556c1ec4": { "source": { "path": "aws-cdk-eks-cluster-test.template.json", "packaging": "file" @@ -163,7 +163,7 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "92e7811f3ede075c99f523985e6cbe19e21b6e4dbffc8c126fb7a9d36411c8f3.json", + "objectKey": "f31b43cc8398fae82f2ea5a4c05ea276c03263a1e24694d018494d08556c1ec4.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json index 6b49e7bc6bc72..7a351e69a2a1a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json @@ -77,9 +77,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -107,15 +104,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -125,7 +122,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -142,12 +142,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -173,15 +173,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -201,9 +201,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -231,15 +228,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -249,7 +246,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -266,12 +266,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -281,9 +281,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -311,15 +308,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -329,7 +326,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -346,21 +346,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -388,15 +385,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -406,7 +403,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -423,12 +423,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -446,11 +446,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -661,7 +661,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54443795AF111": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "FromPort": 443, "GroupId": { @@ -670,6 +669,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -682,7 +682,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A324439DAF9D77": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -691,6 +690,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -703,7 +703,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858443B84847DA": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "FromPort": 443, "GroupId": { @@ -712,6 +711,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -724,7 +724,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914443ECEF3F30": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "FromPort": 443, "GroupId": { @@ -733,6 +732,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -745,7 +745,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D474431DE5485F": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "FromPort": 443, "GroupId": { @@ -754,6 +753,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1063,7 +1063,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C544432C10EDB4": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "FromPort": 443, "GroupId": { @@ -1072,6 +1071,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1084,7 +1084,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54ALLTRAFFICA14EDC2C": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1092,6 +1091,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1103,7 +1103,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443175FB542": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -1112,6 +1111,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1124,7 +1124,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301344439997E64B": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -1133,6 +1132,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1145,7 +1145,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A321025655359034D5F2": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -1154,6 +1153,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1166,7 +1166,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134102565535D0C036C4": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -1175,6 +1174,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1187,7 +1187,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC3F547F1B": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1195,6 +1194,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1206,7 +1206,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858443A88C1345": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "FromPort": 443, "GroupId": { @@ -1215,6 +1214,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1227,7 +1227,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858ALLTRAFFIC18C2F6D7": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1235,6 +1234,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1246,7 +1246,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914443A80EB501": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "FromPort": 443, "GroupId": { @@ -1255,6 +1254,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1267,7 +1267,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914ALLTRAFFIC40B17035": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1275,6 +1274,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1286,7 +1286,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D474432A818F38": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "FromPort": 443, "GroupId": { @@ -1295,6 +1294,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1307,7 +1307,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47ALLTRAFFICDB5CD664": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1315,6 +1314,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1507,15 +1507,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1523,17 +1533,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "ClusterfargateprofiledefaultPodExecutionRole09952CFF": { @@ -1627,7 +1627,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54ALLTRAFFICBC5FBE2E": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1635,6 +1634,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1646,7 +1646,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443DC7FAF39": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -1655,6 +1654,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1667,7 +1667,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134443AE10EB12": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -1676,6 +1675,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1688,7 +1688,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32102565535D6A46ADB": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -1697,6 +1696,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1709,7 +1709,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301341025655359F401D0D": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -1718,6 +1717,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1730,7 +1730,6 @@ "ClusterNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC14EF5815": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1738,6 +1737,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1974,8 +1974,6 @@ "ClusterNodesASGF172BD19": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "3", - "MinSize": "3", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterNodesLaunchTemplateD1028D0D" @@ -1987,6 +1985,8 @@ ] } }, + "MaxSize": "3", + "MinSize": "3", "Tags": [ { "Key": { @@ -2049,7 +2049,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858ALLTRAFFIC83BB7106": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2057,6 +2056,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -2068,7 +2068,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443AC8AE5BF": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -2077,6 +2076,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2089,7 +2089,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F13013444328ED4211": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -2098,6 +2097,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2110,7 +2110,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32102565535F5718241": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -2119,6 +2118,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2131,7 +2131,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F13013410256553586052D07": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -2140,6 +2139,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2152,7 +2152,6 @@ "ClusterNodesArmInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC655074AB": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2160,6 +2159,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2396,8 +2396,6 @@ "ClusterNodesArmASG40A593D0": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "1", - "MinSize": "1", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterNodesArmLaunchTemplateB6CFBA44" @@ -2409,6 +2407,8 @@ ] } }, + "MaxSize": "1", + "MinSize": "1", "Tags": [ { "Key": { @@ -2471,7 +2471,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914ALLTRAFFIC7B6353A7": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2479,6 +2478,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -2490,7 +2490,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32443D1686B16": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -2499,6 +2498,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2511,7 +2511,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134443A6D43789": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -2520,6 +2519,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2532,7 +2532,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32102565535674E85A7": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -2541,6 +2540,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2553,7 +2553,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301341025655352CE8AD9A": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -2562,6 +2561,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2574,7 +2574,6 @@ "ClusterBottlerocketNodesInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFICFAF900F2": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2582,6 +2581,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2818,8 +2818,6 @@ "ClusterBottlerocketNodesASGA27A9B70": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "2", - "MinSize": "2", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterBottlerocketNodesLaunchTemplate54246C29" @@ -2831,6 +2829,8 @@ ] } }, + "MaxSize": "2", + "MinSize": "2", "Tags": [ { "Key": { @@ -2893,7 +2893,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47ALLTRAFFIC2B1A12D9": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -2901,6 +2900,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -2912,7 +2912,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A324438F751704": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { @@ -2921,6 +2920,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2933,7 +2933,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F1301344430650F325": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { @@ -2942,6 +2941,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2954,7 +2954,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A321025655350D837827": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { @@ -2963,6 +2962,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2975,7 +2975,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterControlPlaneSecurityGroup2F130134102565535C7203235": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { @@ -2984,6 +2983,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2996,7 +2996,6 @@ "ClusterspotInstanceSecurityGroupfromawscdkeksclustertestClusterClusterSecurityGroupF7265A32ALLTRAFFIC59C23477": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -3004,6 +3003,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3246,8 +3246,6 @@ "ClusterspotASG857494B6": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "10", - "MinSize": "1", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterspotLaunchTemplate5652F38D" @@ -3259,6 +3257,8 @@ ] } }, + "MaxSize": "10", + "MinSize": "1", "Tags": [ { "Key": { @@ -3386,15 +3386,25 @@ "ClusterNodegroupextrangF9406A09": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "t3.small" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangNodeGroupRole23AE23D0", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 1, + "MaxSize": 1, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -3402,17 +3412,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "t3.small" - ], - "ScalingConfig": { - "DesiredSize": 1, - "MaxSize": 1, - "MinSize": 1 - } + ] } }, "ClusterNodegroupextrangspotNodeGroupRoleB53B4857": { @@ -3473,15 +3473,28 @@ "ClusterNodegroupextrangspotB327AE6B": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", + "CapacityType": "SPOT", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "c5.large", + "c5a.large", + "c5d.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangspotNodeGroupRoleB53B4857", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 3, + "MaxSize": 3, + "MinSize": 3 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -3489,20 +3502,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "CapacityType": "SPOT", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "c5.large", - "c5a.large", - "c5d.large" - ], - "ScalingConfig": { - "DesiredSize": 3, - "MaxSize": 3, - "MinSize": 3 - } + ] } }, "ClusterNodegroupextrangarmNodeGroupRoleADF5749F": { @@ -3563,15 +3563,25 @@ "ClusterNodegroupextrangarm7773987A": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_ARM_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m6g.medium" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarmNodeGroupRoleADF5749F", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 1, + "MaxSize": 1, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -3579,17 +3589,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_ARM_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m6g.medium" - ], - "ScalingConfig": { - "DesiredSize": 1, - "MaxSize": 1, - "MinSize": 1 - } + ] } }, "ClusterNodegroupextrangarm3NodeGroupRole3A6AB3EC": { @@ -3650,15 +3650,25 @@ "ClusterNodegroupextrangarm327128311": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_ARM_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "c7g.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarm3NodeGroupRole3A6AB3EC", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 1, + "MaxSize": 1, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -3666,17 +3676,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_ARM_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "c7g.large" - ], - "ScalingConfig": { - "DesiredSize": 1, - "MaxSize": 1, - "MinSize": 1 - } + ] } }, "ClusterNodegroupextrang2F1FB0D40": { @@ -3685,20 +3685,6 @@ "ClusterName": { "Ref": "Cluster9EE0221C" }, - "NodeRole": { - "Fn::GetAtt": [ - "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", - "Arn" - ] - }, - "Subnets": [ - { - "Ref": "VpcPrivateSubnet1Subnet536B997A" - }, - { - "Ref": "VpcPrivateSubnet2Subnet3788AAA1" - } - ], "ForceUpdateEnabled": true, "LaunchTemplate": { "Id": { @@ -3711,11 +3697,25 @@ ] } }, + "NodeRole": { + "Fn::GetAtt": [ + "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", + "Arn" + ] + }, "ScalingConfig": { "DesiredSize": 1, "MaxSize": 1, "MinSize": 1 - } + }, + "Subnets": [ + { + "Ref": "VpcPrivateSubnet1Subnet536B997A" + }, + { + "Ref": "VpcPrivateSubnet2Subnet3788AAA1" + } + ] } }, "ClustermanifestHelloApp078A45D8": { @@ -4175,7 +4175,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "/519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14.json" + "/38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01.json" ] ] } @@ -4186,32 +4186,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.us-east-1.", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" - }, - "/feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -4224,6 +4208,22 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.us-east-1.", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" + }, + "/c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json index 9c0f53e86bcbb..4c46d5dc8c88a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksClusterResourceProvider5F388D1A.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json index e2af00433ec0b..32e261dbf363c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { + "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { "Type": "String" }, - "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { + "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { "Type": "String" }, "referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/integ.json index da43f497e587e..0a8e97417e938 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-test" ], + "diffAssets": true, "cdkCommandOptions": { "deploy": { "args": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json index 206c7be97a36d..f80cf091c0233 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/92e7811f3ede075c99f523985e6cbe19e21b6e4dbffc8c126fb7a9d36411c8f3.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/f31b43cc8398fae82f2ea5a4c05ea276c03263a1e24694d018494d08556c1ec4.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -969,16 +969,16 @@ "data": "awscdkeksclustertestawscdkawseksKubectlProviderframeworkonEventC681B49AArn" } ], - "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": [ + "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" + "data": "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef" } ], - "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": [ + "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef" + "data": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" } ], "/aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": [ @@ -1112,42 +1112,6 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } - ], - "ClusterNodesLaunchConfig7C420A27": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterNodesLaunchConfig7C420A27", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "ClusterNodesArmLaunchConfigAAF61344": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterNodesArmLaunchConfigAAF61344", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "ClusterBottlerocketNodesLaunchConfig76D7BEBE": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterBottlerocketNodesLaunchConfig76D7BEBE", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "ClusterspotLaunchConfigCC19F2E6": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterspotLaunchConfigCC19F2E6", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } ] }, "displayName": "aws-cdk-eks-cluster-test" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json index 5247c6e50f0b5..45dca6469207c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json @@ -146,9 +146,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -176,7 +173,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -198,9 +198,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -210,7 +207,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -243,12 +243,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -287,15 +287,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -329,9 +329,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -359,7 +356,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -381,9 +381,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -393,7 +390,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -426,12 +426,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -456,9 +456,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -486,7 +483,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -508,9 +508,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -520,7 +517,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -553,12 +553,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -583,9 +583,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -613,7 +610,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -635,9 +635,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -647,7 +644,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -680,12 +680,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -725,11 +725,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1084,7 +1084,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "fromPort": 443, "groupId": { @@ -1093,6 +1092,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1113,7 +1113,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -1122,6 +1121,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1142,7 +1142,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "fromPort": 443, "groupId": { @@ -1151,6 +1150,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1171,7 +1171,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "fromPort": 443, "groupId": { @@ -1180,6 +1179,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1200,7 +1200,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "fromPort": 443, "groupId": { @@ -1209,6 +1208,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1443,7 +1443,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "fromPort": 443, "groupId": { @@ -1452,6 +1451,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1472,7 +1472,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1480,6 +1479,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -1499,7 +1499,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -1508,6 +1507,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1528,7 +1528,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -1537,6 +1536,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1557,7 +1557,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -1566,6 +1565,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1586,7 +1586,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -1595,6 +1594,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1615,7 +1615,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1623,6 +1622,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1642,7 +1642,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "fromPort": 443, "groupId": { @@ -1651,6 +1650,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1671,7 +1671,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1679,6 +1678,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -1698,7 +1698,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "fromPort": 443, "groupId": { @@ -1707,6 +1706,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1727,7 +1727,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1735,6 +1734,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -1754,7 +1754,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "fromPort": 443, "groupId": { @@ -1763,6 +1762,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1783,7 +1783,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1791,6 +1790,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -1947,15 +1947,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1963,17 +1973,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -2132,7 +2132,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2140,6 +2139,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesInstanceSecurityGroup899246BD", @@ -2159,7 +2159,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -2168,6 +2167,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2188,7 +2188,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -2197,6 +2196,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2217,7 +2217,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -2226,6 +2225,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2246,7 +2246,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -2255,6 +2254,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2275,7 +2275,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2283,6 +2282,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2421,6 +2421,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/Nodes/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/Nodes/LaunchTemplate", @@ -2582,8 +2590,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "3", - "minSize": "3", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterNodesLaunchTemplateD1028D0D" @@ -2595,6 +2601,8 @@ ] } }, + "maxSize": "3", + "minSize": "3", "tags": [ { "key": { @@ -2682,7 +2690,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2690,6 +2697,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterNodesArmInstanceSecurityGroup599F388B", @@ -2709,7 +2717,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -2718,6 +2725,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2738,7 +2746,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -2747,6 +2754,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2767,7 +2775,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -2776,6 +2783,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2796,7 +2804,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -2805,6 +2812,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -2825,7 +2833,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -2833,6 +2840,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -2971,6 +2979,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/NodesArm/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/NodesArm/LaunchTemplate", @@ -3132,8 +3148,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "1", - "minSize": "1", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterNodesArmLaunchTemplateB6CFBA44" @@ -3145,6 +3159,8 @@ ] } }, + "maxSize": "1", + "minSize": "1", "tags": [ { "key": { @@ -3232,7 +3248,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3240,6 +3255,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterBottlerocketNodesInstanceSecurityGroup3794A94B", @@ -3259,7 +3275,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -3268,6 +3283,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3288,7 +3304,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -3297,6 +3312,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3317,7 +3333,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -3326,6 +3341,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3346,7 +3362,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -3355,6 +3370,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3375,7 +3391,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3383,6 +3398,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3521,6 +3537,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/BottlerocketNodes/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/BottlerocketNodes/LaunchTemplate", @@ -3682,8 +3706,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "2", - "minSize": "2", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterBottlerocketNodesLaunchTemplate54246C29" @@ -3695,6 +3717,8 @@ ] } }, + "maxSize": "2", + "minSize": "2", "tags": [ { "key": { @@ -3782,7 +3806,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3790,6 +3813,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterspotInstanceSecurityGroup01F7B1CE", @@ -3809,7 +3833,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "fromPort": 443, "groupId": { @@ -3818,6 +3841,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3838,7 +3862,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "fromPort": 443, "groupId": { @@ -3847,6 +3870,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3867,7 +3891,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "fromPort": 1025, "groupId": { @@ -3876,6 +3899,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3896,7 +3920,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "fromPort": 1025, "groupId": { @@ -3905,6 +3928,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -3925,7 +3949,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -3933,6 +3956,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -4071,6 +4095,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-test/Cluster/spot/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-test/Cluster/spot/LaunchTemplate", @@ -4238,8 +4270,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "10", - "minSize": "1", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterspotLaunchTemplate5652F38D" @@ -4251,6 +4281,8 @@ ] } }, + "maxSize": "10", + "minSize": "1", "tags": [ { "key": { @@ -4413,15 +4445,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "t3.small" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangNodeGroupRole23AE23D0", "Arn" ] }, + "scalingConfig": { + "desiredSize": 1, + "maxSize": 1, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4429,17 +4471,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "t3.small" - ], - "scalingConfig": { - "desiredSize": 1, - "maxSize": 1, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -4544,15 +4576,28 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", + "capacityType": "SPOT", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "c5.large", + "c5a.large", + "c5d.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangspotNodeGroupRoleB53B4857", "Arn" ] }, + "scalingConfig": { + "desiredSize": 3, + "maxSize": 3, + "minSize": 3 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4560,20 +4605,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "capacityType": "SPOT", - "forceUpdateEnabled": true, - "instanceTypes": [ - "c5.large", - "c5a.large", - "c5d.large" - ], - "scalingConfig": { - "desiredSize": 3, - "maxSize": 3, - "minSize": 3 - } + ] } }, "constructInfo": { @@ -4678,15 +4710,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_ARM_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m6g.medium" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarmNodeGroupRoleADF5749F", "Arn" ] }, + "scalingConfig": { + "desiredSize": 1, + "maxSize": 1, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4694,17 +4736,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_ARM_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m6g.medium" - ], - "scalingConfig": { - "desiredSize": 1, - "maxSize": 1, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -4809,15 +4841,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_ARM_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "c7g.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupextrangarm3NodeGroupRole3A6AB3EC", "Arn" ] }, + "scalingConfig": { + "desiredSize": 1, + "maxSize": 1, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -4825,17 +4867,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_ARM_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "c7g.large" - ], - "scalingConfig": { - "desiredSize": 1, - "maxSize": 1, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -4862,20 +4894,6 @@ "clusterName": { "Ref": "Cluster9EE0221C" }, - "nodeRole": { - "Fn::GetAtt": [ - "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", - "Arn" - ] - }, - "subnets": [ - { - "Ref": "VpcPrivateSubnet1Subnet536B997A" - }, - { - "Ref": "VpcPrivateSubnet2Subnet3788AAA1" - } - ], "forceUpdateEnabled": true, "launchTemplate": { "id": { @@ -4888,11 +4906,25 @@ ] } }, + "nodeRole": { + "Fn::GetAtt": [ + "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", + "Arn" + ] + }, "scalingConfig": { "desiredSize": 1, "maxSize": 1, "minSize": 1 - } + }, + "subnets": [ + { + "Ref": "VpcPrivateSubnet1Subnet536B997A" + }, + { + "Ref": "VpcPrivateSubnet2Subnet3788AAA1" + } + ] } }, "constructInfo": { @@ -5505,12 +5537,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -5523,6 +5549,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -5637,12 +5669,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -5655,6 +5681,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -5860,12 +5892,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -5887,6 +5913,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -6081,12 +6113,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -6105,6 +6131,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -6299,12 +6331,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -6323,6 +6349,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -6537,7 +6569,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "/519b305117fceb7428dc60a80bdc7576be24b151717d52fb5ccc11ac4e7b5a14.json" + "/38d703160bc45251d27e806080a42e0e3e95a76199d0d1342c10c86a6a132f01.json" ] ] } @@ -6600,9 +6632,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -6614,6 +6643,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -6891,12 +6923,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -6909,6 +6935,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -6953,17 +6985,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { - "id": "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", - "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", + "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": { + "id": "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", + "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef": { - "id": "reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", - "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestKubectlLayerD8FA674ERef", + "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { + "id": "reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", + "path": "aws-cdk-eks-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -7009,32 +7041,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.us-east-1.", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" - }, - "/feacbec28ce9fa1fccc5253cd8a584b17729ec106ff7f862e7cde90fe7e73104.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclustertestClusterKubectlHandlerRoleA258E53AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclustertestKubectlLayerD8FA674ERef": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclustertestVpcPrivateSubnet1Subnet32A4EC2ARef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -7047,6 +7063,22 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.us-east-1.", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" + }, + "/c4dcedad1cadbfa87852da53c1c41533ef51e3bd1395cd2d70fffb677c3c81a9.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json index c8459fe98cd35..3225cbb0d505a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json @@ -92,7 +92,7 @@ } } }, - "ff5a8ff2a289b69d3de2c8a59b4abce899f6f9f91cea9e0bc1e744437fb56a96": { + "a36e7f1cafd44a387bd51772bd40674e7110b7308aa2f6b57280298dd561dd03": { "source": { "path": "awscdkekshelmtestawscdkawseksClusterResourceProviderB64048CD.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ff5a8ff2a289b69d3de2c8a59b4abce899f6f9f91cea9e0bc1e744437fb56a96.json", + "objectKey": "a36e7f1cafd44a387bd51772bd40674e7110b7308aa2f6b57280298dd561dd03.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "0f0880b12793b3efc95562d900c8a883938cf7f02ac801c7b2260ef8c82d781c": { + "71893a73e516134c84b4f51ea96cca1a2c7634f91e8aa540097d86c88d7578ed": { "source": { "path": "awscdkekshelmtestawscdkawseksKubectlProvider207F42E4.nested.template.json", "packaging": "file" @@ -113,12 +113,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "0f0880b12793b3efc95562d900c8a883938cf7f02ac801c7b2260ef8c82d781c.json", + "objectKey": "71893a73e516134c84b4f51ea96cca1a2c7634f91e8aa540097d86c88d7578ed.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "9b2023d97d0771e6f8a5b28f785080100bc287da0656d0d38298cc4e59cfb098": { + "0ab95709037165a6e49574da048b0a7a23a3fb6c89754a4dd11832805929bdc2": { "source": { "path": "aws-cdk-eks-helm-test.template.json", "packaging": "file" @@ -126,7 +126,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "9b2023d97d0771e6f8a5b28f785080100bc287da0656d0d38298cc4e59cfb098.json", + "objectKey": "0ab95709037165a6e49574da048b0a7a23a3fb6c89754a4dd11832805929bdc2.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json index 0d07620db30f3..60ea8ab204b92 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json @@ -50,9 +50,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -80,15 +77,15 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -98,7 +95,10 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -146,15 +146,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -174,9 +174,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -204,15 +201,15 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -222,7 +219,10 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -239,12 +239,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -254,9 +254,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -284,15 +281,15 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -302,7 +299,10 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -319,21 +319,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -361,15 +358,15 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -379,7 +376,10 @@ "Key": "Name", "Value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -396,12 +396,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -419,11 +419,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1010,15 +1010,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1026,17 +1036,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "Clustercharttestchart9FD698EB": { @@ -1214,7 +1214,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/ff5a8ff2a289b69d3de2c8a59b4abce899f6f9f91cea9e0bc1e744437fb56a96.json" + "/a36e7f1cafd44a387bd51772bd40674e7110b7308aa2f6b57280298dd561dd03.json" ] ] } @@ -1225,36 +1225,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/0f0880b12793b3efc95562d900c8a883938cf7f02ac801c7b2260ef8c82d781c.json" - ] - ] - }, "Parameters": { + "referencetoawscdkekshelmtestKubectlLayer2638D675Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkekshelmtestKubectlLayer2638D675Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkekshelmtestVpcPrivateSubnet1Subnet3D2B5C0BRef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1267,6 +1247,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/71893a73e516134c84b4f51ea96cca1a2c7634f91e8aa540097d86c88d7578ed.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksClusterResourceProviderB64048CD.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksClusterResourceProviderB64048CD.nested.template.json index bf1a5795ef0b6..931ef89abefc8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksClusterResourceProviderB64048CD.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksClusterResourceProviderB64048CD.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksKubectlProvider207F42E4.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksKubectlProvider207F42E4.nested.template.json index 2d90de4a40253..865edf6e327fa 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksKubectlProvider207F42E4.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/awscdkekshelmtestawscdkawseksKubectlProvider207F42E4.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": { + "referencetoawscdkekshelmtestKubectlLayer2638D675Ref": { "Type": "String" }, - "referencetoawscdkekshelmtestKubectlLayer2638D675Ref": { + "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": { "Type": "String" }, "referencetoawscdkekshelmtestVpcPrivateSubnet1Subnet3D2B5C0BRef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/integ.json index 57b33e5c22983..abaf917fc16d9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-helm-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-helm/DefaultTest/DeployAssert", "assertionStackName": "awscdkekshelmDefaultTestDeployAssert044A589A" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json index 14efd9f6aea1f..672b919feaf5c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json @@ -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}/9b2023d97d0771e6f8a5b28f785080100bc287da0656d0d38298cc4e59cfb098.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0ab95709037165a6e49574da048b0a7a23a3fb6c89754a4dd11832805929bdc2.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -447,16 +447,16 @@ "data": "awscdkekshelmtestawscdkawseksKubectlProviderframeworkonEvent9D93C644Arn" } ], - "/aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": [ + "/aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestKubectlLayer2638D675Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn" + "data": "referencetoawscdkekshelmtestKubectlLayer2638D675Ref" } ], - "/aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestKubectlLayer2638D675Ref": [ + "/aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkekshelmtestKubectlLayer2638D675Ref" + "data": "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn" } ], "/aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestVpcPrivateSubnet1Subnet3D2B5C0BRef": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json index 0820b39273b87..460356b351275 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json @@ -103,9 +103,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -133,7 +130,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -155,9 +155,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -167,7 +164,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -200,12 +200,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -244,15 +244,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -286,9 +286,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -316,7 +313,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -338,9 +338,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -350,7 +347,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -383,12 +383,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -413,9 +413,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -443,7 +440,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -465,9 +465,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -477,7 +474,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -510,12 +510,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -540,9 +540,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -570,7 +567,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -592,9 +592,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -604,7 +601,10 @@ "key": "Name", "value": "aws-cdk-eks-helm-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -637,12 +637,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -682,11 +682,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1375,15 +1375,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1391,17 +1401,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1736,12 +1736,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1754,6 +1748,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1868,12 +1868,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1886,6 +1880,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -2091,12 +2091,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2118,6 +2112,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2312,12 +2312,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2336,6 +2330,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2530,12 +2530,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2554,6 +2548,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2772,7 +2772,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/ff5a8ff2a289b69d3de2c8a59b4abce899f6f9f91cea9e0bc1e744437fb56a96.json" + "/a36e7f1cafd44a387bd51772bd40674e7110b7308aa2f6b57280298dd561dd03.json" ] ] } @@ -2835,9 +2835,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2849,6 +2846,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3126,12 +3126,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3144,6 +3138,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3188,17 +3188,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": { - "id": "reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn", - "path": "aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn", + "reference-to-awscdkekshelmtestKubectlLayer2638D675Ref": { + "id": "reference-to-awscdkekshelmtestKubectlLayer2638D675Ref", + "path": "aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestKubectlLayer2638D675Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkekshelmtestKubectlLayer2638D675Ref": { - "id": "reference-to-awscdkekshelmtestKubectlLayer2638D675Ref", - "path": "aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestKubectlLayer2638D675Ref", + "reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": { + "id": "reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn", + "path": "aws-cdk-eks-helm-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3244,36 +3244,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/0f0880b12793b3efc95562d900c8a883938cf7f02ac801c7b2260ef8c82d781c.json" - ] - ] - }, "parameters": { + "referencetoawscdkekshelmtestKubectlLayer2638D675Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkekshelmtestClusterKubectlHandlerRoleF7B0B227Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkekshelmtestKubectlLayer2638D675Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkekshelmtestVpcPrivateSubnet1Subnet3D2B5C0BRef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3286,6 +3266,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/71893a73e516134c84b4f51ea96cca1a2c7634f91e8aa540097d86c88d7578ed.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json index 9be9ad707950a..f9b63e873f768 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json @@ -105,7 +105,7 @@ } } }, - "730ab9bde59256911c9f3a3805ab8084ae6487ff15814e3d596190abefc5a053": { + "34b23ebe2c96ab11af6be9fa220c5a794b14107883de85a1ab7d3d544a1447c9": { "source": { "path": "awscdkeksclusterinferencetestawscdkawseksClusterResourceProviderFE14F3C4.nested.template.json", "packaging": "file" @@ -113,12 +113,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "730ab9bde59256911c9f3a3805ab8084ae6487ff15814e3d596190abefc5a053.json", + "objectKey": "34b23ebe2c96ab11af6be9fa220c5a794b14107883de85a1ab7d3d544a1447c9.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "8269c69be10d18e10bd7d48b166ee59d5a1e209cf34ce69ff70cfa4f07bf89e0": { + "1306e6285fc292b6cf0b99ad7685af7db62e104d61b7071787531c1fbddd2525": { "source": { "path": "awscdkeksclusterinferencetestawscdkawseksKubectlProviderB4348345.nested.template.json", "packaging": "file" @@ -126,12 +126,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "8269c69be10d18e10bd7d48b166ee59d5a1e209cf34ce69ff70cfa4f07bf89e0.json", + "objectKey": "1306e6285fc292b6cf0b99ad7685af7db62e104d61b7071787531c1fbddd2525.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "ddc0d706edb15c574360c10f835c94d0d7bd0b52e972f4a620fb3c04a140edd0": { + "6bff4cdd4b29122392d5c57fb039379b577e2ac7f0c8623d5d4445384f7ad9df": { "source": { "path": "aws-cdk-eks-cluster-inference-test.template.json", "packaging": "file" @@ -139,7 +139,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ddc0d706edb15c574360c10f835c94d0d7bd0b52e972f4a620fb3c04a140edd0.json", + "objectKey": "6bff4cdd4b29122392d5c57fb039379b577e2ac7f0c8623d5d4445384f7ad9df.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json index 1a8c7e7b6e8d4..8bb84e8c17cdd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -83,12 +83,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -207,12 +207,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -222,9 +222,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -252,15 +249,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -270,7 +267,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -287,21 +287,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,15 +326,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -347,7 +344,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -364,12 +364,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -387,11 +387,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -569,7 +569,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F443F2D42F76": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:443", "FromPort": 443, "GroupId": { @@ -578,6 +577,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -590,7 +590,6 @@ "ClusterControlPlaneSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D5044346FDA05D": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:443", "FromPort": 443, "GroupId": { @@ -599,6 +598,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -853,7 +853,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F443B80CEDBD": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:443", "FromPort": 443, "GroupId": { @@ -862,6 +861,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -874,7 +874,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26FALLTRAFFIC418A2D12": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -882,6 +881,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -893,7 +893,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50443EC7B812C": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:443", "FromPort": 443, "GroupId": { @@ -902,6 +901,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -914,7 +914,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F4434D5E0DD3": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:443", "FromPort": 443, "GroupId": { @@ -923,6 +922,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -935,7 +935,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D501025655353D78EB48": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:1025-65535", "FromPort": 1025, "GroupId": { @@ -944,6 +943,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -956,7 +956,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F1025655359E0FF9C1": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:1025-65535", "FromPort": 1025, "GroupId": { @@ -965,6 +964,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -977,7 +977,6 @@ "ClusterClusterSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50ALLTRAFFICBAD5CE5F": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -985,6 +984,7 @@ "ClusterSecurityGroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1123,15 +1123,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1139,17 +1149,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45": { @@ -1177,7 +1177,6 @@ "ClusterInferenceInstancesInstanceSecurityGroupfromawscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26FALLTRAFFICE41AF78F": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1185,6 +1184,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -1196,7 +1196,6 @@ "ClusterInferenceInstancesInstanceSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D5044357063ABC": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:443", "FromPort": 443, "GroupId": { @@ -1205,6 +1204,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1217,7 +1217,6 @@ "ClusterInferenceInstancesInstanceSecurityGroupfromawscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F44333DD9D3A": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:443", "FromPort": 443, "GroupId": { @@ -1226,6 +1225,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1238,7 +1238,6 @@ "ClusterInferenceInstancesInstanceSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50102565535161321E6": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:1025-65535", "FromPort": 1025, "GroupId": { @@ -1247,6 +1246,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1259,7 +1259,6 @@ "ClusterInferenceInstancesInstanceSecurityGroupfromawscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F102565535438D562E": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:1025-65535", "FromPort": 1025, "GroupId": { @@ -1268,6 +1267,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1280,7 +1280,6 @@ "ClusterInferenceInstancesInstanceSecurityGroupfromawscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50ALLTRAFFIC922EA161": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "-1", "Description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:ALL TRAFFIC", "GroupId": { "Fn::GetAtt": [ @@ -1288,6 +1287,7 @@ "GroupId" ] }, + "IpProtocol": "-1", "SourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1527,8 +1527,6 @@ "ClusterInferenceInstancesASGE90717C7": { "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { - "MaxSize": "1", - "MinSize": "1", "LaunchTemplate": { "LaunchTemplateId": { "Ref": "ClusterInferenceInstancesLaunchTemplateA0BB0AA4" @@ -1540,6 +1538,8 @@ ] } }, + "MaxSize": "1", + "MinSize": "1", "Tags": [ { "Key": { @@ -1623,7 +1623,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/730ab9bde59256911c9f3a3805ab8084ae6487ff15814e3d596190abefc5a053.json" + "/34b23ebe2c96ab11af6be9fa220c5a794b14107883de85a1ab7d3d544a1447c9.json" ] ] } @@ -1634,36 +1634,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/8269c69be10d18e10bd7d48b166ee59d5a1e209cf34ce69ff70cfa4f07bf89e0.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterinferencetestVpcPrivateSubnet1Subnet57B9547BRef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1676,6 +1656,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/1306e6285fc292b6cf0b99ad7685af7db62e104d61b7071787531c1fbddd2525.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksClusterResourceProviderFE14F3C4.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksClusterResourceProviderFE14F3C4.nested.template.json index 8c69422f527d2..d8dc5573b8b05 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksClusterResourceProviderFE14F3C4.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksClusterResourceProviderFE14F3C4.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksKubectlProviderB4348345.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksKubectlProviderB4348345.nested.template.json index 6bd92b1b0fe42..223775fdc659f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksKubectlProviderB4348345.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/awscdkeksclusterinferencetestawscdkawseksKubectlProviderB4348345.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": { + "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref": { "Type": "String" }, - "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref": { + "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": { "Type": "String" }, "referencetoawscdkeksclusterinferencetestVpcPrivateSubnet1Subnet57B9547BRef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/integ.json index 1483391850e78..605ec1d9d495c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-inference-test" ], + "diffAssets": true, "cdkCommandOptions": { "deploy": { "args": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json index bef91f218fe4c..be30f242ba23f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json @@ -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}/ddc0d706edb15c574360c10f835c94d0d7bd0b52e972f4a620fb3c04a140edd0.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6bff4cdd4b29122392d5c57fb039379b577e2ac7f0c8623d5d4445384f7ad9df.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -537,16 +537,16 @@ "data": "awscdkeksclusterinferencetestawscdkawseksKubectlProviderframeworkonEvent96006823Arn" } ], - "/aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": [ + "/aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn" + "data": "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref" } ], - "/aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref": [ + "/aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref" + "data": "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn" } ], "/aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestVpcPrivateSubnet1Subnet57B9547BRef": [ @@ -644,15 +644,6 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } - ], - "ClusterInferenceInstancesLaunchTemplateProfileECB30F9A": [ - { - "type": "aws:cdk:logicalId", - "data": "ClusterInferenceInstancesLaunchTemplateProfileECB30F9A", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } ] }, "displayName": "aws-cdk-eks-cluster-inference-test" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/tree.json index efd72e15fd03c..8e8bcb286dbc1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.js.snapshot/tree.json @@ -45,9 +45,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -75,7 +72,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -97,9 +97,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -109,7 +106,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -142,12 +142,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -186,15 +186,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -228,9 +228,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -258,7 +255,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -280,9 +280,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -292,7 +289,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -325,12 +325,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -355,9 +355,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -385,7 +382,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -407,9 +407,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -419,7 +416,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -452,12 +452,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -482,9 +482,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -512,7 +509,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -534,9 +534,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -546,7 +543,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-inference-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -579,12 +579,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -624,11 +624,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -950,7 +950,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:443", "fromPort": 443, "groupId": { @@ -959,6 +958,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -979,7 +979,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:443", "fromPort": 443, "groupId": { @@ -988,6 +987,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1199,7 +1199,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:443", "fromPort": 443, "groupId": { @@ -1208,6 +1207,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -1228,7 +1228,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1236,6 +1235,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -1255,7 +1255,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:443", "fromPort": 443, "groupId": { @@ -1264,6 +1263,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1284,7 +1284,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:443", "fromPort": 443, "groupId": { @@ -1293,6 +1292,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1313,7 +1313,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:1025-65535", "fromPort": 1025, "groupId": { @@ -1322,6 +1321,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1342,7 +1342,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:1025-65535", "fromPort": 1025, "groupId": { @@ -1351,6 +1350,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1371,7 +1371,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1379,6 +1378,7 @@ "ClusterSecurityGroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1563,15 +1563,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1579,17 +1589,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1647,7 +1647,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclusterinferencetestClusterInferenceInstancesInstanceSecurityGroupAC01F26F:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1655,6 +1654,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterInferenceInstancesInstanceSecurityGroupECB3FC45", @@ -1674,7 +1674,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:443", "fromPort": 443, "groupId": { @@ -1683,6 +1682,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1703,7 +1703,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:443", "fromPort": 443, "groupId": { @@ -1712,6 +1711,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1732,7 +1732,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:1025-65535", "fromPort": 1025, "groupId": { @@ -1741,6 +1740,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1761,7 +1761,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "tcp", "description": "from awscdkeksclusterinferencetestClusterControlPlaneSecurityGroupDA4CA86F:1025-65535", "fromPort": 1025, "groupId": { @@ -1770,6 +1769,7 @@ "GroupId" ] }, + "ipProtocol": "tcp", "sourceSecurityGroupId": { "Fn::GetAtt": [ "ClusterControlPlaneSecurityGroupD274242C", @@ -1790,7 +1790,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroupIngress", "aws:cdk:cloudformation:props": { - "ipProtocol": "-1", "description": "from awscdkeksclusterinferencetestClusterClusterSecurityGroupAFDB8D50:ALL TRAFFIC", "groupId": { "Fn::GetAtt": [ @@ -1798,6 +1797,7 @@ "GroupId" ] }, + "ipProtocol": "-1", "sourceSecurityGroupId": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1936,6 +1936,14 @@ "version": "0.0.0" } }, + "ImportedInstanceProfile": { + "id": "ImportedInstanceProfile", + "path": "aws-cdk-eks-cluster-inference-test/Cluster/InferenceInstances/ImportedInstanceProfile", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "LaunchTemplate": { "id": "LaunchTemplate", "path": "aws-cdk-eks-cluster-inference-test/Cluster/InferenceInstances/LaunchTemplate", @@ -2100,8 +2108,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::AutoScaling::AutoScalingGroup", "aws:cdk:cloudformation:props": { - "maxSize": "1", - "minSize": "1", "launchTemplate": { "launchTemplateId": { "Ref": "ClusterInferenceInstancesLaunchTemplateA0BB0AA4" @@ -2113,6 +2119,8 @@ ] } }, + "maxSize": "1", + "minSize": "1", "tags": [ { "key": { @@ -2349,12 +2357,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -2367,6 +2369,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -2481,12 +2489,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -2499,6 +2501,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -2704,12 +2712,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2731,6 +2733,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2925,12 +2933,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2949,6 +2951,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -3143,12 +3151,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -3167,6 +3169,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -3385,7 +3393,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/730ab9bde59256911c9f3a3805ab8084ae6487ff15814e3d596190abefc5a053.json" + "/34b23ebe2c96ab11af6be9fa220c5a794b14107883de85a1ab7d3d544a1447c9.json" ] ] } @@ -3448,9 +3456,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -3462,6 +3467,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3739,12 +3747,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3757,6 +3759,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3801,17 +3809,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": { - "id": "reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn", - "path": "aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn", + "reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref": { + "id": "reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref", + "path": "aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref": { - "id": "reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref", - "path": "aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestKubectlLayerC250C540Ref", + "reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": { + "id": "reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn", + "path": "aws-cdk-eks-cluster-inference-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3857,36 +3865,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/8269c69be10d18e10bd7d48b166ee59d5a1e209cf34ce69ff70cfa4f07bf89e0.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterinferencetestClusterKubectlHandlerRole9FB34EF2Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterinferencetestKubectlLayerC250C540Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterinferencetestVpcPrivateSubnet1Subnet57B9547BRef": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3899,6 +3887,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/1306e6285fc292b6cf0b99ad7685af7db62e104d61b7071787531c1fbddd2525.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json index f433eb33d7272..e0bbf3c0956c1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json @@ -118,7 +118,7 @@ } } }, - "e293bd9561f621d804e70be7afeb970e4d6c94c00cd7b4f36888a202c8beb2cd": { + "c137f19e0be8a660184453791ca2557a9b10cd95c8f80f49d567ebe02ae91960": { "source": { "path": "awseksserviceaccountsdkcallstestawscdkawseksClusterResourceProvider7862DD6A.nested.template.json", "packaging": "file" @@ -126,12 +126,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "e293bd9561f621d804e70be7afeb970e4d6c94c00cd7b4f36888a202c8beb2cd.json", + "objectKey": "c137f19e0be8a660184453791ca2557a9b10cd95c8f80f49d567ebe02ae91960.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "c4b1cab880aa92beb4b7eb99ef12f96af1cbfb2e99473da0e1af1ccb45817f7c": { + "362269bfad442962334d7d32024a418180a98ca81bd5e4352644f48362415c5b": { "source": { "path": "awseksserviceaccountsdkcallstestawscdkawseksKubectlProvider62B779F7.nested.template.json", "packaging": "file" @@ -139,12 +139,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "c4b1cab880aa92beb4b7eb99ef12f96af1cbfb2e99473da0e1af1ccb45817f7c.json", + "objectKey": "362269bfad442962334d7d32024a418180a98ca81bd5e4352644f48362415c5b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "53825e45ed35c4b9d0a4a85b726a07f4ef3729bd7f5806be59733c66d83a594d": { + "4954b9921d31e9deca9df5cf7c5cb5e5f9f00eaa2c7cc9a797fa7f15e5e04d03": { "source": { "path": "aws-eks-service-account-sdk-calls-test.template.json", "packaging": "file" @@ -152,7 +152,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "53825e45ed35c4b9d0a4a85b726a07f4ef3729bd7f5806be59733c66d83a594d.json", + "objectKey": "4954b9921d31e9deca9df5cf7c5cb5e5f9f00eaa2c7cc9a797fa7f15e5e04d03.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json index 7c4dba931dd76..010804ee17e66 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -83,12 +83,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -207,12 +207,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -222,9 +222,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -252,15 +249,15 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -270,7 +267,10 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -287,21 +287,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,15 +326,15 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -347,7 +344,10 @@ "Key": "Name", "Value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -364,12 +364,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -387,11 +387,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -866,15 +866,25 @@ "ClusterNodegroupDefaultCapacityDA0920A3": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -882,17 +892,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "ClusterAwsAuthmanifestFE51F8AE": { @@ -1185,7 +1185,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/e293bd9561f621d804e70be7afeb970e4d6c94c00cd7b4f36888a202c8beb2cd.json" + "/c137f19e0be8a660184453791ca2557a9b10cd95c8f80f49d567ebe02ae91960.json" ] ] } @@ -1196,36 +1196,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/c4b1cab880aa92beb4b7eb99ef12f96af1cbfb2e99473da0e1af1ccb45817f7c.json" - ] - ] - }, "Parameters": { + "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawseksserviceaccountsdkcallstestVpcPrivateSubnet1Subnet0C10F776Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1238,6 +1218,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/362269bfad442962334d7d32024a418180a98ca81bd5e4352644f48362415c5b.json" + ] + ] } }, "DependsOn": [ @@ -1480,12 +1480,6 @@ }, "S3Key": "52afb3e2686860c4a72b179852db125e37824bbfccee63ff90cd7b45b9560da1.zip" }, - "Role": { - "Fn::GetAtt": [ - "S3BucketPingerFunctionServiceRole37E5E83A", - "Arn" - ] - }, "Environment": { "Variables": { "BUCKET_NAME": { @@ -1506,6 +1500,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "S3BucketPingerFunctionServiceRole37E5E83A", + "Arn" + ] + }, "Runtime": "python3.9", "Timeout": 180 }, @@ -1651,12 +1651,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "S3BucketPingerProviderframeworkonEventServiceRole3DD0DF8B", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-eks-service-account-sdk-calls-test/S3BucketPinger/Provider)", "Environment": { "Variables": { @@ -1669,6 +1663,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "S3BucketPingerProviderframeworkonEventServiceRole3DD0DF8B", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksClusterResourceProvider7862DD6A.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksClusterResourceProvider7862DD6A.nested.template.json index b3e9ed300ce72..78704294ea990 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksClusterResourceProvider7862DD6A.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksClusterResourceProvider7862DD6A.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksKubectlProvider62B779F7.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksKubectlProvider62B779F7.nested.template.json index cfba134bc0493..15c4ca39a77b8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksKubectlProvider62B779F7.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/awseksserviceaccountsdkcallstestawscdkawseksKubectlProvider62B779F7.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": { + "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { "Type": "String" }, - "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { + "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": { "Type": "String" }, "referencetoawseksserviceaccountsdkcallstestVpcPrivateSubnet1Subnet0C10F776Ref": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/integ.json index f2c79733dc8dc..5b9848e61c7cb 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-eks-service-account-sdk-calls-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-service-account-sdk-call/DefaultTest/DeployAssert", "assertionStackName": "awscdkeksserviceaccountsdkcallDefaultTestDeployAssertC5196707" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json index 2815dc475b67a..e480b198d0dd9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json @@ -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}/53825e45ed35c4b9d0a4a85b726a07f4ef3729bd7f5806be59733c66d83a594d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4954b9921d31e9deca9df5cf7c5cb5e5f9f00eaa2c7cc9a797fa7f15e5e04d03.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -435,16 +435,16 @@ "data": "awseksserviceaccountsdkcallstestawscdkawseksKubectlProviderframeworkonEvent905838A2Arn" } ], - "/aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": [ + "/aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn" + "data": "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref" } ], - "/aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": [ + "/aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref" + "data": "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn" } ], "/aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestVpcPrivateSubnet1Subnet0C10F776Ref": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/tree.json index 4ed60b2a3577b..e0fa2bd2b8791 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/tree.json @@ -71,9 +71,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -101,7 +98,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -123,9 +123,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -135,7 +132,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -168,12 +168,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -212,15 +212,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -254,9 +254,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -284,7 +281,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -306,9 +306,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -318,7 +315,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -351,12 +351,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -381,9 +381,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -411,7 +408,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -433,9 +433,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -445,7 +442,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -478,12 +478,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -508,9 +508,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -538,7 +535,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -560,9 +560,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -572,7 +569,10 @@ "key": "Name", "value": "aws-eks-service-account-sdk-calls-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -605,12 +605,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -650,11 +650,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1264,15 +1264,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupDefaultCapacityNodeGroupRole55953B04", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1280,17 +1290,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1735,12 +1735,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1753,6 +1747,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1867,12 +1867,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1885,6 +1879,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -2090,12 +2090,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2117,6 +2111,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2311,12 +2311,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2335,6 +2329,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2529,12 +2529,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2553,6 +2547,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2771,7 +2771,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/e293bd9561f621d804e70be7afeb970e4d6c94c00cd7b4f36888a202c8beb2cd.json" + "/c137f19e0be8a660184453791ca2557a9b10cd95c8f80f49d567ebe02ae91960.json" ] ] } @@ -2834,9 +2834,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2848,6 +2845,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3125,12 +3125,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3143,6 +3137,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3187,17 +3187,17 @@ "version": "0.0.0" } }, - "reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": { - "id": "reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn", - "path": "aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn", + "reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { + "id": "reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref", + "path": "aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { - "id": "reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref", - "path": "aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref", + "reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": { + "id": "reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn", + "path": "aws-eks-service-account-sdk-calls-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3243,36 +3243,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/c4b1cab880aa92beb4b7eb99ef12f96af1cbfb2e99473da0e1af1ccb45817f7c.json" - ] - ] - }, "parameters": { + "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawseksserviceaccountsdkcallstestClusterKubectlHandlerRole7777F0B9Arn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawseksserviceaccountsdkcallstestKubectlLayer470A83D3Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawseksserviceaccountsdkcallstestVpcPrivateSubnet1Subnet0C10F776Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3285,6 +3265,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/362269bfad442962334d7d32024a418180a98ca81bd5e4352644f48362415c5b.json" + ] + ] } } }, @@ -3534,12 +3534,6 @@ }, "s3Key": "52afb3e2686860c4a72b179852db125e37824bbfccee63ff90cd7b45b9560da1.zip" }, - "role": { - "Fn::GetAtt": [ - "S3BucketPingerFunctionServiceRole37E5E83A", - "Arn" - ] - }, "environment": { "variables": { "BUCKET_NAME": { @@ -3560,6 +3554,12 @@ } }, "handler": "index.handler", + "role": { + "Fn::GetAtt": [ + "S3BucketPingerFunctionServiceRole37E5E83A", + "Arn" + ] + }, "runtime": "python3.9", "timeout": 180 } @@ -3738,12 +3738,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "S3BucketPingerProviderframeworkonEventServiceRole3DD0DF8B", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-eks-service-account-sdk-calls-test/S3BucketPinger/Provider)", "environment": { "variables": { @@ -3756,6 +3750,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "S3BucketPingerProviderframeworkonEventServiceRole3DD0DF8B", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.assets.json index c6713a9d18cd1..ffd7b7f44b749 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.assets.json @@ -79,7 +79,7 @@ } } }, - "998eb7595659c27a8daafc32397c7074eee576bc55bbd7c764b14c18a6f59f26": { + "9bc5ed764d14a563b18739d104caa37c6f428a8e9e92d6d8e23b0d31178583f0": { "source": { "path": "awscdkeksclusterwindowsngtestawscdkawseksClusterResourceProvider4BC96C9C.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "998eb7595659c27a8daafc32397c7074eee576bc55bbd7c764b14c18a6f59f26.json", + "objectKey": "9bc5ed764d14a563b18739d104caa37c6f428a8e9e92d6d8e23b0d31178583f0.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "1164acda1ffaed6aea8a0cbc906b48d8b06962b186904f058e7f1cd41e623941": { + "1576ef5893684923ec69c2fdf1a0e0064a31bb34f4c7680ea66d4df7bd5396c2": { "source": { "path": "awscdkeksclusterwindowsngtestawscdkawseksKubectlProviderAC962C42.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "1164acda1ffaed6aea8a0cbc906b48d8b06962b186904f058e7f1cd41e623941.json", + "objectKey": "1576ef5893684923ec69c2fdf1a0e0064a31bb34f4c7680ea66d4df7bd5396c2.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "d38b411e38ab984822d528f11336efbe87bf98a054587f7f1b052a5e0a9ef156": { + "7329fb6712b5d0d06a0d8e8e2f7a0dcbd0f8217bd701303a00efaed369cbad4f": { "source": { "path": "aws-cdk-eks-cluster-windows-ng-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d38b411e38ab984822d528f11336efbe87bf98a054587f7f1b052a5e0a9ef156.json", + "objectKey": "7329fb6712b5d0d06a0d8e8e2f7a0dcbd0f8217bd701303a00efaed369cbad4f.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.template.json index 7d79b3d22720d..47bafe4d11ade 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/aws-cdk-eks-cluster-windows-ng-test.template.json @@ -50,9 +50,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -80,15 +77,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -98,7 +95,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -146,15 +146,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -174,9 +174,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -204,15 +201,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -222,7 +219,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -239,12 +239,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -254,9 +254,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -284,15 +281,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -302,7 +299,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -319,21 +319,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -361,15 +358,15 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -379,7 +376,10 @@ "Key": "Name", "Value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -396,12 +396,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -419,11 +419,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -961,15 +961,22 @@ "ClusterNodegroupLinuxNodegroup8D946039": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupLinuxNodegroupNodeGroupRoleF14B6D19", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -977,14 +984,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 1 - } + ] } }, "ClusterNodegroupWindowsNodegroupNodeGroupRoleD51D4054": { @@ -1045,15 +1045,22 @@ "ClusterNodegroupWindowsNodegroup4D72A84B": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "WINDOWS_FULL_2022_x86_64", "ClusterName": { "Ref": "Cluster9EE0221C" }, + "ForceUpdateEnabled": true, "NodeRole": { "Fn::GetAtt": [ "ClusterNodegroupWindowsNodegroupNodeGroupRoleD51D4054", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 1 + }, "Subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1062,13 +1069,6 @@ "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } ], - "AmiType": "WINDOWS_FULL_2022_x86_64", - "ForceUpdateEnabled": true, - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 1 - }, "Taints": [ { "Effect": "NO_SCHEDULE", @@ -1097,7 +1097,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/998eb7595659c27a8daafc32397c7074eee576bc55bbd7c764b14c18a6f59f26.json" + "/9bc5ed764d14a563b18739d104caa37c6f428a8e9e92d6d8e23b0d31178583f0.json" ] ] } @@ -1108,36 +1108,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/1164acda1ffaed6aea8a0cbc906b48d8b06962b186904f058e7f1cd41e623941.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterwindowsngtestVpcPrivateSubnet1Subnet55633596Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -1150,6 +1130,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/1576ef5893684923ec69c2fdf1a0e0064a31bb34f4c7680ea66d4df7bd5396c2.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksClusterResourceProvider4BC96C9C.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksClusterResourceProvider4BC96C9C.nested.template.json index 0fe6fea9c69d1..f51b9f8511774 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksClusterResourceProvider4BC96C9C.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksClusterResourceProvider4BC96C9C.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksKubectlProviderAC962C42.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksKubectlProviderAC962C42.nested.template.json index ae7ee76635fab..23c80c87adabf 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksKubectlProviderAC962C42.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/awscdkeksclusterwindowsngtestawscdkawseksKubectlProviderAC962C42.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": { + "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { "Type": "String" }, - "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { + "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": { "Type": "String" }, "referencetoawscdkeksclusterwindowsngtestVpcPrivateSubnet1Subnet55633596Ref": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/integ.json index 04ce471ec3e31..f718eaab588e8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-cluster-windows-ng-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-cluster-windows-ng/DefaultTest/DeployAssert", "assertionStackName": "awscdkeksclusterwindowsngDefaultTestDeployAssert22077693" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/manifest.json index 0570d1c400f37..b9c78927152db 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/manifest.json @@ -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}/d38b411e38ab984822d528f11336efbe87bf98a054587f7f1b052a5e0a9ef156.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7329fb6712b5d0d06a0d8e8e2f7a0dcbd0f8217bd701303a00efaed369cbad4f.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -429,16 +429,16 @@ "data": "awscdkeksclusterwindowsngtestawscdkawseksKubectlProviderframeworkonEventCEC3AFF7Arn" } ], - "/aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": [ + "/aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn" + "data": "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref" } ], - "/aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": [ + "/aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref" + "data": "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn" } ], "/aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestVpcPrivateSubnet1Subnet55633596Ref": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/tree.json index 3ea081acf551e..6cfd2cbe10205 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.js.snapshot/tree.json @@ -103,9 +103,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -133,7 +130,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -155,9 +155,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -167,7 +164,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -200,12 +200,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, @@ -244,15 +244,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -286,9 +286,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -316,7 +313,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -338,9 +338,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -350,7 +347,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -383,12 +383,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, @@ -413,9 +413,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -443,7 +440,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -465,9 +465,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -477,7 +474,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -510,12 +510,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, @@ -540,9 +540,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -570,7 +567,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -592,9 +592,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -604,7 +601,10 @@ "key": "Name", "value": "aws-cdk-eks-cluster-windows-ng-test/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { @@ -637,12 +637,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -682,11 +682,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1350,15 +1350,22 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupLinuxNodegroupNodeGroupRoleF14B6D19", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1366,14 +1373,7 @@ { "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 1 - } + ] } }, "constructInfo": { @@ -1478,15 +1478,22 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "WINDOWS_FULL_2022_x86_64", "clusterName": { "Ref": "Cluster9EE0221C" }, + "forceUpdateEnabled": true, "nodeRole": { "Fn::GetAtt": [ "ClusterNodegroupWindowsNodegroupNodeGroupRoleD51D4054", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 1 + }, "subnets": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1495,13 +1502,6 @@ "Ref": "VpcPrivateSubnet2Subnet3788AAA1" } ], - "amiType": "WINDOWS_FULL_2022_x86_64", - "forceUpdateEnabled": true, - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 1 - }, "taints": [ { "effect": "NO_SCHEDULE", @@ -1687,12 +1687,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1705,6 +1699,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1819,12 +1819,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1837,6 +1831,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -2042,12 +2042,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2069,6 +2063,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2263,12 +2263,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2287,6 +2281,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2481,12 +2481,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2505,6 +2499,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2723,7 +2723,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/998eb7595659c27a8daafc32397c7074eee576bc55bbd7c764b14c18a6f59f26.json" + "/9bc5ed764d14a563b18739d104caa37c6f428a8e9e92d6d8e23b0d31178583f0.json" ] ] } @@ -2786,9 +2786,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2800,6 +2797,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -3077,12 +3077,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3095,6 +3089,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3139,17 +3139,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": { - "id": "reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn", - "path": "aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn", + "reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { + "id": "reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref", + "path": "aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { - "id": "reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref", - "path": "aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref", + "reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": { + "id": "reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn", + "path": "aws-cdk-eks-cluster-windows-ng-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3195,36 +3195,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/1164acda1ffaed6aea8a0cbc906b48d8b06962b186904f058e7f1cd41e623941.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksclusterwindowsngtestClusterKubectlHandlerRoleA205E29AArn": { "Fn::GetAtt": [ "ClusterKubectlHandlerRole94549F93", "Arn" ] }, - "referencetoawscdkeksclusterwindowsngtestKubectlLayer31B52BE6Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksclusterwindowsngtestVpcPrivateSubnet1Subnet55633596Ref": { "Ref": "VpcPrivateSubnet1Subnet536B997A" }, @@ -3237,6 +3217,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/1576ef5893684923ec69c2fdf1a0e0064a31bb34f4c7680ea66d4df7bd5396c2.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.assets.json index 485abeadebb26..db80bda33d664 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.assets.json @@ -79,7 +79,7 @@ } } }, - "8d5a5339b9ee2f8b65ed9e94f87049422b0dfdcd8743db37b19b2652e2907542": { + "82715ea785ee76101b617297033a4163e237c444a481a9ca9fde9c08dac51fd4": { "source": { "path": "awscdkeksfargateclustertestawscdkawseksClusterResourceProviderB8887E20.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "8d5a5339b9ee2f8b65ed9e94f87049422b0dfdcd8743db37b19b2652e2907542.json", + "objectKey": "82715ea785ee76101b617297033a4163e237c444a481a9ca9fde9c08dac51fd4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "60ff99772bb1d9ce0d83d241e6f03526d9d824e31c779fc48cfc6462a8a0e8f6": { + "762af9a2a5af4cb340a1c0a540f210386fe9119cc7ba05dbfbc4391ae2fdeb1b": { "source": { "path": "awscdkeksfargateclustertestawscdkawseksKubectlProviderB383571D.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "60ff99772bb1d9ce0d83d241e6f03526d9d824e31c779fc48cfc6462a8a0e8f6.json", + "objectKey": "762af9a2a5af4cb340a1c0a540f210386fe9119cc7ba05dbfbc4391ae2fdeb1b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "afc5269f6ffb49b9ccce7aa1a6bc843c4feb84df70e1dc9eb95cc68338080ca3": { + "ccea78209a239e5b2b2eff39cd2ecda1cd511e7607042e9af07cca9e29561c5d": { "source": { "path": "aws-cdk-eks-fargate-cluster-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "afc5269f6ffb49b9ccce7aa1a6bc843c4feb84df70e1dc9eb95cc68338080ca3.json", + "objectKey": "ccea78209a239e5b2b2eff39cd2ecda1cd511e7607042e9af07cca9e29561c5d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.template.json index 2d7abd6c44dfd..e22c2b82fa7a0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test.template.json @@ -31,9 +31,6 @@ "FargateClusterDefaultVpcPublicSubnet1Subnet96AFDABC": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -61,15 +58,15 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPublicSubnet1RouteTableC2D2B434": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -79,7 +76,10 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPublicSubnet1RouteTableAssociation43821F5B": { @@ -96,12 +96,12 @@ "FargateClusterDefaultVpcPublicSubnet1DefaultRouteA0A93C70": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet1RouteTableC2D2B434" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "FargateClusterDefaultVpcIGWFD9278DA" + }, + "RouteTableId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet1RouteTableC2D2B434" } }, "DependsOn": [ @@ -127,15 +127,15 @@ "FargateClusterDefaultVpcPublicSubnet1NATGatewayEC4DEB51": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet1Subnet96AFDABC" - }, "AllocationId": { "Fn::GetAtt": [ "FargateClusterDefaultVpcPublicSubnet1EIP0093A4E0", "AllocationId" ] }, + "SubnetId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet1Subnet96AFDABC" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -155,9 +155,6 @@ "FargateClusterDefaultVpcPublicSubnet2Subnet92A9CC93": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -185,15 +182,15 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPublicSubnet2RouteTableEDDB89D9": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -203,7 +200,10 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPublicSubnet2RouteTableAssociationCF18C87A": { @@ -220,12 +220,12 @@ "FargateClusterDefaultVpcPublicSubnet2DefaultRouteABE51CF2": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet2RouteTableEDDB89D9" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "FargateClusterDefaultVpcIGWFD9278DA" + }, + "RouteTableId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet2RouteTableEDDB89D9" } }, "DependsOn": [ @@ -251,15 +251,15 @@ "FargateClusterDefaultVpcPublicSubnet2NATGateway77D6A579": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet2Subnet92A9CC93" - }, "AllocationId": { "Fn::GetAtt": [ "FargateClusterDefaultVpcPublicSubnet2EIPA4C07B68", "AllocationId" ] }, + "SubnetId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet2Subnet92A9CC93" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -279,9 +279,6 @@ "FargateClusterDefaultVpcPrivateSubnet1Subnet50EA43AA": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -309,15 +306,15 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPrivateSubnet1RouteTableA42013EB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -327,7 +324,10 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPrivateSubnet1RouteTableAssociationDC34627F": { @@ -344,21 +344,18 @@ "FargateClusterDefaultVpcPrivateSubnet1DefaultRouteE93D7B93": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "FargateClusterDefaultVpcPrivateSubnet1RouteTableA42013EB" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "FargateClusterDefaultVpcPublicSubnet1NATGatewayEC4DEB51" + }, + "RouteTableId": { + "Ref": "FargateClusterDefaultVpcPrivateSubnet1RouteTableA42013EB" } } }, "FargateClusterDefaultVpcPrivateSubnet2Subnet0C9D6154": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -386,15 +383,15 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPrivateSubnet2RouteTable1691B33C": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -404,7 +401,10 @@ "Key": "Name", "Value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "FargateClusterDefaultVpcPrivateSubnet2RouteTableAssociation6C0234FE": { @@ -421,12 +421,12 @@ "FargateClusterDefaultVpcPrivateSubnet2DefaultRouteABCE20FF": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "FargateClusterDefaultVpcPrivateSubnet2RouteTable1691B33C" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "FargateClusterDefaultVpcPublicSubnet2NATGateway77D6A579" + }, + "RouteTableId": { + "Ref": "FargateClusterDefaultVpcPrivateSubnet2RouteTable1691B33C" } } }, @@ -444,11 +444,11 @@ "FargateClusterDefaultVpcVPCGWA7F012E1": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "InternetGatewayId": { "Ref": "FargateClusterDefaultVpcIGWFD9278DA" + }, + "VpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" } } }, @@ -1027,7 +1027,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/8d5a5339b9ee2f8b65ed9e94f87049422b0dfdcd8743db37b19b2652e2907542.json" + "/82715ea785ee76101b617297033a4163e237c444a481a9ca9fde9c08dac51fd4.json" ] ] } @@ -1038,36 +1038,16 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/60ff99772bb1d9ce0d83d241e6f03526d9d824e31c779fc48cfc6462a8a0e8f6.json" - ] - ] - }, "Parameters": { + "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": { "Fn::GetAtt": [ "FargateClusterKubectlHandlerRole93DCDA21", "Arn" ] }, - "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksfargateclustertestFargateClusterDefaultVpcPrivateSubnet1Subnet0278E6BCRef": { "Ref": "FargateClusterDefaultVpcPrivateSubnet1Subnet50EA43AA" }, @@ -1080,6 +1060,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/762af9a2a5af4cb340a1c0a540f210386fe9119cc7ba05dbfbc4391ae2fdeb1b.json" + ] + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksClusterResourceProviderB8887E20.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksClusterResourceProviderB8887E20.nested.template.json index 5bfa1c9a11269..6f3345cdb0ed0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksClusterResourceProviderB8887E20.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksClusterResourceProviderB8887E20.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksKubectlProviderB383571D.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksKubectlProviderB383571D.nested.template.json index bd69d414c15f7..120f348848e02 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksKubectlProviderB383571D.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/awscdkeksfargateclustertestawscdkawseksKubectlProviderB383571D.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -148,12 +148,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -166,6 +160,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { @@ -201,10 +201,10 @@ } }, "Parameters": { - "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": { + "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref": { "Type": "String" }, - "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref": { + "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": { "Type": "String" }, "referencetoawscdkeksfargateclustertestFargateClusterDefaultVpcPrivateSubnet1Subnet0278E6BCRef": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/integ.json index 1b882e45d28ee..d9c5a0c08678e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-cdk-eks-fargate-cluster-test" ], + "diffAssets": true, "assertionStack": "aws-cdk-eks-fargate-cluster/DefaultTest/DeployAssert", "assertionStackName": "awscdkeksfargateclusterDefaultTestDeployAssert7DCC5E4C" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/manifest.json index c405c258aa43b..14c62f159fa2c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/manifest.json @@ -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}/afc5269f6ffb49b9ccce7aa1a6bc843c4feb84df70e1dc9eb95cc68338080ca3.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ccea78209a239e5b2b2eff39cd2ecda1cd511e7607042e9af07cca9e29561c5d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -417,16 +417,16 @@ "data": "awscdkeksfargateclustertestawscdkawseksKubectlProviderframeworkonEvent33B2ACA4Arn" } ], - "/aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": [ + "/aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn" + "data": "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref" } ], - "/aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref": [ + "/aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": [ { "type": "aws:cdk:logicalId", - "data": "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref" + "data": "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn" } ], "/aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestFargateClusterDefaultVpcPrivateSubnet1Subnet0278E6BCRef": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/tree.json index e85c6ddb73add..efdcfdcda5d0d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/tree.json @@ -106,9 +106,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -136,7 +133,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -158,9 +158,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -170,7 +167,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -203,12 +203,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet1RouteTableC2D2B434" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "FargateClusterDefaultVpcIGWFD9278DA" + }, + "routeTableId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet1RouteTableC2D2B434" } } }, @@ -247,15 +247,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet1Subnet96AFDABC" - }, "allocationId": { "Fn::GetAtt": [ "FargateClusterDefaultVpcPublicSubnet1EIP0093A4E0", "AllocationId" ] }, + "subnetId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet1Subnet96AFDABC" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -289,9 +289,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -319,7 +316,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -341,9 +341,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -353,7 +350,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -386,12 +386,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet2RouteTableEDDB89D9" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "FargateClusterDefaultVpcIGWFD9278DA" + }, + "routeTableId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet2RouteTableEDDB89D9" } } }, @@ -430,15 +430,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "FargateClusterDefaultVpcPublicSubnet2Subnet92A9CC93" - }, "allocationId": { "Fn::GetAtt": [ "FargateClusterDefaultVpcPublicSubnet2EIPA4C07B68", "AllocationId" ] }, + "subnetId": { + "Ref": "FargateClusterDefaultVpcPublicSubnet2Subnet92A9CC93" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -472,9 +472,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -502,7 +499,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -524,9 +524,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -536,7 +533,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -569,12 +569,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "FargateClusterDefaultVpcPrivateSubnet1RouteTableA42013EB" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "FargateClusterDefaultVpcPublicSubnet1NATGatewayEC4DEB51" + }, + "routeTableId": { + "Ref": "FargateClusterDefaultVpcPrivateSubnet1RouteTableA42013EB" } } }, @@ -599,9 +599,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -629,7 +626,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -651,9 +651,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -663,7 +660,10 @@ "key": "Name", "value": "aws-cdk-eks-fargate-cluster-test/FargateCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" + } } }, "constructInfo": { @@ -696,12 +696,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "FargateClusterDefaultVpcPrivateSubnet2RouteTable1691B33C" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "FargateClusterDefaultVpcPublicSubnet2NATGateway77D6A579" + }, + "routeTableId": { + "Ref": "FargateClusterDefaultVpcPrivateSubnet2RouteTable1691B33C" } } }, @@ -741,11 +741,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "FargateClusterDefaultVpcE69D3A13" - }, "internetGatewayId": { "Ref": "FargateClusterDefaultVpcIGWFD9278DA" + }, + "vpcId": { + "Ref": "FargateClusterDefaultVpcE69D3A13" } } }, @@ -1527,12 +1527,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1545,6 +1539,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1659,12 +1659,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1677,6 +1671,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1882,12 +1882,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -1909,6 +1903,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2103,12 +2103,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2127,6 +2121,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2321,12 +2321,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2345,6 +2339,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2563,7 +2563,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/8d5a5339b9ee2f8b65ed9e94f87049422b0dfdcd8743db37b19b2652e2907542.json" + "/82715ea785ee76101b617297033a4163e237c444a481a9ca9fde9c08dac51fd4.json" ] ] } @@ -2626,9 +2626,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2640,6 +2637,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -2917,12 +2917,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -2935,6 +2929,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -2979,17 +2979,17 @@ "version": "0.0.0" } }, - "reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": { - "id": "reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn", - "path": "aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn", + "reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref": { + "id": "reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref", + "path": "aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" } }, - "reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref": { - "id": "reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref", - "path": "aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestKubectlLayer821D4586Ref", + "reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": { + "id": "reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn", + "path": "aws-cdk-eks-fargate-cluster-test/@aws-cdk--aws-eks.KubectlProvider/reference-to-awscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -3035,36 +3035,16 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/60ff99772bb1d9ce0d83d241e6f03526d9d824e31c779fc48cfc6462a8a0e8f6.json" - ] - ] - }, "parameters": { + "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref": { + "Ref": "KubectlLayer600207B5" + }, "referencetoawscdkeksfargateclustertestFargateClusterKubectlHandlerRole4192664CArn": { "Fn::GetAtt": [ "FargateClusterKubectlHandlerRole93DCDA21", "Arn" ] }, - "referencetoawscdkeksfargateclustertestKubectlLayer821D4586Ref": { - "Ref": "KubectlLayer600207B5" - }, "referencetoawscdkeksfargateclustertestFargateClusterDefaultVpcPrivateSubnet1Subnet0278E6BCRef": { "Ref": "FargateClusterDefaultVpcPrivateSubnet1Subnet50EA43AA" }, @@ -3077,6 +3057,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/762af9a2a5af4cb340a1c0a540f210386fe9119cc7ba05dbfbc4391ae2fdeb1b.json" + ] + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip new file mode 100644 index 0000000000000..e6cb898734b43 Binary files /dev/null and b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip differ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd/index.py new file mode 100644 index 0000000000000..95c458826a0b0 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd/index.py @@ -0,0 +1,319 @@ +import contextlib +import json +import logging +import os +import shutil +import subprocess +import tempfile +from urllib.request import Request, urlopen +from uuid import uuid4 +from zipfile import ZipFile + +import boto3 + +logger = logging.getLogger() +logger.setLevel(logging.INFO) + +cloudfront = boto3.client('cloudfront') +s3 = boto3.client('s3') + +CFN_SUCCESS = "SUCCESS" +CFN_FAILED = "FAILED" +ENV_KEY_MOUNT_PATH = "MOUNT_PATH" +ENV_KEY_SKIP_CLEANUP = "SKIP_CLEANUP" + +AWS_CLI_CONFIG_FILE = "/tmp/aws_cli_config" +CUSTOM_RESOURCE_OWNER_TAG = "aws-cdk:cr-owned" + +os.putenv('AWS_CONFIG_FILE', AWS_CLI_CONFIG_FILE) + +def handler(event, context): + + def cfn_error(message=None): + logger.error("| cfn_error: %s" % message) + cfn_send(event, context, CFN_FAILED, reason=message, physicalResourceId=event.get('PhysicalResourceId', None)) + + + try: + # We are not logging ResponseURL as this is a pre-signed S3 URL, and could be used to tamper + # with the response CloudFormation sees from this Custom Resource execution. + logger.info({ key:value for (key, value) in event.items() if key != 'ResponseURL'}) + + # cloudformation request type (create/update/delete) + request_type = event['RequestType'] + + # extract resource properties + props = event['ResourceProperties'] + old_props = event.get('OldResourceProperties', {}) + physical_id = event.get('PhysicalResourceId', None) + + try: + source_bucket_names = props['SourceBucketNames'] + source_object_keys = props['SourceObjectKeys'] + source_markers = props.get('SourceMarkers', None) + dest_bucket_name = props['DestinationBucketName'] + dest_bucket_prefix = props.get('DestinationBucketKeyPrefix', '') + extract = props.get('Extract', 'true') == 'true' + retain_on_delete = props.get('RetainOnDelete', "true") == "true" + distribution_id = props.get('DistributionId', '') + user_metadata = props.get('UserMetadata', {}) + system_metadata = props.get('SystemMetadata', {}) + prune = props.get('Prune', 'true').lower() == 'true' + exclude = props.get('Exclude', []) + include = props.get('Include', []) + sign_content = props.get('SignContent', 'false').lower() == 'true' + + # backwards compatibility - if "SourceMarkers" is not specified, + # assume all sources have an empty market map + if source_markers is None: + source_markers = [{} for i in range(len(source_bucket_names))] + + default_distribution_path = dest_bucket_prefix + if not default_distribution_path.endswith("/"): + default_distribution_path += "/" + if not default_distribution_path.startswith("/"): + default_distribution_path = "/" + default_distribution_path + default_distribution_path += "*" + + distribution_paths = props.get('DistributionPaths', [default_distribution_path]) + except KeyError as e: + cfn_error("missing request resource property %s. props: %s" % (str(e), props)) + return + + # configure aws cli options after resetting back to the defaults for each request + if os.path.exists(AWS_CLI_CONFIG_FILE): + os.remove(AWS_CLI_CONFIG_FILE) + if sign_content: + aws_command("configure", "set", "default.s3.payload_signing_enabled", "true") + + # treat "/" as if no prefix was specified + if dest_bucket_prefix == "/": + dest_bucket_prefix = "" + + s3_source_zips = list(map(lambda name, key: "s3://%s/%s" % (name, key), source_bucket_names, source_object_keys)) + s3_dest = "s3://%s/%s" % (dest_bucket_name, dest_bucket_prefix) + old_s3_dest = "s3://%s/%s" % (old_props.get("DestinationBucketName", ""), old_props.get("DestinationBucketKeyPrefix", "")) + + + # obviously this is not + if old_s3_dest == "s3:///": + old_s3_dest = None + + logger.info("| s3_dest: %s" % s3_dest) + logger.info("| old_s3_dest: %s" % old_s3_dest) + + # if we are creating a new resource, allocate a physical id for it + # otherwise, we expect physical id to be relayed by cloudformation + if request_type == "Create": + physical_id = "aws.cdk.s3deployment.%s" % str(uuid4()) + else: + if not physical_id: + cfn_error("invalid request: request type is '%s' but 'PhysicalResourceId' is not defined" % request_type) + return + + # delete or create/update (only if "retain_on_delete" is false) + if request_type == "Delete" and not retain_on_delete: + if not bucket_owned(dest_bucket_name, dest_bucket_prefix): + aws_command("s3", "rm", s3_dest, "--recursive") + + # if we are updating without retention and the destination changed, delete first + if request_type == "Update" and not retain_on_delete and old_s3_dest != s3_dest: + if not old_s3_dest: + logger.warn("cannot delete old resource without old resource properties") + return + + aws_command("s3", "rm", old_s3_dest, "--recursive") + + if request_type == "Update" or request_type == "Create": + s3_deploy(s3_source_zips, s3_dest, user_metadata, system_metadata, prune, exclude, include, source_markers, extract) + + if distribution_id: + cloudfront_invalidate(distribution_id, distribution_paths) + + cfn_send(event, context, CFN_SUCCESS, physicalResourceId=physical_id, responseData={ + # Passing through the ARN sequences dependencees on the deployment + 'DestinationBucketArn': props.get('DestinationBucketArn'), + 'SourceObjectKeys': props.get('SourceObjectKeys'), + }) + except KeyError as e: + cfn_error("invalid request. Missing key %s" % str(e)) + except Exception as e: + logger.exception(e) + cfn_error(str(e)) + +#--------------------------------------------------------------------------------------------------- +# populate all files from s3_source_zips to a destination bucket +def s3_deploy(s3_source_zips, s3_dest, user_metadata, system_metadata, prune, exclude, include, source_markers, extract): + # list lengths are equal + if len(s3_source_zips) != len(source_markers): + raise Exception("'source_markers' and 's3_source_zips' must be the same length") + + # create a temporary working directory in /tmp or if enabled an attached efs volume + if ENV_KEY_MOUNT_PATH in os.environ: + workdir = os.getenv(ENV_KEY_MOUNT_PATH) + "/" + str(uuid4()) + os.mkdir(workdir) + else: + workdir = tempfile.mkdtemp() + + logger.info("| workdir: %s" % workdir) + + # create a directory into which we extract the contents of the zip file + contents_dir=os.path.join(workdir, 'contents') + os.mkdir(contents_dir) + + try: + # download the archive from the source and extract to "contents" + for i in range(len(s3_source_zips)): + s3_source_zip = s3_source_zips[i] + markers = source_markers[i] + + if extract: + archive=os.path.join(workdir, str(uuid4())) + logger.info("archive: %s" % archive) + aws_command("s3", "cp", s3_source_zip, archive) + logger.info("| extracting archive to: %s\n" % contents_dir) + logger.info("| markers: %s" % markers) + extract_and_replace_markers(archive, contents_dir, markers) + else: + logger.info("| copying archive to: %s\n" % contents_dir) + aws_command("s3", "cp", s3_source_zip, contents_dir) + + # sync from "contents" to destination + + s3_command = ["s3", "sync"] + + if prune: + s3_command.append("--delete") + + if exclude: + for filter in exclude: + s3_command.extend(["--exclude", filter]) + + if include: + for filter in include: + s3_command.extend(["--include", filter]) + + s3_command.extend([contents_dir, s3_dest]) + s3_command.extend(create_metadata_args(user_metadata, system_metadata)) + aws_command(*s3_command) + finally: + if not os.getenv(ENV_KEY_SKIP_CLEANUP): + shutil.rmtree(workdir) + +#--------------------------------------------------------------------------------------------------- +# invalidate files in the CloudFront distribution edge caches +def cloudfront_invalidate(distribution_id, distribution_paths): + invalidation_resp = cloudfront.create_invalidation( + DistributionId=distribution_id, + InvalidationBatch={ + 'Paths': { + 'Quantity': len(distribution_paths), + 'Items': distribution_paths + }, + 'CallerReference': str(uuid4()), + }) + # by default, will wait up to 10 minutes + cloudfront.get_waiter('invalidation_completed').wait( + DistributionId=distribution_id, + Id=invalidation_resp['Invalidation']['Id']) + +#--------------------------------------------------------------------------------------------------- +# set metadata +def create_metadata_args(raw_user_metadata, raw_system_metadata): + if len(raw_user_metadata) == 0 and len(raw_system_metadata) == 0: + return [] + + format_system_metadata_key = lambda k: k.lower() + format_user_metadata_key = lambda k: k.lower() + + system_metadata = { format_system_metadata_key(k): v for k, v in raw_system_metadata.items() } + user_metadata = { format_user_metadata_key(k): v for k, v in raw_user_metadata.items() } + + flatten = lambda l: [item for sublist in l for item in sublist] + system_args = flatten([[f"--{k}", v] for k, v in system_metadata.items()]) + user_args = ["--metadata", json.dumps(user_metadata, separators=(',', ':'))] if len(user_metadata) > 0 else [] + + return system_args + user_args + ["--metadata-directive", "REPLACE"] + +#--------------------------------------------------------------------------------------------------- +# executes an "aws" cli command +def aws_command(*args): + aws="/opt/awscli/aws" # from AwsCliLayer + logger.info("| aws %s" % ' '.join(args)) + subprocess.check_call([aws] + list(args)) + +#--------------------------------------------------------------------------------------------------- +# sends a response to cloudformation +def cfn_send(event, context, responseStatus, responseData={}, physicalResourceId=None, noEcho=False, reason=None): + + responseUrl = event['ResponseURL'] + + responseBody = {} + responseBody['Status'] = responseStatus + responseBody['Reason'] = reason or ('See the details in CloudWatch Log Stream: ' + context.log_stream_name) + responseBody['PhysicalResourceId'] = physicalResourceId or context.log_stream_name + responseBody['StackId'] = event['StackId'] + responseBody['RequestId'] = event['RequestId'] + responseBody['LogicalResourceId'] = event['LogicalResourceId'] + responseBody['NoEcho'] = noEcho + responseBody['Data'] = responseData + + body = json.dumps(responseBody) + logger.info("| response body:\n" + body) + + headers = { + 'content-type' : '', + 'content-length' : str(len(body)) + } + + try: + request = Request(responseUrl, method='PUT', data=bytes(body.encode('utf-8')), headers=headers) + with contextlib.closing(urlopen(request)) as response: + logger.info("| status code: " + response.reason) + except Exception as e: + logger.error("| unable to send response to CloudFormation") + logger.exception(e) + + +#--------------------------------------------------------------------------------------------------- +# check if bucket is owned by a custom resource +# if it is then we don't want to delete content +def bucket_owned(bucketName, keyPrefix): + tag = CUSTOM_RESOURCE_OWNER_TAG + if keyPrefix != "": + tag = tag + ':' + keyPrefix + try: + request = s3.get_bucket_tagging( + Bucket=bucketName, + ) + return any((x["Key"].startswith(tag)) for x in request["TagSet"]) + except Exception as e: + logger.info("| error getting tags from bucket") + logger.exception(e) + return False + +# extract archive and replace markers in output files +def extract_and_replace_markers(archive, contents_dir, markers): + with ZipFile(archive, "r") as zip: + zip.extractall(contents_dir) + + # replace markers for this source + for file in zip.namelist(): + file_path = os.path.join(contents_dir, file) + if os.path.isdir(file_path): continue + replace_markers(file_path, markers) + +def replace_markers(filename, markers): + # convert the dict of string markers to binary markers + replace_tokens = dict([(k.encode('utf-8'), v.encode('utf-8')) for k, v in markers.items()]) + + outfile = filename + '.new' + with open(filename, 'rb') as fi, open(outfile, 'wb') as fo: + for line in fi: + for token in replace_tokens: + line = line.replace(token, replace_tokens[token]) + fo.write(line) + + # # delete the original file and rename the new one to the original + os.remove(filename) + os.rename(outfile, filename) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py rename to packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py rename to packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.assets.json new file mode 100644 index 0000000000000..baf8030e93628 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.assets.json @@ -0,0 +1,104 @@ +{ + "version": "32.0.0", + "files": { + "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2": { + "source": { + "path": "asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc": { + "source": { + "path": "asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip", + "packaging": "file" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd": { + "source": { + "path": "asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d": { + "source": { + "path": "asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "75d608df75f61dac3fdadd6450401e430ffcdcc3face2dbe3c656ebf102bb8c1": { + "source": { + "path": "awscdknestedstackinproductstackSampleProductStackSampleNestedStackE8E78B4E.nested.template.json", + "packaging": "file" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "75d608df75f61dac3fdadd6450401e430ffcdcc3face2dbe3c656ebf102bb8c1.json", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "b19855fc4d79148d4a4bcf46bdec84d2838a1ff6787e8aa2eaa98c0f7d8b9ac8": { + "source": { + "path": "awscdknestedstackinproductstackSampleProductStack3B6BAAB4.product.template.json", + "packaging": "file" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "b19855fc4d79148d4a4bcf46bdec84d2838a1ff6787e8aa2eaa98c0f7d8b9ac8.json", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "ba18bfbb3384019a2c62e3de7deb433f76c43587d1a01a4ead4d30e466252748": { + "source": { + "path": "aws-cdk-nested-stack-in-product-stack.template.json", + "packaging": "file" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "ba18bfbb3384019a2c62e3de7deb433f76c43587d1a01a4ead4d30e466252748.json", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json new file mode 100644 index 0000000000000..3fd77a619a44a --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json @@ -0,0 +1,263 @@ +{ + "Resources": { + "AssetBucket1D025086": { + "Type": "AWS::S3::Bucket", + "Properties": { + "BucketName": "asset-bucket-12345678-test-region", + "Tags": [ + { + "Key": "aws-cdk:cr-owned:cea6ac02", + "Value": "true" + } + ] + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "AssetsBucketDeploymentAwsCliLayer9BCEE17F": { + "Type": "AWS::Lambda::LayerVersion", + "Properties": { + "Content": { + "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "S3Key": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip" + }, + "Description": "/opt/awscli/aws" + } + }, + "AssetsBucketDeploymentCustomResource283760D6": { + "Type": "Custom::CDKBucketDeployment", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536", + "Arn" + ] + }, + "SourceBucketNames": [ + "cdk-hnb659fds-assets-12345678-test-region", + "cdk-hnb659fds-assets-12345678-test-region", + "cdk-hnb659fds-assets-12345678-test-region" + ], + "SourceObjectKeys": [ + "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip", + "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip", + "75d608df75f61dac3fdadd6450401e430ffcdcc3face2dbe3c656ebf102bb8c1.json" + ], + "SourceMarkers": [ + {}, + {}, + {} + ], + "DestinationBucketName": { + "Ref": "AssetBucket1D025086" + }, + "Extract": false, + "Prune": false + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF": { + "Type": "AWS::IAM::Policy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region/*" + ] + ] + } + ] + }, + { + "Action": [ + "s3:Abort*", + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*", + "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "AssetBucket1D025086", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "AssetBucket1D025086", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", + "Roles": [ + { + "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + } + ] + } + }, + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "S3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip" + }, + "Environment": { + "Variables": { + "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" + } + }, + "Handler": "index.handler", + "Layers": [ + { + "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + } + ], + "Role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, + "Runtime": "python3.9", + "Timeout": 900 + }, + "DependsOn": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + ] + }, + "SampleProductD0FBA27C": { + "Type": "AWS::ServiceCatalog::CloudFormationProduct", + "Properties": { + "Name": "Sample Product", + "Owner": "owner", + "ProvisioningArtifactParameters": [ + { + "DisableTemplateValidation": false, + "Info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/b19855fc4d79148d4a4bcf46bdec84d2838a1ff6787e8aa2eaa98c0f7d8b9ac8.json" + } + }, + "Name": "v1" + } + ] + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "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." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackSampleProductStack3B6BAAB4.product.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackSampleProductStack3B6BAAB4.product.template.json new file mode 100644 index 0000000000000..b950e26813ef7 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackSampleProductStack3B6BAAB4.product.template.json @@ -0,0 +1,27 @@ +{ + "Resources": { + "SampleNestedStackNestedStackSampleNestedStackNestedStackResource97FFAE0A": { + "Type": "AWS::CloudFormation::Stack", + "Properties": { + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/asset-bucket-12345678-test-region/75d608df75f61dac3fdadd6450401e430ffcdcc3face2dbe3c656ebf102bb8c1.json" + ] + ] + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackSampleProductStackSampleNestedStackE8E78B4E.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackSampleProductStackSampleNestedStackE8E78B4E.nested.template.json new file mode 100644 index 0000000000000..415c3f471fdd7 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackSampleProductStackSampleNestedStackE8E78B4E.nested.template.json @@ -0,0 +1,106 @@ +{ + "Resources": { + "HelloHandlerServiceRole11EF7C63": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "HelloHandler2E4FBA4D": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "asset-bucket-12345678-test-region", + "S3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" + }, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "HelloHandlerServiceRole11EF7C63", + "Arn" + ] + }, + "Runtime": "python3.9" + }, + "DependsOn": [ + "HelloHandlerServiceRole11EF7C63" + ] + }, + "HelloHandler2ServiceRole37B1402D": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "HelloHandler2109B0120": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "asset-bucket-12345678-test-region", + "S3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" + }, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "HelloHandler2ServiceRole37B1402D", + "Arn" + ] + }, + "Runtime": "python3.9" + }, + "DependsOn": [ + "HelloHandler2ServiceRole37B1402D" + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.assets.json new file mode 100644 index 0000000000000..696be5f910518 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.assets.json @@ -0,0 +1,19 @@ +{ + "version": "32.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.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": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "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." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/cdk.out new file mode 100644 index 0000000000000..f0b901e7c06e5 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"32.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/integ.json new file mode 100644 index 0000000000000..48aba0d654541 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "32.0.0", + "testCases": { + "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest": { + "stacks": [ + "aws-cdk-nested-stack-in-product-stack" + ], + "assertionStack": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert", + "assertionStackName": "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/manifest.json new file mode 100644 index 0000000000000..6d1d4bf874c4a --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/manifest.json @@ -0,0 +1,147 @@ +{ + "version": "32.0.0", + "artifacts": { + "aws-cdk-nested-stack-in-product-stack.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "aws-cdk-nested-stack-in-product-stack.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "aws-cdk-nested-stack-in-product-stack": { + "type": "aws:cloudformation:stack", + "environment": "aws://12345678/test-region", + "properties": { + "templateFile": "aws-cdk-nested-stack-in-product-stack.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-test-region", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-test-region", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/ba18bfbb3384019a2c62e3de7deb433f76c43587d1a01a4ead4d30e466252748.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "aws-cdk-nested-stack-in-product-stack.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-lookup-role-12345678-test-region", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "aws-cdk-nested-stack-in-product-stack.assets" + ], + "metadata": { + "/aws-cdk-nested-stack-in-product-stack/AssetBucket/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "AssetBucket1D025086" + } + ], + "/aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/AwsCliLayer/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + } + ], + "/aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/CustomResource/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "AssetsBucketDeploymentCustomResource283760D6" + } + ], + "/aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + } + ], + "/aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/DefaultPolicy/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF" + } + ], + "/aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536" + } + ], + "/aws-cdk-nested-stack-in-product-stack/SampleProduct/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "SampleProductD0FBA27C" + } + ], + "/aws-cdk-nested-stack-in-product-stack/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/aws-cdk-nested-stack-in-product-stack/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "aws-cdk-nested-stack-in-product-stack" + }, + "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.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": [ + "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.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": [ + "awscdknestedstackinproductstackintegDefaultTestDeployAssert7C8849C0.assets" + ], + "metadata": { + "/aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/tree.json new file mode 100644 index 0000000000000..4e261d4df0978 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/tree.json @@ -0,0 +1,794 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "aws-cdk-nested-stack-in-product-stack": { + "id": "aws-cdk-nested-stack-in-product-stack", + "path": "aws-cdk-nested-stack-in-product-stack", + "children": { + "AssetBucket": { + "id": "AssetBucket", + "path": "aws-cdk-nested-stack-in-product-stack/AssetBucket", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/AssetBucket/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::S3::Bucket", + "aws:cdk:cloudformation:props": { + "bucketName": "asset-bucket-12345678-test-region", + "tags": [ + { + "key": "aws-cdk:cr-owned:cea6ac02", + "value": "true" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.CfnBucket", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.Bucket", + "version": "0.0.0" + } + }, + "SampleProductStack": { + "id": "SampleProductStack", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack", + "children": { + "SampleNestedStack": { + "id": "SampleNestedStack", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack", + "children": { + "HelloHandler": { + "id": "HelloHandler", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/Code/Stage", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/Code/AssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": "asset-bucket-12345678-test-region", + "s3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" + }, + "handler": "index.handler", + "role": { + "Fn::GetAtt": [ + "HelloHandlerServiceRole11EF7C63", + "Arn" + ] + }, + "runtime": "python3.9" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "0.0.0" + } + }, + "HelloHandler2": { + "id": "HelloHandler2", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/Code/Stage", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/Code/AssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack/HelloHandler2/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": "asset-bucket-12345678-test-region", + "s3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" + }, + "handler": "index.handler", + "role": { + "Fn::GetAtt": [ + "HelloHandler2ServiceRole37B1402D", + "Arn" + ] + }, + "runtime": "python3.9" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.NestedStack", + "version": "0.0.0" + } + }, + "SampleNestedStack.NestedStack": { + "id": "SampleNestedStack.NestedStack", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack.NestedStack", + "children": { + "SampleNestedStack.NestedStackResource": { + "id": "SampleNestedStack.NestedStackResource", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/SampleNestedStack.NestedStack/SampleNestedStack.NestedStackResource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", + "aws:cdk:cloudformation:props": { + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/asset-bucket-12345678-test-region/75d608df75f61dac3fdadd6450401e430ffcdcc3face2dbe3c656ebf102bb8c1.json" + ] + ] + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CfnStack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.55" + } + }, + "ParentAssetBucket": { + "id": "ParentAssetBucket", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProductStack/ParentAssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_servicecatalog.ProductStack", + "version": "0.0.0" + } + }, + "AssetsBucketDeployment": { + "id": "AssetsBucketDeployment", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment", + "children": { + "AwsCliLayer": { + "id": "AwsCliLayer", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/AwsCliLayer", + "children": { + "Code": { + "id": "Code", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/AwsCliLayer/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/AwsCliLayer/Code/Stage", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/AwsCliLayer/Code/AssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/AwsCliLayer/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::LayerVersion", + "aws:cdk:cloudformation:props": { + "content": { + "s3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "s3Key": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip" + }, + "description": "/opt/awscli/aws" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.CfnLayerVersion", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.lambda_layer_awscli.AwsCliLayer", + "version": "0.0.0" + } + }, + "CustomResourceHandler": { + "id": "CustomResourceHandler", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/CustomResourceHandler", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.SingletonFunction", + "version": "0.0.0" + } + }, + "CustomResource": { + "id": "CustomResource", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/CustomResource", + "children": { + "Default": { + "id": "Default", + "path": "aws-cdk-nested-stack-in-product-stack/AssetsBucketDeployment/CustomResource/Default", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CustomResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_deployment.BucketDeployment", + "version": "0.0.0" + } + }, + "Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C": { + "id": "Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" + } + }, + "DefaultPolicy": { + "id": "DefaultPolicy", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/DefaultPolicy", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/DefaultPolicy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Policy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region/*" + ] + ] + } + ] + }, + { + "Action": [ + "s3:Abort*", + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*", + "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "AssetBucket1D025086", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "AssetBucket1D025086", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "policyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", + "roles": [ + { + "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Policy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code/Stage", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code/AssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "s3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip" + }, + "environment": { + "variables": { + "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" + } + }, + "handler": "index.handler", + "layers": [ + { + "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + } + ], + "role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, + "runtime": "python3.9", + "timeout": 900 + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "0.0.0" + } + }, + "SampleProduct": { + "id": "SampleProduct", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProduct", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-nested-stack-in-product-stack/SampleProduct/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::CloudFormationProduct", + "aws:cdk:cloudformation:props": { + "name": "Sample Product", + "owner": "owner", + "provisioningArtifactParameters": [ + { + "name": "v1", + "disableTemplateValidation": false, + "info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/b19855fc4d79148d4a4bcf46bdec84d2838a1ff6787e8aa2eaa98c0f7d8b9ac8.json" + } + } + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_servicecatalog.CfnCloudFormationProduct", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_servicecatalog.CloudFormationProduct", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-nested-stack-in-product-stack/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-nested-stack-in-product-stack/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "aws-cdk-nested-stack-in-product-stack-integ": { + "id": "aws-cdk-nested-stack-in-product-stack-integ", + "path": "aws-cdk-nested-stack-in-product-stack-integ", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.55" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-nested-stack-in-product-stack-integ/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.55" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.ts new file mode 100644 index 0000000000000..e69d63b3588b9 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.ts @@ -0,0 +1,68 @@ +import { App, Stack, NestedStack, StackProps } from 'aws-cdk-lib'; +import { Construct } from 'constructs'; +import * as sc from 'aws-cdk-lib/aws-servicecatalog'; +import * as lambda from 'aws-cdk-lib/aws-lambda'; +import * as s3 from 'aws-cdk-lib/aws-s3'; +import { IntegTest } from '@aws-cdk/integ-tests-alpha'; + +const app = new App(); + +class ServiceCatalogStack extends Stack { + constructor(scope: Construct, id: string, props: StackProps) { + super(scope, id, props); + + const assetBucket = new s3.Bucket(this, 'AssetBucket', { + bucketName: `asset-bucket-${this.account}-${this.region}`, + }); + + new sc.CloudFormationProduct(this, 'SampleProduct', { + productName: 'Sample Product', + owner: 'owner', + productVersions: [ + { + productVersionName: 'v1', + cloudFormationTemplate: sc.CloudFormationTemplate.fromProductStack( + new SampleProductStack(this, 'SampleProductStack', { + assetBucket, + }), + ), + }, + ], + }); + } +} + +class SampleNestedStack extends NestedStack { + constructor(scope: Construct, id: string) { + super(scope, id); + + new lambda.Function(this, 'HelloHandler', { + runtime: lambda.Runtime.PYTHON_3_9, + code: lambda.Code.fromAsset('./assets'), + handler: 'index.handler', + }); + + new lambda.Function(this, 'HelloHandler2', { + runtime: lambda.Runtime.PYTHON_3_9, + code: lambda.Code.fromAsset('./assetsv2'), + handler: 'index.handler', + }); + } +} + +class SampleProductStack extends sc.ProductStack { + constructor(scope: Construct, id: string, props: sc.ProductStackProps) { + super(scope, id, props); + + new SampleNestedStack(this, 'SampleNestedStack'); + } +} + +new IntegTest(app, 'aws-cdk-nested-stack-in-product-stack-integ', { + testCases: [new ServiceCatalogStack(app, 'aws-cdk-nested-stack-in-product-stack', { + env: { + account: process.env.CDK_INTEG_ACCOUNT ?? process.env.CDK_DEFAULT_ACCOUNT, + region: process.env.CDK_INTEG_REGION ?? process.env.CDK_DEFAULT_REGION, + }, + })], +}); diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.assets.json index e8d8993acf730..b0e720775fc66 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.assets.json @@ -15,43 +15,43 @@ } } }, - "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc": { + "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2": { "source": { - "path": "asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip", - "packaging": "file" + "path": "asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2", + "packaging": "zip" }, "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip", + "objectKey": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, - "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd": { + "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc": { "source": { - "path": "asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd", - "packaging": "zip" + "path": "asset.292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip", + "packaging": "file" }, "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip", + "objectKey": "292870ae2617f1c4d62ff18422e009afd534a342c17877fd1b931fb8d8a62abc.zip", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, - "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2": { + "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd": { "source": { - "path": "asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2", + "path": "asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd", "packaging": "zip" }, "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip", + "objectKey": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } @@ -59,7 +59,7 @@ }, "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d": { "source": { - "path": "asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d", + "path": "asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d", "packaging": "zip" }, "destinations": { @@ -113,7 +113,7 @@ } } }, - "c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a": { + "febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784": { "source": { "path": "integservicecatalogproductencryptedassetS3AssetProductF5835286.product.template.json", "packaging": "file" @@ -121,13 +121,13 @@ "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json", + "objectKey": "febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784.json", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, - "fbc5053e654cbff7f9f9e2dcc93822650d3c4575a353996389f09725526668bd": { + "c4239d78dadb1df96f422c009e2d47614f81f2fd128f77af128992279f4336c7": { "source": { "path": "integ-servicecatalog-product-encrypted-asset.template.json", "packaging": "file" @@ -135,7 +135,7 @@ "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "fbc5053e654cbff7f9f9e2dcc93822650d3c4575a353996389f09725526668bd.json", + "objectKey": "c4239d78dadb1df96f422c009e2d47614f81f2fd128f77af128992279f4336c7.json", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json index 90b3d81a4a1ee..68a9ff341e506 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json @@ -3,10 +3,10 @@ "TestPortfolio4AC794EB": { "Type": "AWS::ServiceCatalog::Portfolio", "Properties": { - "DisplayName": "TestPortfolio", - "ProviderName": "TestProvider", "AcceptLanguage": "en", - "Description": "This is our Service Catalog Portfolio" + "Description": "This is our Service Catalog Portfolio", + "DisplayName": "TestPortfolio", + "ProviderName": "TestProvider" } }, "TestPortfolioPortfolioProductAssociation1f17ee66e93a16195E73": { @@ -23,6 +23,7 @@ "KmsKey46693ADD": { "Type": "AWS::KMS::Key", "Properties": { + "Description": "Kms key for asset bucket", "KeyPolicy": { "Statement": [ { @@ -46,8 +47,7 @@ } ], "Version": "2012-10-17" - }, - "Description": "Kms key for asset bucket" + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -485,12 +485,6 @@ "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "S3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip" }, - "Role": { - "Fn::GetAtt": [ - "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" @@ -502,6 +496,12 @@ "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" } ], + "Role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, "Runtime": "python3.9", "Timeout": 900 }, @@ -558,7 +558,7 @@ "DisableTemplateValidation": true, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784.json" } }, "Name": "testAssetProduct" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integservicecatalogproductencryptedassetS3AssetProductF5835286.product.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integservicecatalogproductencryptedassetS3AssetProductF5835286.product.template.json index 6be8f345ba1c8..55e5a8aa3af37 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integservicecatalogproductencryptedassetS3AssetProductF5835286.product.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integservicecatalogproductencryptedassetS3AssetProductF5835286.product.template.json @@ -38,13 +38,13 @@ "S3Bucket": "product-stack-asset-bucket-12345678-test-region", "S3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "HelloHandlerServiceRole11EF7C63", "Arn" ] }, - "Handler": "index.handler", "Runtime": "python3.9" }, "DependsOn": [ @@ -89,13 +89,13 @@ "S3Bucket": "product-stack-asset-bucket-12345678-test-region", "S3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "HelloHandler2ServiceRole37B1402D", "Arn" ] }, - "Handler": "index.handler", "Runtime": "python3.9" }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/manifest.json index 6211001bd03fd..8e7a9e5357cd1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-test-region", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-test-region", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/fbc5053e654cbff7f9f9e2dcc93822650d3c4575a353996389f09725526668bd.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/c4239d78dadb1df96f422c009e2d47614f81f2fd128f77af128992279f4336c7.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -84,7 +84,10 @@ "/integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/AwsCliLayer/Resource": [ { "type": "aws:cdk:logicalId", - "data": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + "data": "AssetsBucketDeploymentAwsCliLayer9BCEE17F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/CustomResource/Default": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/tree.json index 597ab5870a7fc..a0b626f7dc59c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/tree.json @@ -18,10 +18,10 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::Portfolio", "aws:cdk:cloudformation:props": { - "displayName": "TestPortfolio", - "providerName": "TestProvider", "acceptLanguage": "en", - "description": "This is our Service Catalog Portfolio" + "description": "This is our Service Catalog Portfolio", + "displayName": "TestPortfolio", + "providerName": "TestProvider" } }, "constructInfo": { @@ -104,6 +104,7 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::KMS::Key", "aws:cdk:cloudformation:props": { + "description": "Kms key for asset bucket", "keyPolicy": { "Statement": [ { @@ -127,8 +128,7 @@ } ], "Version": "2012-10-17" - }, - "description": "Kms key for asset bucket" + } } }, "constructInfo": { @@ -564,13 +564,13 @@ "s3Bucket": "product-stack-asset-bucket-12345678-test-region", "s3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" }, + "handler": "index.handler", "role": { "Fn::GetAtt": [ "HelloHandlerServiceRole11EF7C63", "Arn" ] }, - "handler": "index.handler", "runtime": "python3.9" } }, @@ -585,6 +585,14 @@ "version": "0.0.0" } }, + "ParentAssetBucket": { + "id": "ParentAssetBucket", + "path": "integ-servicecatalog-product-encrypted-asset/S3AssetProduct/ParentAssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + }, "HelloHandler2": { "id": "HelloHandler2", "path": "integ-servicecatalog-product-encrypted-asset/S3AssetProduct/HelloHandler2", @@ -682,13 +690,13 @@ "s3Bucket": "product-stack-asset-bucket-12345678-test-region", "s3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" }, + "handler": "index.handler", "role": { "Fn::GetAtt": [ "HelloHandler2ServiceRole37B1402D", "Arn" ] }, - "handler": "index.handler", "runtime": "python3.9" } }, @@ -775,32 +783,6 @@ "version": "0.0.0" } }, - "Asset1": { - "id": "Asset1", - "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/Asset1", - "children": { - "Stage": { - "id": "Stage", - "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/Asset1/Stage", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" - } - }, - "AssetBucket": { - "id": "AssetBucket", - "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/Asset1/AssetBucket", - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "0.0.0" - } - }, "CustomResource": { "id": "CustomResource", "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/CustomResource", @@ -818,32 +800,6 @@ "fqn": "aws-cdk-lib.CustomResource", "version": "0.0.0" } - }, - "Asset2": { - "id": "Asset2", - "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/Asset2", - "children": { - "Stage": { - "id": "Stage", - "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/Asset2/Stage", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" - } - }, - "AssetBucket": { - "id": "AssetBucket", - "path": "integ-servicecatalog-product-encrypted-asset/AssetsBucketDeployment/Asset2/AssetBucket", - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "0.0.0" - } } }, "constructInfo": { @@ -1069,12 +1025,6 @@ "s3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "s3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip" }, - "role": { - "Fn::GetAtt": [ - "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", - "Arn" - ] - }, "environment": { "variables": { "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" @@ -1086,6 +1036,12 @@ "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" } ], + "role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, "runtime": "python3.9", "timeout": 900 } @@ -1105,13 +1061,13 @@ "id": "TestProduct", "path": "integ-servicecatalog-product-encrypted-asset/TestProduct", "children": { - "Template492cd2a08509": { - "id": "Template492cd2a08509", - "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template492cd2a08509", + "Template29445a0ba87d": { + "id": "Template29445a0ba87d", + "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template29445a0ba87d", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template492cd2a08509/Stage", + "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template29445a0ba87d/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -1119,7 +1075,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template492cd2a08509/AssetBucket", + "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template29445a0ba87d/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -1131,13 +1087,13 @@ "version": "0.0.0" } }, - "Template77185cb33408": { - "id": "Template77185cb33408", - "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template77185cb33408", + "Template2c1881ac7bbc": { + "id": "Template2c1881ac7bbc", + "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template2c1881ac7bbc", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template77185cb33408/Stage", + "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template2c1881ac7bbc/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -1145,7 +1101,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template77185cb33408/AssetBucket", + "path": "integ-servicecatalog-product-encrypted-asset/TestProduct/Template2c1881ac7bbc/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -1209,7 +1165,7 @@ "disableTemplateValidation": true, "info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784.json" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json index d2d340eed866b..975ffe71b5920 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json @@ -113,7 +113,7 @@ } } }, - "c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a": { + "febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784": { "source": { "path": "integservicecatalogproductS3AssetProductCED6E119.product.template.json", "packaging": "file" @@ -121,13 +121,13 @@ "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json", + "objectKey": "febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784.json", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, - "4fdec0a1d09f4c0b2a1fd04164693c738b17b7009db1e5a59e0f8a96e208d168": { + "1369a801095f54b3149cd0e371681ec233462da8695077839ea1eec10cd6ac12": { "source": { "path": "integ-servicecatalog-product.template.json", "packaging": "file" @@ -135,7 +135,7 @@ "destinations": { "12345678-test-region": { "bucketName": "cdk-hnb659fds-assets-12345678-test-region", - "objectKey": "4fdec0a1d09f4c0b2a1fd04164693c738b17b7009db1e5a59e0f8a96e208d168.json", + "objectKey": "1369a801095f54b3149cd0e371681ec233462da8695077839ea1eec10cd6ac12.json", "region": "test-region", "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json index 5fb708b831e8e..e53243a47c3aa 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json @@ -3,10 +3,10 @@ "TestPortfolio4AC794EB": { "Type": "AWS::ServiceCatalog::Portfolio", "Properties": { - "DisplayName": "TestPortfolio", - "ProviderName": "TestProvider", "AcceptLanguage": "en", - "Description": "This is our Service Catalog Portfolio" + "Description": "This is our Service Catalog Portfolio", + "DisplayName": "TestPortfolio", + "ProviderName": "TestProvider" } }, "TestPortfolioPortfolioProductAssociation9c99ebba36fc70F2C75A": { @@ -329,12 +329,6 @@ "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "S3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip" }, - "Role": { - "Fn::GetAtt": [ - "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" @@ -346,6 +340,12 @@ "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" } ], + "Role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, "Runtime": "python3.9", "Timeout": 900 }, @@ -402,7 +402,7 @@ "DisableTemplateValidation": true, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784.json" } }, "Name": "testAssetProduct" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json index 6be8f345ba1c8..55e5a8aa3af37 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json @@ -38,13 +38,13 @@ "S3Bucket": "product-stack-asset-bucket-12345678-test-region", "S3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "HelloHandlerServiceRole11EF7C63", "Arn" ] }, - "Handler": "index.handler", "Runtime": "python3.9" }, "DependsOn": [ @@ -89,13 +89,13 @@ "S3Bucket": "product-stack-asset-bucket-12345678-test-region", "S3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "HelloHandler2ServiceRole37B1402D", "Arn" ] }, - "Handler": "index.handler", "Runtime": "python3.9" }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json index b2d1083db6a5d..28f47dd57ea6d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json @@ -17,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-test-region", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-test-region", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/4fdec0a1d09f4c0b2a1fd04164693c738b17b7009db1e5a59e0f8a96e208d168.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/1369a801095f54b3149cd0e371681ec233462da8695077839ea1eec10cd6ac12.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/tree.json index df1f3b868c1ea..0ffe018ad6562 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/tree.json @@ -18,10 +18,10 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::Portfolio", "aws:cdk:cloudformation:props": { - "displayName": "TestPortfolio", - "providerName": "TestProvider", "acceptLanguage": "en", - "description": "This is our Service Catalog Portfolio" + "description": "This is our Service Catalog Portfolio", + "displayName": "TestPortfolio", + "providerName": "TestProvider" } }, "constructInfo": { @@ -414,13 +414,13 @@ "s3Bucket": "product-stack-asset-bucket-12345678-test-region", "s3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" }, + "handler": "index.handler", "role": { "Fn::GetAtt": [ "HelloHandlerServiceRole11EF7C63", "Arn" ] }, - "handler": "index.handler", "runtime": "python3.9" } }, @@ -532,13 +532,13 @@ "s3Bucket": "product-stack-asset-bucket-12345678-test-region", "s3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" }, + "handler": "index.handler", "role": { "Fn::GetAtt": [ "HelloHandler2ServiceRole37B1402D", "Arn" ] }, - "handler": "index.handler", "runtime": "python3.9" } }, @@ -903,12 +903,6 @@ "s3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "s3Key": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip" }, - "role": { - "Fn::GetAtt": [ - "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", - "Arn" - ] - }, "environment": { "variables": { "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" @@ -920,6 +914,12 @@ "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" } ], + "role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, "runtime": "python3.9", "timeout": 900 } @@ -939,13 +939,13 @@ "id": "TestProduct", "path": "integ-servicecatalog-product/TestProduct", "children": { - "Template2e547177b81b": { - "id": "Template2e547177b81b", - "path": "integ-servicecatalog-product/TestProduct/Template2e547177b81b", + "Template29445a0ba87d": { + "id": "Template29445a0ba87d", + "path": "integ-servicecatalog-product/TestProduct/Template29445a0ba87d", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product/TestProduct/Template2e547177b81b/Stage", + "path": "integ-servicecatalog-product/TestProduct/Template29445a0ba87d/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -953,7 +953,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product/TestProduct/Template2e547177b81b/AssetBucket", + "path": "integ-servicecatalog-product/TestProduct/Template29445a0ba87d/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -965,13 +965,13 @@ "version": "0.0.0" } }, - "Template0d8d51d704c5": { - "id": "Template0d8d51d704c5", - "path": "integ-servicecatalog-product/TestProduct/Template0d8d51d704c5", + "Template2c1881ac7bbc": { + "id": "Template2c1881ac7bbc", + "path": "integ-servicecatalog-product/TestProduct/Template2c1881ac7bbc", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product/TestProduct/Template0d8d51d704c5/Stage", + "path": "integ-servicecatalog-product/TestProduct/Template2c1881ac7bbc/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -979,7 +979,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product/TestProduct/Template0d8d51d704c5/AssetBucket", + "path": "integ-servicecatalog-product/TestProduct/Template2c1881ac7bbc/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -1043,7 +1043,7 @@ "disableTemplateValidation": true, "info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/febf69072bf0640316efdf49d6c38d247fef7de32412b570eaf45f5ca3657784.json" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.assets.json index 970a8fb6f6a70..759a141c976e2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.assets.json @@ -79,7 +79,7 @@ } } }, - "4c02c9e217c9c5b8c7669936fa1ae7ba9f901ef663943fe3fe4d2e1d45aeb8bc": { + "17bbe2f9506dfe9022408968431aa5cd7914eb5c62ca37a7bd9fb8952738167b": { "source": { "path": "awsstepfunctionstasksekscallintegtestawscdkawseksClusterResourceProvider412BC189.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "4c02c9e217c9c5b8c7669936fa1ae7ba9f901ef663943fe3fe4d2e1d45aeb8bc.json", + "objectKey": "17bbe2f9506dfe9022408968431aa5cd7914eb5c62ca37a7bd9fb8952738167b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "fc130f16d7629187d57c382928b1445b00bc760f0d0e9a2979eb85b8e61873e1": { + "fa84415288d6bec8fb026e8e09ecc944dc0fc76fe0d58aadb5d8e8df3a7351bc": { "source": { "path": "awsstepfunctionstasksekscallintegtestawscdkawseksKubectlProvider65D285A0.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "fc130f16d7629187d57c382928b1445b00bc760f0d0e9a2979eb85b8e61873e1.json", + "objectKey": "fa84415288d6bec8fb026e8e09ecc944dc0fc76fe0d58aadb5d8e8df3a7351bc.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "270eaa77919680b613ea9441a17ac9919e30a816938bbd3b445aed1f14d3f746": { + "f040ffff650d9ac471762cdf138cc4cd6263be25cc9e8fb0a64116e3a23accd0": { "source": { "path": "aws-stepfunctions-tasks-eks-call-integ-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "270eaa77919680b613ea9441a17ac9919e30a816938bbd3b445aed1f14d3f746.json", + "objectKey": "f040ffff650d9ac471762cdf138cc4cd6263be25cc9e8fb0a64116e3a23accd0.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.template.json index 8d876fca73d6f..c43a3ee94a224 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/aws-stepfunctions-tasks-eks-call-integ-test.template.json @@ -18,9 +18,6 @@ "EksClusterDefaultVpcPublicSubnet1SubnetCB1D1047": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPublicSubnet1RouteTable163DE10A": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPublicSubnet1RouteTableAssociation36D085C2": { @@ -83,12 +83,12 @@ "EksClusterDefaultVpcPublicSubnet1DefaultRouteCE5F6EF3": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksClusterDefaultVpcPublicSubnet1RouteTable163DE10A" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "EksClusterDefaultVpcIGWCA6A3220" + }, + "RouteTableId": { + "Ref": "EksClusterDefaultVpcPublicSubnet1RouteTable163DE10A" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "EksClusterDefaultVpcPublicSubnet1NATGateway548C2CDF": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "EksClusterDefaultVpcPublicSubnet1SubnetCB1D1047" - }, "AllocationId": { "Fn::GetAtt": [ "EksClusterDefaultVpcPublicSubnet1EIPF53713C9", "AllocationId" ] }, + "SubnetId": { + "Ref": "EksClusterDefaultVpcPublicSubnet1SubnetCB1D1047" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "EksClusterDefaultVpcPublicSubnet2SubnetA8FE675D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPublicSubnet2RouteTable1027E4DE": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPublicSubnet2RouteTableAssociation39E2ABB3": { @@ -207,12 +207,12 @@ "EksClusterDefaultVpcPublicSubnet2DefaultRoute8B910E5C": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksClusterDefaultVpcPublicSubnet2RouteTable1027E4DE" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "EksClusterDefaultVpcIGWCA6A3220" + }, + "RouteTableId": { + "Ref": "EksClusterDefaultVpcPublicSubnet2RouteTable1027E4DE" } }, "DependsOn": [ @@ -238,15 +238,15 @@ "EksClusterDefaultVpcPublicSubnet2NATGateway869DDCBF": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "EksClusterDefaultVpcPublicSubnet2SubnetA8FE675D" - }, "AllocationId": { "Fn::GetAtt": [ "EksClusterDefaultVpcPublicSubnet2EIP16D41D80", "AllocationId" ] }, + "SubnetId": { + "Ref": "EksClusterDefaultVpcPublicSubnet2SubnetA8FE675D" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -266,9 +266,6 @@ "EksClusterDefaultVpcPrivateSubnet1Subnet4D665A2F": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -296,15 +293,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPrivateSubnet1RouteTable9104CFAB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -314,7 +311,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPrivateSubnet1RouteTableAssociationCC31B65B": { @@ -331,21 +331,18 @@ "EksClusterDefaultVpcPrivateSubnet1DefaultRoute790DE5CF": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksClusterDefaultVpcPrivateSubnet1RouteTable9104CFAB" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "EksClusterDefaultVpcPublicSubnet1NATGateway548C2CDF" + }, + "RouteTableId": { + "Ref": "EksClusterDefaultVpcPrivateSubnet1RouteTable9104CFAB" } } }, "EksClusterDefaultVpcPrivateSubnet2Subnet180B8A71": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -373,15 +370,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPrivateSubnet2RouteTable04B34031": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -391,7 +388,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "EksClusterDefaultVpcPrivateSubnet2RouteTableAssociation86243837": { @@ -408,12 +408,12 @@ "EksClusterDefaultVpcPrivateSubnet2DefaultRoute99A19B21": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "EksClusterDefaultVpcPrivateSubnet2RouteTable04B34031" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "EksClusterDefaultVpcPublicSubnet2NATGateway869DDCBF" + }, + "RouteTableId": { + "Ref": "EksClusterDefaultVpcPrivateSubnet2RouteTable04B34031" } } }, @@ -431,11 +431,11 @@ "EksClusterDefaultVpcVPCGW0E4A5673": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "InternetGatewayId": { "Ref": "EksClusterDefaultVpcIGWCA6A3220" + }, + "VpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" } } }, @@ -964,15 +964,25 @@ "EksClusterNodegroupDefaultCapacityA81E70F9": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "EksClusterFAB68BDB" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.large" + ], "NodeRole": { "Fn::GetAtt": [ "EksClusterNodegroupDefaultCapacityNodeGroupRole70D09CEC", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 2, + "MaxSize": 2, + "MinSize": 2 + }, "Subnets": [ { "Ref": "EksClusterDefaultVpcPrivateSubnet1Subnet4D665A2F" @@ -980,17 +990,7 @@ { "Ref": "EksClusterDefaultVpcPrivateSubnet2Subnet180B8A71" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.large" - ], - "ScalingConfig": { - "DesiredSize": 2, - "MaxSize": 2, - "MinSize": 2 - } + ] } }, "EksClusterAwsAuthmanifest4F460A9B": { @@ -1068,7 +1068,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/4c02c9e217c9c5b8c7669936fa1ae7ba9f901ef663943fe3fe4d2e1d45aeb8bc.json" + "/17bbe2f9506dfe9022408968431aa5cd7914eb5c62ca37a7bd9fb8952738167b.json" ] ] } @@ -1079,26 +1079,6 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/fc130f16d7629187d57c382928b1445b00bc760f0d0e9a2979eb85b8e61873e1.json" - ] - ] - }, "Parameters": { "referencetoawsstepfunctionstasksekscallintegtestEksClusterKubectlHandlerRole61616EA6Arn": { "Fn::GetAtt": [ @@ -1118,6 +1098,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/fa84415288d6bec8fb026e8e09ecc944dc0fc76fe0d58aadb5d8e8df3a7351bc.json" + ] + ] } }, "DependsOn": [ @@ -1152,12 +1152,6 @@ "StateMachine2E01A3A5": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "Role1ABCC5F0", - "Arn" - ] - }, "DefinitionString": { "Fn::Join": [ "", @@ -1187,6 +1181,12 @@ "\",\"Method\":\"GET\",\"Path\":\"/api/v1/namespaces/default/pods\"}}},\"TimeoutSeconds\":30}" ] ] + }, + "RoleArn": { + "Fn::GetAtt": [ + "Role1ABCC5F0", + "Arn" + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksClusterResourceProvider412BC189.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksClusterResourceProvider412BC189.nested.template.json index 9fd3ef2bf5dd3..b84a9ddc06a85 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksClusterResourceProvider412BC189.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksClusterResourceProvider412BC189.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksKubectlProvider65D285A0.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksKubectlProvider65D285A0.nested.template.json index 317c067d216e1..e0a3df43ef033 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksKubectlProvider65D285A0.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/awsstepfunctionstasksekscallintegtestawscdkawseksKubectlProvider65D285A0.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawsstepfunctionstasksekscallintegtestEksClusterKubectlHandlerRole61616EA6Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawsstepfunctionstasksekscallintegtestEksClusterKubectlHandlerRole61616EA6Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -160,12 +160,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -178,6 +172,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/integ.json index 1cbcd91da63f8..38adeb2ba7efb 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-stepfunctions-tasks-eks-call-integ-test" ], + "diffAssets": true, "cdkCommandOptions": { "deploy": { "args": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/manifest.json index a555f891fbffe..a29f0f70d7977 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/manifest.json @@ -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}/270eaa77919680b613ea9441a17ac9919e30a816938bbd3b445aed1f14d3f746.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f040ffff650d9ac471762cdf138cc4cd6263be25cc9e8fb0a64116e3a23accd0.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/tree.json index 9296c62ac9e9a..4342c59f9906e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.js.snapshot/tree.json @@ -49,9 +49,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -79,7 +76,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -101,9 +101,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -113,7 +110,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -146,12 +146,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksClusterDefaultVpcPublicSubnet1RouteTable163DE10A" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "EksClusterDefaultVpcIGWCA6A3220" + }, + "routeTableId": { + "Ref": "EksClusterDefaultVpcPublicSubnet1RouteTable163DE10A" } } }, @@ -190,15 +190,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "EksClusterDefaultVpcPublicSubnet1SubnetCB1D1047" - }, "allocationId": { "Fn::GetAtt": [ "EksClusterDefaultVpcPublicSubnet1EIPF53713C9", "AllocationId" ] }, + "subnetId": { + "Ref": "EksClusterDefaultVpcPublicSubnet1SubnetCB1D1047" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -232,9 +232,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -262,7 +259,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -284,9 +284,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -296,7 +293,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -329,12 +329,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksClusterDefaultVpcPublicSubnet2RouteTable1027E4DE" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "EksClusterDefaultVpcIGWCA6A3220" + }, + "routeTableId": { + "Ref": "EksClusterDefaultVpcPublicSubnet2RouteTable1027E4DE" } } }, @@ -373,15 +373,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "EksClusterDefaultVpcPublicSubnet2SubnetA8FE675D" - }, "allocationId": { "Fn::GetAtt": [ "EksClusterDefaultVpcPublicSubnet2EIP16D41D80", "AllocationId" ] }, + "subnetId": { + "Ref": "EksClusterDefaultVpcPublicSubnet2SubnetA8FE675D" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -415,9 +415,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -445,7 +442,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -467,9 +467,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -479,7 +476,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -512,12 +512,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksClusterDefaultVpcPrivateSubnet1RouteTable9104CFAB" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "EksClusterDefaultVpcPublicSubnet1NATGateway548C2CDF" + }, + "routeTableId": { + "Ref": "EksClusterDefaultVpcPrivateSubnet1RouteTable9104CFAB" } } }, @@ -542,9 +542,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -572,7 +569,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -594,9 +594,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -606,7 +603,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-eks-call-integ-test/EksCluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" + } } }, "constructInfo": { @@ -639,12 +639,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "EksClusterDefaultVpcPrivateSubnet2RouteTable04B34031" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "EksClusterDefaultVpcPublicSubnet2NATGateway869DDCBF" + }, + "routeTableId": { + "Ref": "EksClusterDefaultVpcPrivateSubnet2RouteTable04B34031" } } }, @@ -684,11 +684,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "EksClusterDefaultVpcB24550B2" - }, "internetGatewayId": { "Ref": "EksClusterDefaultVpcIGWCA6A3220" + }, + "vpcId": { + "Ref": "EksClusterDefaultVpcB24550B2" } } }, @@ -1297,15 +1297,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "EksClusterFAB68BDB" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.large" + ], "nodeRole": { "Fn::GetAtt": [ "EksClusterNodegroupDefaultCapacityNodeGroupRole70D09CEC", "Arn" ] }, + "scalingConfig": { + "desiredSize": 2, + "maxSize": 2, + "minSize": 2 + }, "subnets": [ { "Ref": "EksClusterDefaultVpcPrivateSubnet1Subnet4D665A2F" @@ -1313,17 +1323,7 @@ { "Ref": "EksClusterDefaultVpcPrivateSubnet2Subnet180B8A71" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.large" - ], - "scalingConfig": { - "desiredSize": 2, - "maxSize": 2, - "minSize": 2 - } + ] } }, "constructInfo": { @@ -1540,12 +1540,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1558,6 +1552,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1672,12 +1672,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1690,6 +1684,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1895,12 +1895,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -1922,6 +1916,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2116,12 +2116,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2140,6 +2134,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2334,12 +2334,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2358,6 +2352,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2576,7 +2576,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/4c02c9e217c9c5b8c7669936fa1ae7ba9f901ef663943fe3fe4d2e1d45aeb8bc.json" + "/17bbe2f9506dfe9022408968431aa5cd7914eb5c62ca37a7bd9fb8952738167b.json" ] ] } @@ -2639,9 +2639,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawsstepfunctionstasksekscallintegtestEksClusterKubectlHandlerRole61616EA6Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2653,6 +2650,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawsstepfunctionstasksekscallintegtestEksClusterKubectlHandlerRole61616EA6Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -2986,12 +2986,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-eks-call-integ-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3004,6 +2998,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3096,26 +3096,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/fc130f16d7629187d57c382928b1445b00bc760f0d0e9a2979eb85b8e61873e1.json" - ] - ] - }, "parameters": { "referencetoawsstepfunctionstasksekscallintegtestEksClusterKubectlHandlerRole61616EA6Arn": { "Fn::GetAtt": [ @@ -3135,6 +3115,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/fa84415288d6bec8fb026e8e09ecc944dc0fc76fe0d58aadb5d8e8df3a7351bc.json" + ] + ] } } }, @@ -3211,12 +3211,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::StepFunctions::StateMachine", "aws:cdk:cloudformation:props": { - "roleArn": { - "Fn::GetAtt": [ - "Role1ABCC5F0", - "Arn" - ] - }, "definitionString": { "Fn::Join": [ "", @@ -3246,6 +3240,12 @@ "\",\"Method\":\"GET\",\"Path\":\"/api/v1/namespaces/default/pods\"}}},\"TimeoutSeconds\":30}" ] ] + }, + "roleArn": { + "Fn::GetAtt": [ + "Role1ABCC5F0", + "Arn" + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.assets.json index c68e5bc0856e4..46dd29d848839 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.assets.json @@ -79,7 +79,7 @@ } } }, - "4c19159698a44d819f0c2518d2a9c08180cb4ec7b811f6e90c55211ec2ea24d8": { + "69feeb9cd44f367c110e45d2af8cdadf91aa64f06f45ac0eabd487257e5b8288": { "source": { "path": "awsstepfunctionstasksemrcontainersallservicestestawscdkawseksClusterResourceProvider6985269B.nested.template.json", "packaging": "file" @@ -87,12 +87,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "4c19159698a44d819f0c2518d2a9c08180cb4ec7b811f6e90c55211ec2ea24d8.json", + "objectKey": "69feeb9cd44f367c110e45d2af8cdadf91aa64f06f45ac0eabd487257e5b8288.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "49f5eff2dfc3c5c2b1970a08d40582ef26598ddbcd1d5afe60f77345ad75d184": { + "595c013871e33e03a7b00168e3763347a6af19ecdaeaa39d143d1f2a2f318f5f": { "source": { "path": "awsstepfunctionstasksemrcontainersallservicestestawscdkawseksKubectlProviderD9DFA1E3.nested.template.json", "packaging": "file" @@ -100,12 +100,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "49f5eff2dfc3c5c2b1970a08d40582ef26598ddbcd1d5afe60f77345ad75d184.json", + "objectKey": "595c013871e33e03a7b00168e3763347a6af19ecdaeaa39d143d1f2a2f318f5f.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "9617a5b856f2723c634cc34bb796183a1218782b6341366f80ca458cc4b8b332": { + "da1751454d1165801b19bc7d9771647b8b26bdd58c9dd70fc6a605fa551f4fae": { "source": { "path": "aws-stepfunctions-tasks-emr-containers-all-services-test.template.json", "packaging": "file" @@ -113,7 +113,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "9617a5b856f2723c634cc34bb796183a1218782b6341366f80ca458cc4b8b332.json", + "objectKey": "da1751454d1165801b19bc7d9771647b8b26bdd58c9dd70fc6a605fa551f4fae.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json index 42b59f03f674a..55c128eaefc26 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json @@ -18,9 +18,6 @@ "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTableAssociation4831B6A7": { @@ -83,12 +83,12 @@ "integrationtesteksclusterDefaultVpcPublicSubnet1DefaultRoute33CE7FC3": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "integrationtesteksclusterDefaultVpcPublicSubnet1NATGatewayC9C984F9": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" - }, "AllocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet1EIP62A0A17B", "AllocationId" ] }, + "SubnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableAssociation62710C52": { @@ -207,12 +207,12 @@ "integrationtesteksclusterDefaultVpcPublicSubnet2DefaultRoute253A231E": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" } }, "DependsOn": [ @@ -238,15 +238,15 @@ "integrationtesteksclusterDefaultVpcPublicSubnet2NATGatewayE109B761": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" - }, "AllocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet2EIPFC53AC43", "AllocationId" ] }, + "SubnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -266,9 +266,6 @@ "integrationtesteksclusterDefaultVpcPrivateSubnet1Subnet4E00CAFB": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -296,15 +293,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -314,7 +311,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTableAssociation7482DD1E": { @@ -331,21 +331,18 @@ "integrationtesteksclusterDefaultVpcPrivateSubnet1DefaultRouteCC99A72C": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1NATGatewayC9C984F9" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet2Subnet0C3539A8": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -373,15 +370,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -391,7 +388,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableAssociation99F934D5": { @@ -408,12 +408,12 @@ "integrationtesteksclusterDefaultVpcPrivateSubnet2DefaultRoute50FF167F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2NATGatewayE109B761" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" } } }, @@ -431,11 +431,11 @@ "integrationtesteksclusterDefaultVpcVPCGWE4DC2204": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "InternetGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" } } }, @@ -903,15 +903,25 @@ "integrationtesteksclusterNodegroupDefaultCapacity536CF32C": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "integrationtesteksclusterE5C0ED98" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.xlarge" + ], "NodeRole": { "Fn::GetAtt": [ "integrationtesteksclusterNodegroupDefaultCapacityNodeGroupRole75D45BA7", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 3, + "MaxSize": 3, + "MinSize": 3 + }, "Subnets": [ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1Subnet4E00CAFB" @@ -919,17 +929,7 @@ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2Subnet0C3539A8" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.xlarge" - ], - "ScalingConfig": { - "DesiredSize": 3, - "MaxSize": 3, - "MinSize": 3 - } + ] } }, "integrationtesteksclusterAwsAuthmanifestAEF9C6DF": { @@ -993,7 +993,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/4c19159698a44d819f0c2518d2a9c08180cb4ec7b811f6e90c55211ec2ea24d8.json" + "/69feeb9cd44f367c110e45d2af8cdadf91aa64f06f45ac0eabd487257e5b8288.json" ] ] } @@ -1004,26 +1004,6 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/49f5eff2dfc3c5c2b1970a08d40582ef26598ddbcd1d5afe60f77345ad75d184.json" - ] - ] - }, "Parameters": { "referencetoawsstepfunctionstasksemrcontainersallservicestestintegrationtesteksclusterKubectlHandlerRole4EA39100Arn": { "Fn::GetAtt": [ @@ -1043,6 +1023,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/595c013871e33e03a7b00168e3763347a6af19ecdaeaa39d143d1f2a2f318f5f.json" + ] + ] } }, "DependsOn": [ @@ -1331,12 +1331,6 @@ "StateMachine2E01A3A5": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "StateMachineRoleB840431D", - "Arn" - ] - }, "DefinitionString": { "Fn::Join": [ "", @@ -1375,6 +1369,12 @@ ":states:::emr-containers:deleteVirtualCluster\",\"Parameters\":{\"Id.$\":\"$.job.VirtualClusterId\"}}},\"TimeoutSeconds\":1200}" ] ] + }, + "RoleArn": { + "Fn::GetAtt": [ + "StateMachineRoleB840431D", + "Arn" + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksClusterResourceProvider6985269B.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksClusterResourceProvider6985269B.nested.template.json index 7509bbd708080..e49c10ee90073 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksClusterResourceProvider6985269B.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksClusterResourceProvider6985269B.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksKubectlProviderD9DFA1E3.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksKubectlProviderD9DFA1E3.nested.template.json index 02d74b15f80e6..16f78e55ba9d2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksKubectlProviderD9DFA1E3.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/awsstepfunctionstasksemrcontainersallservicestestawscdkawseksKubectlProviderD9DFA1E3.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawsstepfunctionstasksemrcontainersallservicestestintegrationtesteksclusterKubectlHandlerRole4EA39100Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawsstepfunctionstasksemrcontainersallservicestestintegrationtesteksclusterKubectlHandlerRole4EA39100Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -160,12 +160,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -178,6 +172,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/integ.json index 45a9dab387887..c65544ef52f5b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/integ.json @@ -5,6 +5,7 @@ "stacks": [ "aws-stepfunctions-tasks-emr-containers-all-services-test" ], + "diffAssets": true, "cdkCommandOptions": { "deploy": { "args": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/manifest.json index 8204b1ba90d21..1aaffa29e33c8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/manifest.json @@ -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}/9617a5b856f2723c634cc34bb796183a1218782b6341366f80ca458cc4b8b332.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/da1751454d1165801b19bc7d9771647b8b26bdd58c9dd70fc6a605fa551f4fae.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/tree.json index f9ac15d588ff0..26f93791c0ab4 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/tree.json @@ -49,9 +49,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -79,7 +76,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -101,9 +101,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -113,7 +110,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -146,12 +146,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" } } }, @@ -190,15 +190,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" - }, "allocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet1EIP62A0A17B", "AllocationId" ] }, + "subnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -232,9 +232,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -262,7 +259,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -284,9 +284,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -296,7 +293,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -329,12 +329,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" } } }, @@ -373,15 +373,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" - }, "allocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet2EIPFC53AC43", "AllocationId" ] }, + "subnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -415,9 +415,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -445,7 +442,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -467,9 +467,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -479,7 +476,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -512,12 +512,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1NATGatewayC9C984F9" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" } } }, @@ -542,9 +542,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -572,7 +569,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -594,9 +594,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -606,7 +603,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-all-services-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -639,12 +639,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2NATGatewayE109B761" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" } } }, @@ -684,11 +684,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "internetGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" } } }, @@ -1237,15 +1237,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "integrationtesteksclusterE5C0ED98" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.xlarge" + ], "nodeRole": { "Fn::GetAtt": [ "integrationtesteksclusterNodegroupDefaultCapacityNodeGroupRole75D45BA7", "Arn" ] }, + "scalingConfig": { + "desiredSize": 3, + "maxSize": 3, + "minSize": 3 + }, "subnets": [ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1Subnet4E00CAFB" @@ -1253,17 +1263,7 @@ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2Subnet0C3539A8" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.xlarge" - ], - "scalingConfig": { - "desiredSize": 3, - "maxSize": 3, - "minSize": 3 - } + ] } }, "constructInfo": { @@ -1480,12 +1480,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1498,6 +1492,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1612,12 +1612,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1630,6 +1624,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1835,12 +1835,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -1862,6 +1856,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2056,12 +2056,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2080,6 +2074,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2274,12 +2274,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2298,6 +2292,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2516,7 +2516,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/4c19159698a44d819f0c2518d2a9c08180cb4ec7b811f6e90c55211ec2ea24d8.json" + "/69feeb9cd44f367c110e45d2af8cdadf91aa64f06f45ac0eabd487257e5b8288.json" ] ] } @@ -2579,9 +2579,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawsstepfunctionstasksemrcontainersallservicestestintegrationtesteksclusterKubectlHandlerRole4EA39100Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2593,6 +2590,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawsstepfunctionstasksemrcontainersallservicestestintegrationtesteksclusterKubectlHandlerRole4EA39100Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -2926,12 +2926,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-all-services-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -2944,6 +2938,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3036,26 +3036,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/49f5eff2dfc3c5c2b1970a08d40582ef26598ddbcd1d5afe60f77345ad75d184.json" - ] - ] - }, "parameters": { "referencetoawsstepfunctionstasksemrcontainersallservicestestintegrationtesteksclusterKubectlHandlerRole4EA39100Arn": { "Fn::GetAtt": [ @@ -3075,6 +3055,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/595c013871e33e03a7b00168e3763347a6af19ecdaeaa39d143d1f2a2f318f5f.json" + ] + ] } } }, @@ -3528,12 +3528,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::StepFunctions::StateMachine", "aws:cdk:cloudformation:props": { - "roleArn": { - "Fn::GetAtt": [ - "StateMachineRoleB840431D", - "Arn" - ] - }, "definitionString": { "Fn::Join": [ "", @@ -3572,6 +3566,12 @@ ":states:::emr-containers:deleteVirtualCluster\",\"Parameters\":{\"Id.$\":\"$.job.VirtualClusterId\"}}},\"TimeoutSeconds\":1200}" ] ] + }, + "roleArn": { + "Fn::GetAtt": [ + "StateMachineRoleB840431D", + "Arn" + ] } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.assets.json index cdee7bbda231f..0e549b1d54941 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.assets.json @@ -105,7 +105,7 @@ } } }, - "99949b50f008a6e20d42ed0bb804c7322e2e25fc213ad1b331e2be20530bcb9b": { + "e821390ff3d49bf2c2bae31412f405ce6c254adac09aaf4b5aade28604dd4d68": { "source": { "path": "awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksClusterResourceProvider2391B7F7.nested.template.json", "packaging": "file" @@ -113,12 +113,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "99949b50f008a6e20d42ed0bb804c7322e2e25fc213ad1b331e2be20530bcb9b.json", + "objectKey": "e821390ff3d49bf2c2bae31412f405ce6c254adac09aaf4b5aade28604dd4d68.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "9f53c114c4dc11f3f2ee9d16fc22fdbaad28d631f8ab7740a90eb7a941ae666b": { + "fcfd45ab193cce58bc57448fae2176db60020def0d25dcc9649e60e3ed148434": { "source": { "path": "awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksKubectlProviderEB85BF5A.nested.template.json", "packaging": "file" @@ -126,12 +126,12 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "9f53c114c4dc11f3f2ee9d16fc22fdbaad28d631f8ab7740a90eb7a941ae666b.json", + "objectKey": "fcfd45ab193cce58bc57448fae2176db60020def0d25dcc9649e60e3ed148434.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "233e4e27ed3b58e6669b9694b9da3531e0d04bb611785354fae1b2daa597625d": { + "ea8f0270ba3ea58b97c61fd32563585f24aa88ed65e58390cf69a0815d395e25": { "source": { "path": "aws-stepfunctions-tasks-emr-containers-start-job-run-test.template.json", "packaging": "file" @@ -139,7 +139,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "233e4e27ed3b58e6669b9694b9da3531e0d04bb611785354fae1b2daa597625d.json", + "objectKey": "ea8f0270ba3ea58b97c61fd32563585f24aa88ed65e58390cf69a0815d395e25.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.template.json index b0f1c6a13c8ff..a479a0c100d3a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run-test.template.json @@ -18,9 +18,6 @@ "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -48,15 +45,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -66,7 +63,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTableAssociation4831B6A7": { @@ -83,12 +83,12 @@ "integrationtesteksclusterDefaultVpcPublicSubnet1DefaultRoute33CE7FC3": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "integrationtesteksclusterDefaultVpcPublicSubnet1NATGatewayC9C984F9": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" - }, "AllocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet1EIP62A0A17B", "AllocationId" ] }, + "SubnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -142,9 +142,6 @@ "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -172,15 +169,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -190,7 +187,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableAssociation62710C52": { @@ -207,12 +207,12 @@ "integrationtesteksclusterDefaultVpcPublicSubnet2DefaultRoute253A231E": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" } }, "DependsOn": [ @@ -238,15 +238,15 @@ "integrationtesteksclusterDefaultVpcPublicSubnet2NATGatewayE109B761": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" - }, "AllocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet2EIPFC53AC43", "AllocationId" ] }, + "SubnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" + }, "Tags": [ { "Key": "kubernetes.io/role/elb", @@ -266,9 +266,6 @@ "integrationtesteksclusterDefaultVpcPrivateSubnet1Subnet4E00CAFB": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -296,15 +293,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -314,7 +311,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTableAssociation7482DD1E": { @@ -331,21 +331,18 @@ "integrationtesteksclusterDefaultVpcPrivateSubnet1DefaultRouteCC99A72C": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1NATGatewayC9C984F9" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet2Subnet0C3539A8": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -373,15 +370,15 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "Tags": [ { "Key": "kubernetes.io/role/internal-elb", @@ -391,7 +388,10 @@ "Key": "Name", "Value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableAssociation99F934D5": { @@ -408,12 +408,12 @@ "integrationtesteksclusterDefaultVpcPrivateSubnet2DefaultRoute50FF167F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2NATGatewayE109B761" + }, + "RouteTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" } } }, @@ -431,11 +431,11 @@ "integrationtesteksclusterDefaultVpcVPCGWE4DC2204": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "InternetGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "VpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" } } }, @@ -903,15 +903,25 @@ "integrationtesteksclusterNodegroupDefaultCapacity536CF32C": { "Type": "AWS::EKS::Nodegroup", "Properties": { + "AmiType": "AL2_x86_64", "ClusterName": { "Ref": "integrationtesteksclusterE5C0ED98" }, + "ForceUpdateEnabled": true, + "InstanceTypes": [ + "m5.xlarge" + ], "NodeRole": { "Fn::GetAtt": [ "integrationtesteksclusterNodegroupDefaultCapacityNodeGroupRole75D45BA7", "Arn" ] }, + "ScalingConfig": { + "DesiredSize": 3, + "MaxSize": 3, + "MinSize": 3 + }, "Subnets": [ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1Subnet4E00CAFB" @@ -919,17 +929,7 @@ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2Subnet0C3539A8" } - ], - "AmiType": "AL2_x86_64", - "ForceUpdateEnabled": true, - "InstanceTypes": [ - "m5.xlarge" - ], - "ScalingConfig": { - "DesiredSize": 3, - "MaxSize": 3, - "MinSize": 3 - } + ] } }, "integrationtesteksclusterAwsAuthmanifestAEF9C6DF": { @@ -1052,7 +1052,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/99949b50f008a6e20d42ed0bb804c7322e2e25fc213ad1b331e2be20530bcb9b.json" + "/e821390ff3d49bf2c2bae31412f405ce6c254adac09aaf4b5aade28604dd4d68.json" ] ] } @@ -1063,26 +1063,6 @@ "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/9f53c114c4dc11f3f2ee9d16fc22fdbaad28d631f8ab7740a90eb7a941ae666b.json" - ] - ] - }, "Parameters": { "referencetoawsstepfunctionstasksemrcontainersstartjobruntestintegrationtesteksclusterKubectlHandlerRole9370F2F5Arn": { "Fn::GetAtt": [ @@ -1102,6 +1082,26 @@ "ClusterSecurityGroupId" ] } + }, + "TemplateURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/fcfd45ab193cce58bc57448fae2176db60020def0d25dcc9649e60e3ed148434.json" + ] + ] } }, "DependsOn": [ @@ -1343,12 +1343,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "StartaJobRunCustomResourceProviderframeworkonEventServiceRole1D6E2464", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-start-job-run-test/Start a Job Run/CustomResourceProvider)", "Environment": { "Variables": { @@ -1361,6 +1355,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "StartaJobRunCustomResourceProviderframeworkonEventServiceRole1D6E2464", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -1437,13 +1437,13 @@ }, "S3Key": "147814a8b95b4dc50c3d78ab1cf1a5a7fe7376d961cb2447e6a1c7184b14bd78.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "Timeout": 120 }, @@ -1550,12 +1550,6 @@ }, "S3Key": "3c25783c134c6817b53033bdc57fc404bda6ba93392fcc7d3ca4d92bd072351f.zip" }, - "Role": { - "Fn::GetAtt": [ - "SingletonLambda8693BB64968944B69AAFB0CC9EB8757CServiceRoleF99BDB4C", - "Arn" - ] - }, "Handler": "index.handler", "Layers": [ { @@ -1563,6 +1557,12 @@ } ], "MemorySize": 256, + "Role": { + "Fn::GetAtt": [ + "SingletonLambda8693BB64968944B69AAFB0CC9EB8757CServiceRoleF99BDB4C", + "Arn" + ] + }, "Runtime": "python3.9", "Timeout": 30 }, @@ -1681,12 +1681,6 @@ "StateMachine2E01A3A5": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "StateMachineRoleB840431D", - "Arn" - ] - }, "DefinitionString": { "Fn::Join": [ "", @@ -1712,6 +1706,12 @@ "\",\"ReleaseLabel\":\"emr-6.2.0-latest\",\"JobDriver\":{\"SparkSubmitJobDriver\":{\"EntryPoint\":\"local:///usr/lib/spark/examples/src/main/python/pi.py\",\"EntryPointArguments\":[\"2\"],\"SparkSubmitParameters\":\"--conf spark.driver.memory=512M --conf spark.kubernetes.driver.request.cores=0.2 --conf spark.kubernetes.executor.request.cores=0.2 --conf spark.sql.shuffle.partitions=60 --conf spark.dynamicAllocation.enabled=false\"}},\"ConfigurationOverrides\":{\"MonitoringConfiguration\":{\"PersistentAppUI\":\"ENABLED\"}}}}},\"TimeoutSeconds\":1000}" ] ] + }, + "RoleArn": { + "Fn::GetAtt": [ + "StateMachineRoleB840431D", + "Arn" + ] } }, "DependsOn": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksClusterResourceProvider2391B7F7.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksClusterResourceProvider2391B7F7.nested.template.json index 4ae9f29f0f1f1..3a4fcc72fa4dd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksClusterResourceProvider2391B7F7.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksClusterResourceProvider2391B7F7.nested.template.json @@ -52,12 +52,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "Description": "onEvent handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -70,6 +64,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -117,12 +117,6 @@ }, "S3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "Role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "Description": "isComplete handler for EKS cluster resource provider", "Environment": { "Variables": { @@ -135,6 +129,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "Role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 60 }, @@ -251,12 +251,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -278,6 +272,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -388,12 +388,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - isComplete (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -412,6 +406,12 @@ } }, "Handler": "framework.isComplete", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, @@ -522,12 +522,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onTimeout (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "Environment": { "Variables": { @@ -546,6 +540,12 @@ } }, "Handler": "framework.onTimeout", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900 }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksKubectlProviderEB85BF5A.nested.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksKubectlProviderEB85BF5A.nested.template.json index 277be056557f9..68a5321bb4be6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksKubectlProviderEB85BF5A.nested.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/awsstepfunctionstasksemrcontainersstartjobruntestawscdkawseksKubectlProviderEB85BF5A.nested.template.json @@ -9,9 +9,6 @@ }, "S3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "Role": { - "Ref": "referencetoawsstepfunctionstasksemrcontainersstartjobruntestintegrationtesteksclusterKubectlHandlerRole9370F2F5Arn" - }, "Description": "onEvent handler for EKS kubectl resource provider", "Handler": "index.handler", "Layers": [ @@ -23,6 +20,9 @@ } ], "MemorySize": 1024, + "Role": { + "Ref": "referencetoawsstepfunctionstasksemrcontainersstartjobruntestintegrationtesteksclusterKubectlHandlerRole9370F2F5Arn" + }, "Runtime": "python3.7", "Timeout": 900, "VpcConfig": { @@ -160,12 +160,6 @@ }, "S3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "Role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "Description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "Environment": { "Variables": { @@ -178,6 +172,12 @@ } }, "Handler": "framework.onEvent", + "Role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "Runtime": "nodejs18.x", "Timeout": 900, "VpcConfig": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/manifest.json index dd9848345e239..556393795b31e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/manifest.json @@ -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}/233e4e27ed3b58e6669b9694b9da3531e0d04bb611785354fae1b2daa597625d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ea8f0270ba3ea58b97c61fd32563585f24aa88ed65e58390cf69a0815d395e25.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/tree.json index 25bd344aa684b..bc89be6eb8a84 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/tree.json @@ -49,9 +49,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -79,7 +76,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -101,9 +101,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -113,7 +110,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -146,12 +146,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1RouteTable1D5A7569" } } }, @@ -190,15 +190,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" - }, "allocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet1EIP62A0A17B", "AllocationId" ] }, + "subnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1Subnet58061317" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -232,9 +232,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -262,7 +259,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -284,9 +284,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -296,7 +293,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -329,12 +329,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2RouteTableA4C7B327" } } }, @@ -373,15 +373,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" - }, "allocationId": { "Fn::GetAtt": [ "integrationtesteksclusterDefaultVpcPublicSubnet2EIPFC53AC43", "AllocationId" ] }, + "subnetId": { + "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2Subnet68EAAF11" + }, "tags": [ { "key": "kubernetes.io/role/elb", @@ -415,9 +415,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -445,7 +442,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -467,9 +467,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -479,7 +476,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -512,12 +512,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet1NATGatewayC9C984F9" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1RouteTable4A47F4AC" } } }, @@ -542,9 +542,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -572,7 +569,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -594,9 +594,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "tags": [ { "key": "kubernetes.io/role/internal-elb", @@ -606,7 +603,10 @@ "key": "Name", "value": "aws-stepfunctions-tasks-emr-containers-start-job-run-test/integration-test-eks-cluster/DefaultVpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" + } } }, "constructInfo": { @@ -639,12 +639,12 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcPublicSubnet2NATGatewayE109B761" + }, + "routeTableId": { + "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2RouteTableD7E59903" } } }, @@ -684,11 +684,11 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "integrationtesteksclusterDefaultVpc395E1A86" - }, "internetGatewayId": { "Ref": "integrationtesteksclusterDefaultVpcIGW9ADAFE6F" + }, + "vpcId": { + "Ref": "integrationtesteksclusterDefaultVpc395E1A86" } } }, @@ -1237,15 +1237,25 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EKS::Nodegroup", "aws:cdk:cloudformation:props": { + "amiType": "AL2_x86_64", "clusterName": { "Ref": "integrationtesteksclusterE5C0ED98" }, + "forceUpdateEnabled": true, + "instanceTypes": [ + "m5.xlarge" + ], "nodeRole": { "Fn::GetAtt": [ "integrationtesteksclusterNodegroupDefaultCapacityNodeGroupRole75D45BA7", "Arn" ] }, + "scalingConfig": { + "desiredSize": 3, + "maxSize": 3, + "minSize": 3 + }, "subnets": [ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet1Subnet4E00CAFB" @@ -1253,17 +1263,7 @@ { "Ref": "integrationtesteksclusterDefaultVpcPrivateSubnet2Subnet0C3539A8" } - ], - "amiType": "AL2_x86_64", - "forceUpdateEnabled": true, - "instanceTypes": [ - "m5.xlarge" - ], - "scalingConfig": { - "desiredSize": 3, - "maxSize": 3, - "minSize": 3 - } + ] } }, "constructInfo": { @@ -1536,12 +1536,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "OnEventHandlerServiceRole15A26729", - "Arn" - ] - }, "description": "onEvent handler for EKS cluster resource provider", "environment": { "variables": { @@ -1554,6 +1548,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "OnEventHandlerServiceRole15A26729", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1668,12 +1668,6 @@ }, "s3Key": "a46179e8334ce45c3cbb975d0dfe34028e095aa8dfa55496bbc7717623351649.zip" }, - "role": { - "Fn::GetAtt": [ - "IsCompleteHandlerServiceRole5810CC58", - "Arn" - ] - }, "description": "isComplete handler for EKS cluster resource provider", "environment": { "variables": { @@ -1686,6 +1680,12 @@ "Ref": "NodeProxyAgentLayer924C1971" } ], + "role": { + "Fn::GetAtt": [ + "IsCompleteHandlerServiceRole5810CC58", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 60 } @@ -1891,12 +1891,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -1918,6 +1912,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2112,12 +2112,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkisCompleteServiceRoleB1087139", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - isComplete (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2136,6 +2130,12 @@ } }, "handler": "framework.isComplete", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkisCompleteServiceRoleB1087139", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2330,12 +2330,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonTimeoutServiceRole28643D26", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onTimeout (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.ClusterResourceProvider/Provider)", "environment": { "variables": { @@ -2354,6 +2348,12 @@ } }, "handler": "framework.onTimeout", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonTimeoutServiceRole28643D26", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -2572,7 +2572,7 @@ { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "/99949b50f008a6e20d42ed0bb804c7322e2e25fc213ad1b331e2be20530bcb9b.json" + "/e821390ff3d49bf2c2bae31412f405ce6c254adac09aaf4b5aade28604dd4d68.json" ] ] } @@ -2635,9 +2635,6 @@ }, "s3Key": "9017774b84ae2457b1b2ad6fcbb4860d8ce2537062c77010b24d9b156ced5a1b.zip" }, - "role": { - "Ref": "referencetoawsstepfunctionstasksemrcontainersstartjobruntestintegrationtesteksclusterKubectlHandlerRole9370F2F5Arn" - }, "description": "onEvent handler for EKS kubectl resource provider", "handler": "index.handler", "layers": [ @@ -2649,6 +2646,9 @@ } ], "memorySize": 1024, + "role": { + "Ref": "referencetoawsstepfunctionstasksemrcontainersstartjobruntestintegrationtesteksclusterKubectlHandlerRole9370F2F5Arn" + }, "runtime": "python3.7", "timeout": 900, "vpcConfig": { @@ -2982,12 +2982,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "ProviderframeworkonEventServiceRole9FF04296", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-start-job-run-test/@aws-cdk--aws-eks.KubectlProvider/Provider)", "environment": { "variables": { @@ -3000,6 +2994,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "ProviderframeworkonEventServiceRole9FF04296", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900, "vpcConfig": { @@ -3092,26 +3092,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::CloudFormation::Stack", "aws:cdk:cloudformation:props": { - "templateUrl": { - "Fn::Join": [ - "", - [ - "https://s3.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "/9f53c114c4dc11f3f2ee9d16fc22fdbaad28d631f8ab7740a90eb7a941ae666b.json" - ] - ] - }, "parameters": { "referencetoawsstepfunctionstasksemrcontainersstartjobruntestintegrationtesteksclusterKubectlHandlerRole9370F2F5Arn": { "Fn::GetAtt": [ @@ -3131,6 +3111,26 @@ "ClusterSecurityGroupId" ] } + }, + "templateUrl": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/fcfd45ab193cce58bc57448fae2176db60020def0d25dcc9649e60e3ed148434.json" + ] + ] } } }, @@ -3571,12 +3571,6 @@ }, "s3Key": "73b60c2cf141bf58c33cfaa33858f5c84103a0232ba7192d696536488f7731c4.zip" }, - "role": { - "Fn::GetAtt": [ - "StartaJobRunCustomResourceProviderframeworkonEventServiceRole1D6E2464", - "Arn" - ] - }, "description": "AWS CDK resource provider framework - onEvent (aws-stepfunctions-tasks-emr-containers-start-job-run-test/Start a Job Run/CustomResourceProvider)", "environment": { "variables": { @@ -3589,6 +3583,12 @@ } }, "handler": "framework.onEvent", + "role": { + "Fn::GetAtt": [ + "StartaJobRunCustomResourceProviderframeworkonEventServiceRole1D6E2464", + "Arn" + ] + }, "runtime": "nodejs18.x", "timeout": 900 } @@ -3733,13 +3733,13 @@ }, "s3Key": "147814a8b95b4dc50c3d78ab1cf1a5a7fe7376d961cb2447e6a1c7184b14bd78.zip" }, + "handler": "index.handler", "role": { "Fn::GetAtt": [ "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2", "Arn" ] }, - "handler": "index.handler", "runtime": "nodejs18.x", "timeout": 120 } @@ -3931,12 +3931,6 @@ }, "s3Key": "3c25783c134c6817b53033bdc57fc404bda6ba93392fcc7d3ca4d92bd072351f.zip" }, - "role": { - "Fn::GetAtt": [ - "SingletonLambda8693BB64968944B69AAFB0CC9EB8757CServiceRoleF99BDB4C", - "Arn" - ] - }, "handler": "index.handler", "layers": [ { @@ -3944,6 +3938,12 @@ } ], "memorySize": 256, + "role": { + "Fn::GetAtt": [ + "SingletonLambda8693BB64968944B69AAFB0CC9EB8757CServiceRoleF99BDB4C", + "Arn" + ] + }, "runtime": "python3.9", "timeout": 30 } @@ -4120,12 +4120,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::StepFunctions::StateMachine", "aws:cdk:cloudformation:props": { - "roleArn": { - "Fn::GetAtt": [ - "StateMachineRoleB840431D", - "Arn" - ] - }, "definitionString": { "Fn::Join": [ "", @@ -4151,6 +4145,12 @@ "\",\"ReleaseLabel\":\"emr-6.2.0-latest\",\"JobDriver\":{\"SparkSubmitJobDriver\":{\"EntryPoint\":\"local:///usr/lib/spark/examples/src/main/python/pi.py\",\"EntryPointArguments\":[\"2\"],\"SparkSubmitParameters\":\"--conf spark.driver.memory=512M --conf spark.kubernetes.driver.request.cores=0.2 --conf spark.kubernetes.executor.request.cores=0.2 --conf spark.sql.shuffle.partitions=60 --conf spark.dynamicAllocation.enabled=false\"}},\"ConfigurationOverrides\":{\"MonitoringConfiguration\":{\"PersistentAppUI\":\"ENABLED\"}}}}},\"TimeoutSeconds\":1000}" ] ] + }, + "roleArn": { + "Fn::GetAtt": [ + "StateMachineRoleB840431D", + "Arn" + ] } } }, diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/README.md b/packages/@aws-cdk/app-staging-synthesizer-alpha/README.md index fb4b33caa9283..87fd5b0c576ce 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/README.md +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/README.md @@ -249,6 +249,22 @@ const app = new App({ }); ``` +### Auto Delete Staging Assets on Deletion + +By default, the staging resources will be cleaned up on stack deletion. That means that the +S3 Bucket and ECR Repositories are set to `RemovalPolicy.DESTROY` and have `autoDeleteObjects` +or `autoDeleteImages` turned on. This creates custom resources under the hood to facilitate +cleanup. To turn this off, specify `autoDeleteStagingAssets: false`. + +```ts +const app = new App({ + defaultStackSynthesizer: AppStagingSynthesizer.defaultResources({ + appId: 'my-app-id', + autoDeleteStagingAssets: false, + }), +}); +``` + ## Using a Custom Staging Stack per Environment If you want to customize some behavior that is not configurable via properties, diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/test/app-staging-synthesizer.test.ts b/packages/@aws-cdk/app-staging-synthesizer-alpha/test/app-staging-synthesizer.test.ts index f71114c2888c6..f1dec13b34a3a 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/test/app-staging-synthesizer.test.ts +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/test/app-staging-synthesizer.test.ts @@ -462,6 +462,36 @@ describe(AppStagingSynthesizer, () => { }); }); + test('auto delete assets can be turned off', () => { + // GIVEN + app = new App({ + defaultStackSynthesizer: AppStagingSynthesizer.defaultResources({ + appId: APP_ID, + autoDeleteStagingAssets: false, + }), + }); + stack = new Stack(app, 'Stack', { + env: { + account: '000000000000', + region: 'us-east-1', + }, + }); + + const assetName = 'abcdef'; + stack.synthesizer.addDockerImageAsset({ + directoryName: '.', + sourceHash: 'abcdef', + assetName, + }); + + // WHEN + const asm = app.synth(); + + // THEN + Template.fromJSON(getStagingResourceStack(asm).template).resourceCountIs('Custom::ECRAutoDeleteImages', 0); + Template.fromJSON(getStagingResourceStack(asm).template).resourceCountIs('Custom::S3AutoDeleteObjects', 0); + }); + describe('environment specifics', () => { test('throws if App includes env-agnostic and specific env stacks', () => { // GIVEN - App with Stack with specific environment diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/README.md b/packages/@aws-cdk/aws-iot-actions-alpha/README.md index 624365ecf3b65..5a117ef5f851e 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/README.md +++ b/packages/@aws-cdk/aws-iot-actions-alpha/README.md @@ -33,6 +33,7 @@ Currently supported are: - Publish messages on SNS topics - Write messages into columns of DynamoDB - Put messages IoT Events input +- Send messages to HTTPS endpoints ## Republish a message to another MQTT topic @@ -346,3 +347,28 @@ const topicRule = new iot.TopicRule(this, 'TopicRule', { ], }); ``` + +## Send Messages to HTTPS Endpoints + +The code snippet below creates an AWS IoT Rule that sends messages +to an HTTPS endpoint when it is triggered: + +```ts +const topicRule = new iot.TopicRule(this, 'TopicRule', { + sql: iot.IotSql.fromStringAsVer20160323( + "SELECT topic(2) as device_id, year, month, day FROM 'device/+/data'", + ), + }); + + topicRule.addAction( + new actions.HttpsAction('https://example.com/endpoint', { + confirmationUrl: 'https://example.com', + headers: [ + { key: 'key0', value: 'value0' }, + { key: 'key1', value: 'value1' }, + ], + auth: { serviceName: 'serviceName', signingRegion: 'us-east-1' }, + }), + ); +} +``` diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/lib/https-action.ts b/packages/@aws-cdk/aws-iot-actions-alpha/lib/https-action.ts new file mode 100644 index 0000000000000..a08c3bf9d2bac --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/lib/https-action.ts @@ -0,0 +1,96 @@ +import * as iot from '@aws-cdk/aws-iot-alpha'; +import * as iam from 'aws-cdk-lib/aws-iam'; +import { CommonActionProps } from './common-action-props'; +import { singletonActionRole } from './private/role'; + +export interface HttpActionSigV4Auth { + /** + * The service name. + */ + readonly serviceName: string; + /** + * The signing region. + */ + readonly signingRegion: string; +} + +export interface HttpActionHeader { + /** + * The HTTP header key. + */ + readonly key: string; + /** + * The HTTP header value. Substitution templates are supported. + */ + readonly value: string; +} + +/** + * Configuration properties of an HTTPS action. + * + * @see https://docs.aws.amazon.com/iot/latest/developerguide/https-rule-action.html + */ +export interface HttpsActionProps extends CommonActionProps { + /** + * If specified, AWS IoT uses the confirmation URL to create a matching topic rule destination. + */ + readonly confirmationUrl?: string; + + /** + * The headers to include in the HTTPS request to the endpoint. + */ + readonly headers?: Array; + + /** + * Use Sigv4 authorization. + */ + readonly auth?: HttpActionSigV4Auth; +} + +/** + * The action to send data from an MQTT message to a web application or service. + */ +export class HttpsAction implements iot.IAction { + private readonly role?: iam.IRole; + private readonly url: string; + private readonly confirmationUrl?: string; + private readonly headers?: Array; + private readonly auth?: HttpActionSigV4Auth; + + /** + * @param url The url to which to send post request. + * @param props Optional properties to not use default. + */ + constructor( url: string, props: HttpsActionProps={}) { + this.url = url; + this.confirmationUrl = props.confirmationUrl; + this.headers = props.headers; + this.role = props.role; + this.auth = props.auth; + } + + /** + * @internal + */ + public _bind(topicRule: iot.ITopicRule): iot.ActionConfig { + const role = this.role ?? singletonActionRole(topicRule); + const sigV4 = this.auth ? { + sigv4: { + roleArn: role.roleArn, + serviceName: this.auth.serviceName, + signingRegion: this.auth.signingRegion, + }, + } : this.auth; + + return { + configuration: { + http: { + url: this.url, + confirmationUrl: this.confirmationUrl, + headers: this.headers, + auth: sigV4, + }, + }, + }; + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/lib/index.ts b/packages/@aws-cdk/aws-iot-actions-alpha/lib/index.ts index 1a983fd548fc2..b32ed460ce151 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/lib/index.ts +++ b/packages/@aws-cdk/aws-iot-actions-alpha/lib/index.ts @@ -11,4 +11,6 @@ export * from './lambda-function-action'; export * from './s3-put-object-action'; export * from './sqs-queue-action'; export * from './sns-topic-action'; +export * from './https-action'; export * from './step-functions-state-machine-action'; + diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/https-action.test.ts b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/https-action.test.ts new file mode 100644 index 0000000000000..eafd986ce54b1 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/https-action.test.ts @@ -0,0 +1,161 @@ +import { Template, Match } from 'aws-cdk-lib/assertions'; +import * as iot from '@aws-cdk/aws-iot-alpha'; +import * as cdk from 'aws-cdk-lib'; +import * as actions from '../../lib'; + +test('Default HTTPS action', () => { + // GIVEN + const stack = new cdk.Stack(); + const topicRule = new iot.TopicRule(stack, 'MyTopicRule', { + sql: iot.IotSql.fromStringAsVer20160323( + "SELECT topic(2) as device_id FROM 'device/+/data'", + ), + }); + const expectedUrl = 'https://example.com'; + + // WHEN + topicRule.addAction(new actions.HttpsAction(expectedUrl)); + + // THEN + Template.fromStack(stack).hasResourceProperties('AWS::IoT::TopicRule', { + TopicRulePayload: { + Actions: [ + { + Http: { + Url: expectedUrl, + }, + }, + ], + }, + }); + + Template.fromStack(stack).hasResourceProperties('AWS::IAM::Role', { + AssumeRolePolicyDocument: { + Statement: [ + { + Action: 'sts:AssumeRole', + Effect: 'Allow', + Principal: { + Service: 'iot.amazonaws.com', + }, + }, + ], + Version: '2012-10-17', + }, + }); +}); + +test('can set confirmation url', () => { + // GIVEN + const stack = new cdk.Stack(); + const topicRule = new iot.TopicRule(stack, 'MyTopicRule', { + sql: iot.IotSql.fromStringAsVer20160323( + "SELECT topic(2) as device_id FROM 'device/+/data'", + ), + }); + const expectedUrl = 'https://example.com'; + const expectedConfirmationUrl = 'https://example.com/confirm'; + + // WHEN + topicRule.addAction( + new actions.HttpsAction(expectedUrl, { + confirmationUrl: expectedConfirmationUrl, + }), + ); + + //THEN + Template.fromStack(stack).hasResourceProperties('AWS::IoT::TopicRule', { + TopicRulePayload: { + Actions: [ + { + Http: { + Url: expectedUrl, + ConfirmationUrl: expectedConfirmationUrl, + }, + }, + ], + }, + }); +}); + +test('can set http headers', () => { + // GIVEN + const stack = new cdk.Stack(); + const topicRule = new iot.TopicRule(stack, 'MyTopicRule', { + sql: iot.IotSql.fromStringAsVer20160323( + "SELECT topic(2) as device_id FROM 'device/+/data'", + ), + }); + const expectedUrl = 'https://example.com'; + const headers = [ + { key: 'key0', value: 'value0' }, + { key: 'key1', value: 'value1' }, + ]; + + // WHEN + topicRule.addAction( + new actions.HttpsAction(expectedUrl, { headers: headers }), + ); + + //THEN + Template.fromStack(stack).hasResourceProperties('AWS::IoT::TopicRule', { + TopicRulePayload: { + Actions: [ + { + Http: { + Url: expectedUrl, + Headers: [ + { Key: 'key0', Value: 'value0' }, + { Key: 'key1', Value: 'value1' }, + ], + }, + }, + ], + }, + }); +}); + +test('can set http auth', () => { + // GIVEN + const stack = new cdk.Stack(); + const topicRule = new iot.TopicRule(stack, 'MyTopicRule', { + sql: iot.IotSql.fromStringAsVer20160323( + "SELECT topic(2) as device_id FROM 'device/+/data'", + ), + }); + const expectedUrl = 'https://example.com'; + const expectedAuth = { + serviceName: 'serviceName', + signingRegion: 'signingName', + }; + + // WHEN + topicRule.addAction( + new actions.HttpsAction(expectedUrl, { auth: expectedAuth }), + ); + + //THEN + Template.fromStack(stack).hasResourceProperties('AWS::IoT::TopicRule', { + TopicRulePayload: { + Actions: [ + { + Http: { + Url: expectedUrl, + Auth: { + Sigv4: { + RoleArn: { + 'Fn::GetAtt': [ + Match.stringLikeRegexp('MyTopicRuleTopicRuleActionRole'), + 'Arn', + ], + }, + ServiceName: expectedAuth.serviceName, + SigningRegion: expectedAuth.signingRegion, + }, + }, + }, + }, + ], + }, + }); +}); diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionDefaultTestDeployAssert019947CA.assets.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionDefaultTestDeployAssert019947CA.assets.json new file mode 100644 index 0000000000000..04e4714435a66 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionDefaultTestDeployAssert019947CA.assets.json @@ -0,0 +1,19 @@ +{ + "version": "31.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "IoTHttpsActionDefaultTestDeployAssert019947CA.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": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionDefaultTestDeployAssert019947CA.template.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionDefaultTestDeployAssert019947CA.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionDefaultTestDeployAssert019947CA.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "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." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionTestStack.assets.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionTestStack.assets.json new file mode 100644 index 0000000000000..80820fc0ff5e0 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionTestStack.assets.json @@ -0,0 +1,19 @@ +{ + "version": "31.0.0", + "files": { + "ceb4c33f2a2723481892f941c88433106a7019ed281d49385fdbaf9f0b09a343": { + "source": { + "path": "IoTHttpsActionTestStack.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "ceb4c33f2a2723481892f941c88433106a7019ed281d49385fdbaf9f0b09a343.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionTestStack.template.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionTestStack.template.json new file mode 100644 index 0000000000000..d55dcc392a303 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/IoTHttpsActionTestStack.template.json @@ -0,0 +1,94 @@ +{ + "Resources": { + "TopicRule40A4EA44": { + "Type": "AWS::IoT::TopicRule", + "Properties": { + "TopicRulePayload": { + "Actions": [ + { + "Http": { + "Auth": { + "Sigv4": { + "RoleArn": { + "Fn::GetAtt": [ + "TopicRuleTopicRuleActionRole246C4F77", + "Arn" + ] + }, + "ServiceName": "serviceName", + "SigningRegion": "us-east-1" + } + }, + "ConfirmationUrl": "https://example.com", + "Headers": [ + { + "Key": "key0", + "Value": "value0" + }, + { + "Key": "key1", + "Value": "value1" + } + ], + "Url": "https://example.com/endpoint" + } + } + ], + "AwsIotSqlVersion": "2016-03-23", + "Sql": "SELECT topic(2) as device_id, year, month, day FROM 'device/+/data'" + } + } + }, + "TopicRuleTopicRuleActionRole246C4F77": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "iot.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + } + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "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." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/cdk.out b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/cdk.out new file mode 100644 index 0000000000000..7925065efbcc4 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"31.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/integ.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/integ.json new file mode 100644 index 0000000000000..9ebcd3a75036a --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "31.0.0", + "testCases": { + "IoTHttpsAction/DefaultTest": { + "stacks": [ + "IoTHttpsActionTestStack" + ], + "assertionStack": "IoTHttpsAction/DefaultTest/DeployAssert", + "assertionStackName": "IoTHttpsActionDefaultTestDeployAssert019947CA" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/manifest.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/manifest.json new file mode 100644 index 0000000000000..4caf31016c1a7 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/manifest.json @@ -0,0 +1,117 @@ +{ + "version": "31.0.0", + "artifacts": { + "IoTHttpsActionTestStack.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "IoTHttpsActionTestStack.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "IoTHttpsActionTestStack": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "IoTHttpsActionTestStack.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}/ceb4c33f2a2723481892f941c88433106a7019ed281d49385fdbaf9f0b09a343.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "IoTHttpsActionTestStack.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": [ + "IoTHttpsActionTestStack.assets" + ], + "metadata": { + "/IoTHttpsActionTestStack/TopicRule/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "TopicRule40A4EA44" + } + ], + "/IoTHttpsActionTestStack/TopicRule/TopicRuleActionRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "TopicRuleTopicRuleActionRole246C4F77" + } + ], + "/IoTHttpsActionTestStack/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/IoTHttpsActionTestStack/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "IoTHttpsActionTestStack" + }, + "IoTHttpsActionDefaultTestDeployAssert019947CA.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "IoTHttpsActionDefaultTestDeployAssert019947CA.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "IoTHttpsActionDefaultTestDeployAssert019947CA": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "IoTHttpsActionDefaultTestDeployAssert019947CA.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": [ + "IoTHttpsActionDefaultTestDeployAssert019947CA.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": [ + "IoTHttpsActionDefaultTestDeployAssert019947CA.assets" + ], + "metadata": { + "/IoTHttpsAction/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/IoTHttpsAction/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "IoTHttpsAction/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/tree.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/tree.json new file mode 100644 index 0000000000000..ba46340ffa5b0 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.js.snapshot/tree.json @@ -0,0 +1,201 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "IoTHttpsActionTestStack": { + "id": "IoTHttpsActionTestStack", + "path": "IoTHttpsActionTestStack", + "children": { + "TopicRule": { + "id": "TopicRule", + "path": "IoTHttpsActionTestStack/TopicRule", + "children": { + "Resource": { + "id": "Resource", + "path": "IoTHttpsActionTestStack/TopicRule/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IoT::TopicRule", + "aws:cdk:cloudformation:props": { + "topicRulePayload": { + "actions": [ + { + "http": { + "url": "https://example.com/endpoint", + "confirmationUrl": "https://example.com", + "headers": [ + { + "key": "key0", + "value": "value0" + }, + { + "key": "key1", + "value": "value1" + } + ], + "auth": { + "sigv4": { + "roleArn": { + "Fn::GetAtt": [ + "TopicRuleTopicRuleActionRole246C4F77", + "Arn" + ] + }, + "serviceName": "serviceName", + "signingRegion": "us-east-1" + } + } + } + } + ], + "awsIotSqlVersion": "2016-03-23", + "sql": "SELECT topic(2) as device_id, year, month, day FROM 'device/+/data'" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iot.CfnTopicRule", + "version": "0.0.0" + } + }, + "TopicRuleActionRole": { + "id": "TopicRuleActionRole", + "path": "IoTHttpsActionTestStack/TopicRule/TopicRuleActionRole", + "children": { + "ImportTopicRuleActionRole": { + "id": "ImportTopicRuleActionRole", + "path": "IoTHttpsActionTestStack/TopicRule/TopicRuleActionRole/ImportTopicRuleActionRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "IoTHttpsActionTestStack/TopicRule/TopicRuleActionRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "iot.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iot-alpha.TopicRule", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "IoTHttpsActionTestStack/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "IoTHttpsActionTestStack/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "IoTHttpsAction": { + "id": "IoTHttpsAction", + "path": "IoTHttpsAction", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "IoTHttpsAction/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "IoTHttpsAction/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.18" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "IoTHttpsAction/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "IoTHttpsAction/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "IoTHttpsAction/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.2.18" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.ts b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.ts new file mode 100644 index 0000000000000..0d89fa1ab0521 --- /dev/null +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/https/integ.https-action.ts @@ -0,0 +1,36 @@ +import * as iot from '@aws-cdk/aws-iot-alpha'; +import * as cdk from 'aws-cdk-lib'; +import * as actions from '../../lib'; +import { IntegTest } from '@aws-cdk/integ-tests-alpha'; + +const app = new cdk.App(); + +class TestStack extends cdk.Stack { + constructor(scope: cdk.App, id: string, props?: cdk.StackProps) { + super(scope, id, props); + + const topicRule = new iot.TopicRule(this, 'TopicRule', { + sql: iot.IotSql.fromStringAsVer20160323( + "SELECT topic(2) as device_id, year, month, day FROM 'device/+/data'", + ), + }); + + topicRule.addAction( + new actions.HttpsAction('https://example.com/endpoint', { + confirmationUrl: 'https://example.com', + headers: [ + { key: 'key0', value: 'value0' }, + { key: 'key1', value: 'value1' }, + ], + auth: { serviceName: 'serviceName', signingRegion: 'us-east-1' }, + }), + ); + } +} + +const stack = new TestStack(app, 'IoTHttpsActionTestStack'); +new IntegTest(app, 'IoTHttpsAction', { + testCases: [stack], +}); + +app.synth(); diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts index cf22688d1e890..8d0a57394dd63 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts +++ b/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts @@ -115,13 +115,6 @@ export interface DatabaseClusterProps { */ readonly engineVersion?: EngineVersion; - /** - * The port the Neptune cluster will listen on - * - * @default - The default engine port - */ - readonly port?: number; - /** * How many days to retain the backup * @@ -578,7 +571,6 @@ export class DatabaseCluster extends DatabaseClusterBase implements IDatabaseClu engineVersion: props.engineVersion?.version, dbClusterIdentifier: props.dbClusterName, dbSubnetGroupName: this.subnetGroup.subnetGroupName, - port: props.port, vpcSecurityGroupIds: securityGroups.map(sg => sg.securityGroupId), dbClusterParameterGroupName: props.clusterParameterGroup?.clusterParameterGroupName, deletionProtection: deletionProtection, diff --git a/packages/@aws-cdk/aws-synthetics-alpha/test/canary.test.ts b/packages/@aws-cdk/aws-synthetics-alpha/test/canary.test.ts index feb1f7bda4d14..90cd60d25d5b9 100644 --- a/packages/@aws-cdk/aws-synthetics-alpha/test/canary.test.ts +++ b/packages/@aws-cdk/aws-synthetics-alpha/test/canary.test.ts @@ -1,3 +1,4 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Match, Template } from 'aws-cdk-lib/assertions'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as iam from 'aws-cdk-lib/aws-iam'; @@ -5,7 +6,7 @@ import * as s3 from 'aws-cdk-lib/aws-s3'; import { Duration, Lazy, Stack } from 'aws-cdk-lib'; import * as synthetics from '../lib'; -test('Basic canary properties work', () => { +testDeprecated('Basic canary properties work', () => { // GIVEN const stack = new Stack(); @@ -34,7 +35,7 @@ test('Basic canary properties work', () => { }); }); -test('Can set `DeleteLambdaResourceOnCanaryDeletion`', () => { +testDeprecated('Can set `DeleteLambdaResourceOnCanaryDeletion`', () => { // GIVEN const stack = new Stack(); @@ -54,7 +55,7 @@ test('Can set `DeleteLambdaResourceOnCanaryDeletion`', () => { }); }); -test('Canary can have generated name', () => { +testDeprecated('Canary can have generated name', () => { // GIVEN const stack = new Stack(); @@ -73,7 +74,7 @@ test('Canary can have generated name', () => { }); }); -test('Name validation does not fail when using Tokens', () => { +testDeprecated('Name validation does not fail when using Tokens', () => { // GIVEN const stack = new Stack(); @@ -91,7 +92,7 @@ test('Name validation does not fail when using Tokens', () => { Template.fromStack(stack).resourceCountIs('AWS::Synthetics::Canary', 1); }); -test('Throws when name is specified incorrectly', () => { +testDeprecated('Throws when name is specified incorrectly', () => { // GIVEN const stack = new Stack(); @@ -107,7 +108,7 @@ test('Throws when name is specified incorrectly', () => { .toThrowError('Canary name must be lowercase, numbers, hyphens, or underscores (got "My Canary")'); }); -test('Throws when name has more than 21 characters', () => { +testDeprecated('Throws when name has more than 21 characters', () => { // GIVEN const stack = new Stack(); @@ -123,7 +124,7 @@ test('Throws when name has more than 21 characters', () => { .toThrowError(`Canary name is too large, must be between 1 and 21 characters, but is 22 (got "${'a'.repeat(22)}")`); }); -test('An existing role can be specified instead of auto-created', () => { +testDeprecated('An existing role can be specified instead of auto-created', () => { // GIVEN const stack = new Stack(); @@ -149,7 +150,7 @@ test('An existing role can be specified instead of auto-created', () => { }); }); -test('An auto-generated bucket can have lifecycle rules', () => { +testDeprecated('An auto-generated bucket can have lifecycle rules', () => { // GIVEN const stack = new Stack(); const lifecycleRules = [{ @@ -178,7 +179,7 @@ test('An auto-generated bucket can have lifecycle rules', () => { }); }); -test('An existing bucket and prefix can be specified instead of auto-created', () => { +testDeprecated('An existing bucket and prefix can be specified instead of auto-created', () => { // GIVEN const stack = new Stack(); const bucket = new s3.Bucket(stack, 'mytestbucket'); @@ -200,7 +201,7 @@ test('An existing bucket and prefix can be specified instead of auto-created', ( }); }); -test('Runtime can be specified', () => { +testDeprecated('Runtime can be specified', () => { // GIVEN const stack = new Stack(); @@ -219,7 +220,7 @@ test('Runtime can be specified', () => { }); }); -test('Python runtime can be specified', () => { +testDeprecated('Python runtime can be specified', () => { // GIVEN const stack = new Stack(); @@ -238,7 +239,7 @@ test('Python runtime can be specified', () => { }); }); -test('environment variables can be specified', () => { +testDeprecated('environment variables can be specified', () => { // GIVEN const stack = new Stack(); const environmentVariables = { @@ -264,7 +265,7 @@ test('environment variables can be specified', () => { }); }); -test('environment variables are skipped if not provided', () => { +testDeprecated('environment variables are skipped if not provided', () => { // GIVEN const stack = new Stack(); @@ -283,7 +284,7 @@ test('environment variables are skipped if not provided', () => { }); }); -test('Runtime can be customized', () => { +testDeprecated('Runtime can be customized', () => { // GIVEN const stack = new Stack(); @@ -302,7 +303,7 @@ test('Runtime can be customized', () => { }); }); -test('Schedule can be set with Rate', () => { +testDeprecated('Schedule can be set with Rate', () => { // GIVEN const stack = new Stack(); @@ -322,7 +323,7 @@ test('Schedule can be set with Rate', () => { }); }); -test('Schedule can be set to 1 minute', () => { +testDeprecated('Schedule can be set to 1 minute', () => { // GIVEN const stack = new Stack(); @@ -342,7 +343,7 @@ test('Schedule can be set to 1 minute', () => { }); }); -test('Schedule can be set with Cron', () => { +testDeprecated('Schedule can be set with Cron', () => { // GIVEN const stack = new Stack(); @@ -362,7 +363,7 @@ test('Schedule can be set with Cron', () => { }); }); -test('Schedule can be set with Expression', () => { +testDeprecated('Schedule can be set with Expression', () => { // GIVEN const stack = new Stack(); @@ -382,7 +383,7 @@ test('Schedule can be set with Expression', () => { }); }); -test('Schedule can be set to run once', () => { +testDeprecated('Schedule can be set to run once', () => { // GIVEN const stack = new Stack(); @@ -434,7 +435,7 @@ test('Throws when rate above is not a whole number of minutes', () => { .toThrowError('\'59 seconds\' cannot be converted into a whole number of minutes.'); }); -test('Can share artifacts bucket between canaries', () => { +testDeprecated('Can share artifacts bucket between canaries', () => { // GIVEN const stack = new Stack(); @@ -462,7 +463,7 @@ test('Can share artifacts bucket between canaries', () => { expect(canary1.artifactsBucket).toEqual(canary2.artifactsBucket); }); -test('can specify custom test', () => { +testDeprecated('can specify custom test', () => { // GIVEN const stack = new Stack(); @@ -491,7 +492,7 @@ test('can specify custom test', () => { }); describe('canary in a vpc', () => { - test('can specify vpc', () => { + testDeprecated('can specify vpc', () => { // GIVEN const stack = new Stack(); const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2 }); @@ -526,7 +527,7 @@ describe('canary in a vpc', () => { }); }); - test('default security group and subnets', () => { + testDeprecated('default security group and subnets', () => { // GIVEN const stack = new Stack(); const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2 }); @@ -563,7 +564,7 @@ describe('canary in a vpc', () => { }); }); - test('provided security group', () => { + testDeprecated('provided security group', () => { // GIVEN const stack = new Stack(); const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2 }); @@ -608,7 +609,7 @@ describe('canary in a vpc', () => { }); }); -test('Role policy generated as expected', () => { +testDeprecated('Role policy generated as expected', () => { // GIVEN const stack = new Stack(); diff --git a/packages/@aws-cdk/aws-synthetics-alpha/test/code.test.ts b/packages/@aws-cdk/aws-synthetics-alpha/test/code.test.ts index 396d245d2bd98..fe974a38fa0bf 100644 --- a/packages/@aws-cdk/aws-synthetics-alpha/test/code.test.ts +++ b/packages/@aws-cdk/aws-synthetics-alpha/test/code.test.ts @@ -1,5 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { Template } from 'aws-cdk-lib/assertions'; import * as s3 from 'aws-cdk-lib/aws-s3'; import { App, Stack, DockerImage } from 'aws-cdk-lib'; @@ -41,7 +42,7 @@ describe(synthetics.Code.fromInline, () => { }); describe(synthetics.Code.fromAsset, () => { - test('fromAsset works for node runtimes', () => { + testDeprecated('fromAsset works for node runtimes', () => { // GIVEN const stack = new Stack(new App(), 'canaries'); @@ -65,7 +66,7 @@ describe(synthetics.Code.fromAsset, () => { }); }); - test('fromAsset works for python runtimes', () => { + testDeprecated('fromAsset works for python runtimes', () => { // GIVEN const stack = new Stack(new App(), 'canaries'); @@ -89,7 +90,7 @@ describe(synthetics.Code.fromAsset, () => { }); }); - test('only one Asset object gets created even if multiple canaries use the same AssetCode', () => { + testDeprecated('only one Asset object gets created even if multiple canaries use the same AssetCode', () => { // GIVEN const app = new App({ context: { diff --git a/packages/@aws-cdk/aws-synthetics-alpha/test/metric.test.ts b/packages/@aws-cdk/aws-synthetics-alpha/test/metric.test.ts index 550d28cdbc8b9..60984948e431b 100644 --- a/packages/@aws-cdk/aws-synthetics-alpha/test/metric.test.ts +++ b/packages/@aws-cdk/aws-synthetics-alpha/test/metric.test.ts @@ -1,7 +1,8 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { App, Stack } from 'aws-cdk-lib'; import * as synthetics from '../lib'; -test('.metricXxx() methods can be used to obtain Metrics for the canary', () => { +testDeprecated('.metricXxx() methods can be used to obtain Metrics for the canary', () => { // GIVEN const stack = new Stack(new App(), 'canaries'); @@ -41,7 +42,7 @@ test('.metricXxx() methods can be used to obtain Metrics for the canary', () => })); }); -test('Metric can specify statistic', () => { +testDeprecated('Metric can specify statistic', () => { // GIVEN const stack = new Stack(new App(), 'canaries'); diff --git a/packages/@aws-cdk/cfnspec/CHANGELOG.md b/packages/@aws-cdk/cfnspec/CHANGELOG.md index cec25cf376317..2f9f6c2a5c93f 100644 --- a/packages/@aws-cdk/cfnspec/CHANGELOG.md +++ b/packages/@aws-cdk/cfnspec/CHANGELOG.md @@ -1,3 +1,39 @@ +# CloudFormation Resource Specification v130.1.0 + +## New Resource Types + + +## Attribute Changes + + +## Property Changes + +* AWS::HealthLake::FHIRDatastore IdentityProviderConfiguration (__added__) +* AWS::S3Outposts::Endpoint FailedReason (__added__) + +## Property Type Changes + +* AWS::HealthLake::FHIRDatastore.IdentityProviderConfiguration (__added__) +* AWS::S3Outposts::Endpoint.FailedReason (__added__) +* AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties DisableSSO (__added__) +* AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation AllowedJoinOperators (__added__) +* AWS::CleanRooms::ConfiguredTable.AnalysisRuleList AllowedJoinOperators (__added__) + +# CloudFormation Resource Specification (us-west-2) v130.1.0 + +## New Resource Types + + +## Attribute Changes + + +## Property Changes + + +## Property Type Changes + + + # CloudFormation Resource Specification v130.0.0 ## New Resource Types diff --git a/packages/@aws-cdk/cfnspec/cfn.version b/packages/@aws-cdk/cfnspec/cfn.version index 08b2c2ab774ed..2073a8a20a341 100644 --- a/packages/@aws-cdk/cfnspec/cfn.version +++ b/packages/@aws-cdk/cfnspec/cfn.version @@ -1 +1 @@ -130.0.0 +130.1.0 diff --git a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json index aa2a37e3403c5..c00dbe865548b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json +++ b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json @@ -2421,6 +2421,7 @@ "ApplicationHostUrl": "The location of the SAPOData resource.", "ApplicationServicePath": "The application path to catalog service.", "ClientNumber": "The client number for the client creating the connection.", + "DisableSSO": "", "LogonLanguage": "The logon language of SAPOData instance.", "OAuthProperties": "The SAPOData OAuth properties required for OAuth type authentication.", "PortNumber": "The port number of the SAPOData instance.", @@ -4558,7 +4559,7 @@ "DisplayName": "The display name of the app block.", "Name": "The name of the app block.\n\n*Pattern* : `^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,100}$`", "PackagingType": "The packaging type of the app block.", - "PostSetupScriptDetails": "The post setup script details of the app block.", + "PostSetupScriptDetails": "The post setup script details of the app block.\n\nThis only applies to app blocks with PackagingType `APPSTREAM2` .", "SetupScriptDetails": "The setup script details of the app block.", "SourceS3Location": "The source S3 location of the app block.", "Tags": "The tags of the app block." @@ -4584,22 +4585,22 @@ }, "AWS::AppStream::AppBlockBuilder": { "attributes": { - "Arn": "The ARN of the app block builder.", - "CreatedTime": "The time when the app block builder was created.", - "Ref": "When you pass the logical ID of this resource to the intrinsic `Ref` function, `Ref` returns the `Name` of the app block builder, such as `abcdefAppBlockBuilder` .\n\nFor more information about using the `Ref` function, see [Ref](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html) ." + "Arn": "", + "CreatedTime": "", + "Ref": "" }, "description": "Creates an app block builder.", "properties": { - "AccessEndpoints": "The access endpoints of the app block builder.", - "AppBlockArns": "The ARN of the app block.\n\n*Maximum* : `1`", + "AccessEndpoints": "", + "AppBlockArns": "", "Description": "The description of the app block builder.", "DisplayName": "The display name of the app block builder.", "EnableDefaultInternetAccess": "Indicates whether default internet access is enabled for the app block builder.", "IamRoleArn": "The ARN of the IAM role that is applied to the app block builder.", "InstanceType": "The instance type of the app block builder.", "Name": "The name of the app block builder.", - "Platform": "The platform of the app block builder.\n\n*Allowed values* : `WINDOWS_SERVER_2019`", - "Tags": "The tags of the app block builder.", + "Platform": "The platform of the app block builder.\n\n`WINDOWS_SERVER_2019` is the only valid value.", + "Tags": "", "VpcConfig": "The VPC configuration for the app block builder." } }, @@ -6689,7 +6690,7 @@ "SecurityGroupIds": "The Amazon EC2 security groups that are associated with instances launched in the compute environment. This parameter is required for Fargate compute resources, where it can contain up to 5 security groups. For Fargate compute resources, providing an empty list is handled as if this parameter wasn't specified and no change is made. For EC2 compute resources, providing an empty list removes the security groups from the compute resource.\n\nWhen updating a compute environment, changing the EC2 security groups requires an infrastructure update of the compute environment. For more information, see [Updating compute environments](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html) in the *AWS Batch User Guide* .", "SpotIamFleetRole": "The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a `SPOT` compute environment. This role is required if the allocation strategy set to `BEST_FIT` or if the allocation strategy isn't specified. For more information, see [Amazon EC2 spot fleet role](https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html) in the *AWS Batch User Guide* .\n\n> This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it. > To tag your Spot Instances on creation, the Spot Fleet IAM role specified here must use the newer *AmazonEC2SpotFleetTaggingRole* managed policy. The previously recommended *AmazonEC2SpotFleetRole* managed policy doesn't have the required permissions to tag Spot Instances. For more information, see [Spot instances not tagged on creation](https://docs.aws.amazon.com/batch/latest/userguide/troubleshooting.html#spot-instance-no-tag) in the *AWS Batch User Guide* .", "Subnets": "The VPC subnets where the compute resources are launched. Fargate compute resources can contain up to 16 subnets. For Fargate compute resources, providing an empty list will be handled as if this parameter wasn't specified and no change is made. For EC2 compute resources, providing an empty list removes the VPC subnets from the compute resource. For more information, see [VPCs and subnets](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html) in the *Amazon VPC User Guide* .\n\nWhen updating a compute environment, changing the VPC subnets requires an infrastructure update of the compute environment. For more information, see [Updating compute environments](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html) in the *AWS Batch User Guide* .\n\n> AWS Batch on Amazon EC2 and AWS Batch on Amazon EKS support Local Zones. For more information, see [Local Zones](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-local-zones) in the *Amazon EC2 User Guide for Linux Instances* , [Amazon EKS and AWS Local Zones](https://docs.aws.amazon.com/eks/latest/userguide/local-zones.html) in the *Amazon EKS User Guide* and [Amazon ECS clusters in Local Zones, Wavelength Zones, and AWS Outposts](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/cluster-regions-zones.html#clusters-local-zones) in the *Amazon ECS Developer Guide* .\n> \n> AWS Batch on Fargate doesn't currently support Local Zones.", - "Tags": "Key-value pair tags to be applied to EC2 resources that are launched in the compute environment. For AWS Batch , these take the form of `\"String1\": \"String2\"` , where `String1` is the tag key and `String2` is the tag value-for example, `{ \"Name\": \"Batch Instance - C4OnDemand\" }` . This is helpful for recognizing your AWS Batch instances in the Amazon EC2 console. These tags aren't seen when using the AWS Batch `ListTagsForResource` API operation.\n\nWhen updating a compute environment, changing this setting requires an infrastructure update of the compute environment. For more information, see [Updating compute environments](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html) in the *AWS Batch User Guide* .\n\n> This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it.", + "Tags": "Key-value pair tags to be applied to EC2 resources that are launched in the compute environment. For AWS Batch , these take the form of `\"String1\": \"String2\"` , where `String1` is the tag key and `String2` is the tag value-for example, `{ \"Name\": \"Batch Instance - C4OnDemand\" }` . This is helpful for recognizing your Batch instances in the Amazon EC2 console. These tags aren't seen when using the AWS Batch `ListTagsForResource` API operation.\n\nWhen updating a compute environment, changing this setting requires an infrastructure update of the compute environment. For more information, see [Updating compute environments](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html) in the *AWS Batch User Guide* .\n\n> This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it.", "Type": "The type of compute environment: `EC2` , `SPOT` , `FARGATE` , or `FARGATE_SPOT` . For more information, see [Compute environments](https://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html) in the *AWS Batch User Guide* .\n\nIf you choose `SPOT` , you must also specify an Amazon EC2 Spot Fleet role with the `spotIamFleetRole` parameter. For more information, see [Amazon EC2 spot fleet role](https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html) in the *AWS Batch User Guide* .\n\nWhen updating compute environment, changing the type of a compute environment requires an infrastructure update of the compute environment. For more information, see [Updating compute environments](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html) in the *AWS Batch User Guide* .\n\nWhen updating the type of a compute environment, changing between `EC2` and `SPOT` or between `FARGATE` and `FARGATE_SPOT` will initiate an infrastructure update, but if you switch between `EC2` and `FARGATE` , AWS CloudFormation will create a new compute environment.", "UpdateToLatestImageVersion": "Specifies whether the AMI ID is updated to the latest one that's supported by AWS Batch when the compute environment has an infrastructure update. The default value is `false` .\n\n> An AMI ID can either be specified in the `imageId` or `imageIdOverride` parameters or be determined by the launch template that's specified in the `launchTemplate` parameter. If an AMI ID is specified any of these ways, this parameter is ignored. For more information about to update AMI IDs during an infrastructure update, see [Updating the AMI ID](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html#updating-compute-environments-ami) in the *AWS Batch User Guide* . \n\nWhen updating a compute environment, changing this setting requires an infrastructure update of the compute environment. For more information, see [Updating compute environments](https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html) in the *AWS Batch User Guide* ." } @@ -7755,6 +7756,7 @@ "description": "Enables query structure and specified queries that produce aggregate statistics.", "properties": { "AggregateColumns": "The columns that query runners are allowed to use in aggregation queries.", + "AllowedJoinOperators": "Which logical operators (if any) are to be used in an INNER JOIN match condition. Default is `AND` .", "DimensionColumns": "The columns that query runners are allowed to select, group by, or filter by.", "JoinColumns": "Columns in configured table that can be used in join statements and/or as aggregate columns. They can never be outputted directly.", "JoinRequired": "Control that requires member who runs query to do a join with their configured table and/or other configured table in query.", @@ -7766,6 +7768,7 @@ "attributes": {}, "description": "A type of analysis rule that enables row-level analysis.", "properties": { + "AllowedJoinOperators": "Which logical operators (if any) are to be used in an INNER JOIN match condition. Default is `AND` .", "JoinColumns": "Columns that can be used to join a configured table with the table of the member who can query and other members' configured tables.", "ListColumns": "Columns that can be listed in the output." } @@ -11527,14 +11530,14 @@ }, "AWS::Connect::HoursOfOperation": { "attributes": { - "HoursOfOperationArn": "The Amazon Resource Name (ARN) for the hours of operation.", + "HoursOfOperationArn": "The Amazon Resource Name (ARN) of the hours of operation.", "Ref": "`Ref` returns the hours of operation. For example:\n\n`{ \"Ref\": \"myHoursOfOperation\" }`" }, "description": "Specifies hours of operation.", "properties": { "Config": "Configuration information for the hours of operation.", "Description": "The description for the hours of operation.", - "InstanceArn": "The Amazon Resource Name (ARN) for the instance.", + "InstanceArn": "The Amazon Resource Name (ARN) of the instance.", "Name": "The name for the hours of operation.", "Tags": "The tags used to organize, track, or control access for this resource. For example, { \"tags\": {\"key1\":\"value1\", \"key2\":\"value2\"} }.", "TimeZone": "The time zone for the hours of operation." @@ -11667,7 +11670,7 @@ "Description": "The description of the phone number.", "Prefix": "The prefix of the phone number. If provided, it must contain `+` as part of the country code.\n\n*Pattern* : `^\\\\+[0-9]{1,15}`", "Tags": "The tags used to organize, track, or control access for this resource. For example, { \"tags\": {\"key1\":\"value1\", \"key2\":\"value2\"} }.", - "TargetArn": "The Amazon Resource Name (ARN) for Amazon Connect instances or traffic distribution group that phone numbers are claimed to.", + "TargetArn": "The Amazon Resource Name (ARN) of Amazon Connect instances or traffic distribution group that phone numbers are claimed to.", "Type": "The type of phone number." } }, @@ -11786,7 +11789,7 @@ "description": "The name of the event source.", "properties": { "EventSourceName": "The name of the event source.\n\n*Allowed values* : `OnPostCallAnalysisAvailable` | `OnRealTimeCallAnalysisAvailable` | `OnPostChatAnalysisAvailable` | `OnZendeskTicketCreate` | `OnZendeskTicketStatusUpdate` | `OnSalesforceCaseCreate`", - "IntegrationAssociationArn": "The Amazon Resource Name (ARN) for the integration association. `IntegrationAssociationArn` is required if `TriggerEventSource` is one of the following values: `OnZendeskTicketCreate` | `OnZendeskTicketStatusUpdate` | `OnSalesforceCaseCreate`" + "IntegrationAssociationArn": "The Amazon Resource Name (ARN) of the integration association. `IntegrationAssociationArn` is required if `TriggerEventSource` is one of the following values: `OnZendeskTicketCreate` | `OnZendeskTicketStatusUpdate` | `OnSalesforceCaseCreate`" } }, "AWS::Connect::Rule.SendNotificationAction": { @@ -11938,7 +11941,7 @@ "AWS::Connect::UserHierarchyGroup": { "attributes": { "Ref": "`Ref` returns the user hierarchy group. For example:\n\n`{ \"Ref\": \"myUserHierarchyGroup\" }`", - "UserHierarchyGroupArn": "The Amazon Resource Name (ARN) for the user hierarchy group." + "UserHierarchyGroupArn": "The Amazon Resource Name (ARN) of the user hierarchy group." }, "description": "Specifies a new user hierarchy group.", "properties": { @@ -13697,7 +13700,7 @@ "ActivationKey": "Specifies your DataSync agent's activation key. If you don't have an activation key, see [Activate your agent](https://docs.aws.amazon.com/datasync/latest/userguide/activate-agent.html) .", "AgentName": "Specifies a name for your agent. You can see this name in the DataSync console.", "SecurityGroupArns": "The Amazon Resource Names (ARNs) of the security groups used to protect your data transfer task subnets. See [SecurityGroupArns](https://docs.aws.amazon.com/datasync/latest/userguide/API_Ec2Config.html#DataSync-Type-Ec2Config-SecurityGroupArns) .\n\n*Pattern* : `^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):ec2:[a-z\\-0-9]*:[0-9]{12}:security-group/.*$`", - "SubnetArns": "Specifies the ARN of the subnet where you want to run your DataSync task when using a VPC endpoint. This is the subnet where DataSync creates and manages the [network interfaces](https://docs.aws.amazon.com/datasync/latest/userguide/datasync-network.html#required-network-interfaces) for your transfer.", + "SubnetArns": "Specifies the ARN of the subnet where you want to run your DataSync task when using a VPC endpoint. This is the subnet where DataSync creates and manages the [network interfaces](https://docs.aws.amazon.com/datasync/latest/userguide/datasync-network.html#required-network-interfaces) for your transfer. You can only specify one ARN.", "Tags": "Specifies labels that help you categorize, filter, and search for your AWS resources. We recommend creating at least one tag for your agent.", "VpcEndpointId": "The ID of the virtual private cloud (VPC) endpoint that the agent has access to. This is the client-side VPC endpoint, powered by AWS PrivateLink . If you don't have an AWS PrivateLink VPC endpoint, see [AWS PrivateLink and VPC endpoints](https://docs.aws.amazon.com//vpc/latest/userguide/endpoint-services-overview.html) in the *Amazon VPC User Guide* .\n\nFor more information about activating your agent in a private network based on a VPC, see [Using AWS DataSync in a Virtual Private Cloud](https://docs.aws.amazon.com/datasync/latest/userguide/datasync-in-vpc.html) in the *AWS DataSync User Guide.*\n\nA VPC endpoint ID looks like this: `vpce-01234d5aff67890e1` ." } @@ -13993,7 +13996,7 @@ }, "description": "The `AWS::DataSync::StorageSystem` resource creates an AWS resource for an on-premises storage system that you want DataSync Discovery to collect information about. For more information, see [discovering your storage with DataSync Discovery.](https://docs.aws.amazon.com/datasync/latest/userguide/understanding-your-storage.html)", "properties": { - "AgentArns": "Specifies the Amazon Resource Name (ARN) of the DataSync agent that connects to and reads from your on-premises storage system's management interface.", + "AgentArns": "Specifies the Amazon Resource Name (ARN) of the DataSync agent that connects to and reads from your on-premises storage system's management interface. You can only specify one ARN.", "CloudWatchLogGroupArn": "Specifies the ARN of the Amazon CloudWatch log group for monitoring and logging discovery job events.", "Name": "Specifies a familiar name for your on-premises storage system.", "ServerConfiguration": "Specifies the server name and network port required to connect with the management interface of your on-premises storage system.", @@ -15115,7 +15118,7 @@ }, "AWS::EC2::EC2Fleet.InstanceRequirementsRequest": { "attributes": {}, - "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n\nWhen you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n\nTo limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n\n- `AllowedInstanceTypes` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n- `ExcludedInstanceTypes` - The instance types to exclude from the list, even if they match your specified attributes.\n\n> You must specify `VCpuCount` and `MemoryMiB` . All other attributes are optional. Any unspecified optional attribute is set to its default. \n\nFor more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) , [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html) , and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide* .", + "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n\nYou must specify `VCpuCount` and `MemoryMiB` . All other attributes are optional. Any unspecified optional attribute is set to its default.\n\nWhen you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n\nTo limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n\n- `AllowedInstanceTypes` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n- `ExcludedInstanceTypes` - The instance types to exclude from the list, even if they match your specified attributes.\n\n> If you specify `InstanceRequirements` , you can't specify `InstanceType` .\n> \n> Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html) or with the [RunInstances API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) , you can't specify `InstanceRequirements` . \n\nFor more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) , [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html) , and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide* .", "properties": { "AcceleratorCount": "The minimum and maximum number of accelerators (GPUs, FPGAs, or AWS Inferentia chips) on an instance.\n\nTo exclude accelerator-enabled instance types, set `Max` to `0` .\n\nDefault: No minimum or maximum limits", "AcceleratorManufacturers": "Indicates whether instance types must have accelerators by specific manufacturers.\n\n- For instance types with NVIDIA devices, specify `nvidia` .\n- For instance types with AMD devices, specify `amd` .\n- For instance types with AWS devices, specify `amazon-web-services` .\n- For instance types with Xilinx devices, specify `xilinx` .\n\nDefault: Any manufacturer", @@ -15542,7 +15545,7 @@ "IamInstanceProfile": "The name of an IAM instance profile. To create a new IAM instance profile, use the [AWS::IAM::InstanceProfile](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html) resource.", "ImageId": "The ID of the AMI. An AMI ID is required to launch an instance and must be specified here or in a launch template.", "InstanceInitiatedShutdownBehavior": "Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).\n\nDefault: `stop`", - "InstanceType": "The instance type. For more information, see [Instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html) in the *Amazon EC2 User Guide* .\n\nWhen you change your EBS-backed instance type, instance restart or replacement behavior depends on the instance type compatibility between the old and new types. An instance that's backed by an instance store volume is always replaced. For more information, see [Change the instance type](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-resize.html) in the *Amazon EC2 User Guide* .\n\nDefault: `m1.small`", + "InstanceType": "The instance type. For more information, see [Instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html) in the *Amazon EC2 User Guide* .\n\nWhen you change your EBS-backed instance type, instance restart or replacement behavior depends on the instance type compatibility between the old and new types. An instance with an instance store volume as the root volume is always replaced. For more information, see [Change the instance type](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-resize.html) in the *Amazon EC2 User Guide* .", "Ipv6AddressCount": "The number of IPv6 addresses to associate with the primary network interface. Amazon EC2 chooses the IPv6 addresses from the range of your subnet. You cannot specify this option and the option to assign specific IPv6 addresses in the same request. You can specify this option if you've specified a minimum number of instances to launch.\n\nYou cannot specify this option and the network interfaces option in the same request.", "Ipv6Addresses": "The IPv6 addresses from the range of the subnet to associate with the primary network interface. You cannot specify this option and the option to assign a number of IPv6 addresses in the same request. You cannot specify this option if you've specified a minimum number of instances to launch.\n\nYou cannot specify this option and the network interfaces option in the same request.", "KernelId": "The ID of the kernel.\n\n> We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see [PV-GRUB](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html) in the *Amazon EC2 User Guide* .", @@ -15948,7 +15951,7 @@ "ImageId": "The ID of the AMI. Alternatively, you can specify a Systems Manager parameter, which will resolve to an AMI ID on launch.\n\nValid formats:\n\n- `ami-17characters00000`\n- `resolve:ssm:parameter-name`\n- `resolve:ssm:parameter-name:version-number`\n- `resolve:ssm:parameter-name:label`\n\nFor more information, see [Use a Systems Manager parameter to find an AMI](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html#using-systems-manager-parameter-to-find-AMI) in the *Amazon Elastic Compute Cloud User Guide* .", "InstanceInitiatedShutdownBehavior": "Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown).\n\nDefault: `stop`", "InstanceMarketOptions": "The market (purchasing) option for the instances.", - "InstanceRequirements": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n\nIf you specify `InstanceRequirements` , you can't specify `InstanceType` .", + "InstanceRequirements": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n\nYou must specify `VCpuCount` and `MemoryMiB` . All other attributes are optional. Any unspecified optional attribute is set to its default.\n\nWhen you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n\nTo limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n\n- `AllowedInstanceTypes` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n- `ExcludedInstanceTypes` - The instance types to exclude from the list, even if they match your specified attributes.\n\n> If you specify `InstanceRequirements` , you can't specify `InstanceType` .\n> \n> Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html) or with the [RunInstances API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) , you can't specify `InstanceRequirements` . \n\nFor more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) , [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html) , and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide* .", "InstanceType": "The instance type. For more information, see [Instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html) in the *Amazon Elastic Compute Cloud User Guide* .\n\nIf you specify `InstanceType` , you can't specify `InstanceRequirements` .", "KernelId": "The ID of the kernel.\n\nWe recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see [User Provided Kernels](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html) in the *Amazon EC2 User Guide* .", "KeyName": "The name of the key pair. You can create a key pair using [CreateKeyPair](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateKeyPair.html) or [ImportKeyPair](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportKeyPair.html) .\n\n> If you do not specify a key pair, you can't connect to the instance unless you choose an AMI that is configured to allow users another way to log in.", @@ -16940,7 +16943,7 @@ }, "AWS::EC2::SpotFleet.InstanceRequirementsRequest": { "attributes": {}, - "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n\nWhen you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n\nTo limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n\n- `AllowedInstanceTypes` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n- `ExcludedInstanceTypes` - The instance types to exclude from the list, even if they match your specified attributes.\n\n> You must specify `VCpuCount` and `MemoryMiB` . All other attributes are optional. Any unspecified optional attribute is set to its default. \n\nFor more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) , [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html) , and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide* .", + "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n\nYou must specify `VCpuCount` and `MemoryMiB` . All other attributes are optional. Any unspecified optional attribute is set to its default.\n\nWhen you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n\nTo limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n\n- `AllowedInstanceTypes` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n- `ExcludedInstanceTypes` - The instance types to exclude from the list, even if they match your specified attributes.\n\n> If you specify `InstanceRequirements` , you can't specify `InstanceType` .\n> \n> Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html) or with the [RunInstances API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) , you can't specify `InstanceRequirements` . \n\nFor more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) , [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html) , and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide* .", "properties": { "AcceleratorCount": "The minimum and maximum number of accelerators (GPUs, FPGAs, or AWS Inferentia chips) on an instance.\n\nTo exclude accelerator-enabled instance types, set `Max` to `0` .\n\nDefault: No minimum or maximum limits", "AcceleratorManufacturers": "Indicates whether instance types must have accelerators by specific manufacturers.\n\n- For instance types with NVIDIA devices, specify `nvidia` .\n- For instance types with AMD devices, specify `amd` .\n- For instance types with AWS devices, specify `amazon-web-services` .\n- For instance types with Xilinx devices, specify `xilinx` .\n\nDefault: Any manufacturer", @@ -18340,7 +18343,7 @@ "attributes": { "Ref": "`Ref` returns the Amazon Resource Name (ARN).\n\nIn the following example, the `Ref` function returns the ARN of the `MyTaskDefinition` task definition, such as `arn:aws:ecs:us-west-2:123456789012:task-definition/TaskDefinitionFamily:1` .\n\n`{ \"Ref\": \"MyTaskDefinition\" }`" }, - "description": "The details of a task definition which describes the container and volume definitions of an Amazon Elastic Container Service task. You can specify which Docker images to use, the required resources, and other configurations related to launching the task definition through an Amazon ECS service or task.", + "description": "Registers a new task definition from the supplied `family` and `containerDefinitions` . Optionally, you can add data volumes to your containers with the `volumes` parameter. For more information about task definition parameters and defaults, see [Amazon ECS Task Definitions](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html) in the *Amazon Elastic Container Service Developer Guide* .\n\nYou can specify a role for your task with the `taskRoleArn` parameter. When you specify a role for a task, its containers can then use the latest versions of the AWS CLI or SDKs to make API requests to the AWS services that are specified in the policy that's associated with the role. For more information, see [IAM Roles for Tasks](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) in the *Amazon Elastic Container Service Developer Guide* .\n\nYou can specify a Docker networking mode for the containers in your task definition with the `networkMode` parameter. The available network modes correspond to those described in [Network settings](https://docs.aws.amazon.com/https://docs.docker.com/engine/reference/run/#/network-settings) in the Docker run reference. If you specify the `awsvpc` network mode, the task is allocated an elastic network interface, and you must specify a `NetworkConfiguration` when you create a service or run a task with the task definition. For more information, see [Task Networking](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html) in the *Amazon Elastic Container Service Developer Guide* .", "properties": { "ContainerDefinitions": "A list of container definitions in JSON format that describe the different containers that make up your task. For more information about container definition parameters and defaults, see [Amazon ECS Task Definitions](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html) in the *Amazon Elastic Container Service Developer Guide* .", "Cpu": "The number of `cpu` units used by the task. If you use the EC2 launch type, this field is optional. Any value can be used. If you use the Fargate launch type, this field is required. You must use one of the following values. The value that you choose determines your range of valid values for the `memory` parameter.\n\nThe CPU units cannot be less than 1 vCPU when you use Windows containers on Fargate.\n\n- 256 (.25 vCPU) - Available `memory` values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)\n- 512 (.5 vCPU) - Available `memory` values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)\n- 1024 (1 vCPU) - Available `memory` values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)\n- 2048 (2 vCPU) - Available `memory` values: 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)\n- 4096 (4 vCPU) - Available `memory` values: 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB)\n- 8192 (8 vCPU) - Available `memory` values: 16 GB and 60 GB in 4 GB increments\n\nThis option requires Linux platform `1.4.0` or later.\n- 16384 (16vCPU) - Available `memory` values: 32GB and 120 GB in 8 GB increments\n\nThis option requires Linux platform `1.4.0` or later.", @@ -18354,7 +18357,7 @@ "PidMode": "The process namespace to use for the containers in the task. The valid values are `host` or `task` . If `host` is specified, then all containers within the tasks that specified the `host` PID mode on the same container instance share the same process namespace with the host Amazon EC2 instance. If `task` is specified, all containers within the specified task share the same process namespace. If no value is specified, the default is a private namespace. For more information, see [PID settings](https://docs.aws.amazon.com/https://docs.docker.com/engine/reference/run/#pid-settings---pid) in the *Docker run reference* .\n\nIf the `host` PID mode is used, be aware that there is a heightened risk of undesired process namespace expose. For more information, see [Docker security](https://docs.aws.amazon.com/https://docs.docker.com/engine/security/security/) .\n\n> This parameter is not supported for Windows containers or tasks run on AWS Fargate .", "PlacementConstraints": "An array of placement constraint objects to use for tasks.\n\n> This parameter isn't supported for tasks run on AWS Fargate .", "ProxyConfiguration": "The configuration details for the App Mesh proxy.\n\nYour Amazon ECS container instances require at least version 1.26.0 of the container agent and at least version 1.26.0-1 of the `ecs-init` package to use a proxy configuration. If your container instances are launched from the Amazon ECS optimized AMI version `20190301` or later, they contain the required versions of the container agent and `ecs-init` . For more information, see [Amazon ECS-optimized Linux AMI](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html) in the *Amazon Elastic Container Service Developer Guide* .", - "RequiresCompatibilities": "The task launch types the task definition was validated against. The valid values are `EC2` , `FARGATE` , and `git diff` . For more information, see [Amazon ECS launch types](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) in the *Amazon Elastic Container Service Developer Guide* .", + "RequiresCompatibilities": "The task launch types the task definition was validated against. The valid values are `EC2` , `FARGATE` , and `EXTERNAL` . For more information, see [Amazon ECS launch types](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html) in the *Amazon Elastic Container Service Developer Guide* .", "RuntimePlatform": "The operating system that your tasks definitions run on. A platform family is specified only for tasks using the Fargate launch type.\n\nWhen you specify a task definition in a service, this value must match the `runtimePlatform` value of the service.", "Tags": "The metadata that you apply to the task definition to help you categorize and organize them. Each tag consists of a key and an optional value. You define both of them.\n\nThe following basic restrictions apply to tags:\n\n- Maximum number of tags per resource - 50\n- For each resource, each tag key must be unique, and each tag key can have only one value.\n- Maximum key length - 128 Unicode characters in UTF-8\n- Maximum value length - 256 Unicode characters in UTF-8\n- If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.\n- Tag keys and values are case-sensitive.\n- Do not use `aws:` , `AWS:` , or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.", "TaskRoleArn": "The short name or full Amazon Resource Name (ARN) of the AWS Identity and Access Management role that grants containers in the task permission to call AWS APIs on your behalf. For more information, see [Amazon ECS Task Role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) in the *Amazon Elastic Container Service Developer Guide* .\n\nIAM roles for tasks on Windows require that the `-EnableTaskIAMRole` option is set when you launch the Amazon ECS-optimized Windows AMI. Your containers must also run some configuration code to use the feature. For more information, see [Windows IAM roles for tasks](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/windows_task_IAM_roles.html) in the *Amazon Elastic Container Service Developer Guide* .", @@ -21899,7 +21902,7 @@ "attributes": {}, "description": "The configuration that Amazon FSx for Windows File Server uses to audit and log user accesses of files, folders, and file shares on the Amazon FSx for Windows File Server file system.", "properties": { - "AuditLogDestination": "The Amazon Resource Name (ARN) for the destination of the audit logs. The destination can be any Amazon CloudWatch Logs log group ARN or Amazon Kinesis Data Firehose delivery stream ARN.\n\nThe name of the Amazon CloudWatch Logs log group must begin with the `/aws/fsx` prefix. The name of the Amazon Kinesis Data Firehouse delivery stream must begin with the `aws-fsx` prefix.\n\nThe destination ARN (either CloudWatch Logs log group or Kinesis Data Firehose delivery stream) must be in the same AWS partition, AWS Region , and AWS account as your Amazon FSx file system.", + "AuditLogDestination": "The Amazon Resource Name (ARN) for the destination of the audit logs. The destination can be any Amazon CloudWatch Logs log group ARN or Amazon Kinesis Data Firehose delivery stream ARN.\n\nThe name of the Amazon CloudWatch Logs log group must begin with the `/aws/fsx` prefix. The name of the Amazon Kinesis Data Firehose delivery stream must begin with the `aws-fsx` prefix.\n\nThe destination ARN (either CloudWatch Logs log group or Kinesis Data Firehose delivery stream) must be in the same AWS partition, AWS Region , and AWS account as your Amazon FSx file system.", "FileAccessAuditLogLevel": "Sets which attempt type is logged by Amazon FSx for file and folder accesses.\n\n- `SUCCESS_ONLY` - only successful attempts to access files or folders are logged.\n- `FAILURE_ONLY` - only failed attempts to access files or folders are logged.\n- `SUCCESS_AND_FAILURE` - both successful attempts and failed attempts to access files or folders are logged.\n- `DISABLED` - access auditing of files and folders is turned off.", "FileShareAccessAuditLogLevel": "Sets which attempt type is logged by Amazon FSx for file share accesses.\n\n- `SUCCESS_ONLY` - only successful attempts to access file shares are logged.\n- `FAILURE_ONLY` - only failed attempts to access file shares are logged.\n- `SUCCESS_AND_FAILURE` - both successful attempts and failed attempts to access file shares are logged.\n- `DISABLED` - access auditing of file shares is turned off." } @@ -22116,7 +22119,7 @@ "JunctionPath": "Specifies the location in the SVM's namespace where the volume is mounted. This parameter is required. The `JunctionPath` must have a leading forward slash, such as `/vol3` .", "OntapVolumeType": "Specifies the type of volume you are creating. Valid values are the following:\n\n- `RW` specifies a read/write volume. `RW` is the default.\n- `DP` specifies a data-protection volume. A `DP` volume is read-only and can be used as the destination of a NetApp SnapMirror relationship.\n\nFor more information, see [Volume types](https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/volume-types) in the *Amazon FSx for NetApp ONTAP User Guide* .", "SecurityStyle": "Specifies the security style for the volume. If a volume's security style is not specified, it is automatically set to the root volume's security style. The security style determines the type of permissions that FSx for ONTAP uses to control data access. For more information, see [Volume security style](https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/managing-volumes.html#volume-security-style) in the *Amazon FSx for NetApp ONTAP User Guide* . Specify one of the following values:\n\n- `UNIX` if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account.\n- `NTFS` if the file system is managed by a Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Windows user as the service account.\n- `MIXED` if the file system is managed by both UNIX and Windows administrators and users consist of both NFS and SMB clients.", - "SizeInMegabytes": "Specifies the size of the volume, in megabytes (MB), that you are creating. Provide any whole number in the range of 20\u2013104857600 to specify the size of the volume.", + "SizeInMegabytes": "Specifies the size of the volume, in megabytes (MB), that you are creating.", "SnapshotPolicy": "Specifies the snapshot policy for the volume. There are three built-in snapshot policies:\n\n- `default` : This is the default policy. A maximum of six hourly snapshots taken five minutes past the hour. A maximum of two daily snapshots taken Monday through Saturday at 10 minutes after midnight. A maximum of two weekly snapshots taken every Sunday at 15 minutes after midnight.\n- `default-1weekly` : This policy is the same as the `default` policy except that it only retains one snapshot from the weekly schedule.\n- `none` : This policy does not take any snapshots. This policy can be assigned to volumes to prevent automatic snapshots from being taken.\n\nYou can also provide the name of a custom policy that you created with the ONTAP CLI or REST API.\n\nFor more information, see [Snapshot policies](https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/snapshots-ontap.html#snapshot-policies) in the *Amazon FSx for NetApp ONTAP User Guide* .", "StorageEfficiencyEnabled": "Set to true to enable deduplication, compression, and compaction storage efficiency features on the volume, or set to false to disable them. This parameter is required.", "StorageVirtualMachineId": "Specifies the ONTAP SVM in which to create the volume.", @@ -25224,6 +25227,7 @@ "properties": { "DatastoreName": "The user generated name for the Data Store.", "DatastoreTypeVersion": "The FHIR version of the Data Store. The only supported version is R4.", + "IdentityProviderConfiguration": "", "PreloadDataConfig": "The preloaded data configuration for the Data Store. Only data preloaded from Synthea is supported.", "SseConfiguration": "The server-side encryption key configuration for a customer provided encryption key specified for creating a Data Store.", "Tags": "An array of key-value pairs to apply to this resource.\n\nFor more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html) ." @@ -25237,6 +25241,16 @@ "Seconds": "" } }, + "AWS::HealthLake::FHIRDatastore.IdentityProviderConfiguration": { + "attributes": {}, + "description": "", + "properties": { + "AuthorizationStrategy": "", + "FineGrainedAuthorizationEnabled": "", + "IdpLambdaArn": "", + "Metadata": "" + } + }, "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig": { "attributes": {}, "description": "The customer-managed-key(CMK) used when creating a Data Store. If a customer owned key is not specified, an Amazon owned key will be used for encryption.", @@ -26597,14 +26611,14 @@ "attributes": {}, "description": "The configuration that determines how many retries are allowed for each failure type for a job.", "properties": { - "RetryCriteriaList": "" + "RetryCriteriaList": "The list of criteria that determines how many retries are allowed for each failure type for a job." } }, "AWS::IoT::JobTemplate.JobExecutionsRolloutConfig": { "attributes": {}, "description": "Allows you to create a staged rollout of a job.", "properties": { - "ExponentialRolloutRate": "", + "ExponentialRolloutRate": "The rate of increase for a job rollout. This parameter allows you to define an exponential rate for a job rollout.", "MaximumPerMinute": "The maximum number of things that will be notified of a pending job, per minute. This parameter allows you to create a staged rollout." } }, @@ -59102,11 +59116,20 @@ "properties": { "AccessType": "The container for the type of connectivity used to access the Amazon S3 on Outposts endpoint. To use the Amazon VPC , choose `Private` . To use the endpoint with an on-premises network, choose `CustomerOwnedIp` . If you choose `CustomerOwnedIp` , you must also provide the customer-owned IP address pool (CoIP pool).\n\n> `Private` is the default access type value.", "CustomerOwnedIpv4Pool": "The ID of the customer-owned IPv4 address pool (CoIP pool) for the endpoint. IP addresses are allocated from this pool for the endpoint.", + "FailedReason": "", "OutpostId": "The ID of the Outpost.", "SecurityGroupId": "The ID of the security group to use with the endpoint.", "SubnetId": "The ID of the subnet." } }, + "AWS::S3Outposts::Endpoint.FailedReason": { + "attributes": {}, + "description": "", + "properties": { + "ErrorCode": "", + "Message": "" + } + }, "AWS::S3Outposts::Endpoint.NetworkInterface": { "attributes": {}, "description": "The container for the network interface.", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ACMPCA.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ACMPCA.json index a365af07df351..cf71b0ab66185 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ACMPCA.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ACMPCA.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ACMPCA::Certificate.ApiPassthrough": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-apipassthrough.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_APS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_APS.json index b6d39e3596c26..e93e11b489922 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_APS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_APS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::APS::Workspace.LoggingConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-aps-workspace-loggingconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AccessAnalyzer.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AccessAnalyzer.json index 5c687d5f10d06..f89ceae430002 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AccessAnalyzer.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AccessAnalyzer.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AccessAnalyzer::Analyzer.ArchiveRule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-archiverule.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmazonMQ.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmazonMQ.json index 3686874a4c110..d8e698a44164d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmazonMQ.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmazonMQ.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AmazonMQ::Broker.ConfigurationId": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-configurationid.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Amplify.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Amplify.json index dea28b33f1f3d..193d4d8c70225 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Amplify.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Amplify.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Amplify::App.AutoBranchCreationConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmplifyUIBuilder.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmplifyUIBuilder.json index 0cf21e193cc18..02edcdf42cb45 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmplifyUIBuilder.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AmplifyUIBuilder.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AmplifyUIBuilder::Component.ActionParameters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-actionparameters.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGateway.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGateway.json index 92aad295fda75..53b1aad90ebca 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGateway.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGateway.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ApiGateway::ApiKey.StageKey": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGatewayV2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGatewayV2.json index 6f4d9c944b85c..0949e1cf9a11c 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGatewayV2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApiGatewayV2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ApiGatewayV2::Api.BodyS3Location": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppConfig.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppConfig.json index c3ddea445be6e..bf467dd149583 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppConfig.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppConfig.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppConfig::Application.Tags": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-application-tags.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppFlow.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppFlow.json index bb62d97a9bbca..930ea78c07f89 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppFlow.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppFlow.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppFlow::Connector.ConnectorProvisioningConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connector-connectorprovisioningconfig.html", @@ -831,6 +831,12 @@ "Required": false, "UpdateType": "Mutable" }, + "DisableSSO": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-disablesso", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, "LogonLanguage": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-logonlanguage", "PrimitiveType": "String", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppIntegrations.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppIntegrations.json index 1c923a2c5a22b..a23c738d91f57 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppIntegrations.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppIntegrations.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppIntegrations::DataIntegration.FileConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-dataintegration-fileconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppMesh.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppMesh.json index f9ec153487454..f665a0eb5f4a1 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppMesh.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppMesh.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppRunner.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppRunner.json index c7b9e44d58c05..2acd9ad6fce3d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppRunner.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppRunner.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppRunner::ObservabilityConfiguration.TraceConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-observabilityconfiguration-traceconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppStream.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppStream.json index 7a4203087d5ab..3c6f8f5ec8942 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppStream.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppStream.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppStream::AppBlock.S3Location": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-s3location.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppSync.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppSync.json index 1cad3a768e3f9..25e4d0a0ccae7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppSync.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AppSync.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AppSync::DataSource.AuthorizationConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-authorizationconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationAutoScaling.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationAutoScaling.json index 7b85c7cba495b..2f2d3b6468a59 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationAutoScaling.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationAutoScaling.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationInsights.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationInsights.json index e74478e1cfdb1..1570e36565a56 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationInsights.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ApplicationInsights.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ApplicationInsights::Application.Alarm": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarm.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Athena.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Athena.json index 5180dc11d7caf..0eb2510c5194f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Athena.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Athena.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Athena::CapacityReservation.CapacityAssignment": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-capacityreservation-capacityassignment.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AuditManager.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AuditManager.json index 90dca2189eb16..ac944bfb61f64 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AuditManager.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AuditManager.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AuditManager::Assessment.AWSAccount": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsaccount.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScaling.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScaling.json index ccff48f5358ab..f3c2dcda9c9cb 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScaling.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScaling.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratorcountrequest.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScalingPlans.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScalingPlans.json index 3209a02e31572..ab58a5b7b2e39 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScalingPlans.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_AutoScalingPlans.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::AutoScalingPlans::ScalingPlan.ApplicationSource": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-applicationsource.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Backup.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Backup.json index 721bc3ef79a49..985e89c8f2576 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Backup.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Backup.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-advancedbackupsettingresourcetype.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BackupGateway.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BackupGateway.json index 1df2c0b8179c3..c1a5e8ff86c91 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BackupGateway.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BackupGateway.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::BackupGateway::Hypervisor": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Batch.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Batch.json index 56e1c9326b6eb..dd98ff03d25f7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Batch.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Batch.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Batch::ComputeEnvironment.ComputeResources": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BillingConductor.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BillingConductor.json index 7348113b8a573..5c1bd3f954902 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BillingConductor.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_BillingConductor.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::BillingConductor::BillingGroup.AccountGrouping": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-billingconductor-billinggroup-accountgrouping.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Budgets.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Budgets.json index 09849b6bf4d4c..8c111bf7c51ce 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Budgets.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Budgets.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Budgets::Budget.AutoAdjustData": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-autoadjustdata.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CE.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CE.json index 5981056d9016f..1a5d39a75ea64 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CE.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CE.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CE::AnomalyMonitor.ResourceTag": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalymonitor-resourcetag.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CUR.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CUR.json index 0caf0ac7dcf62..21b2aebfd60b7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CUR.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CUR.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::CUR::ReportDefinition": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cassandra.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cassandra.json index 6862e613babe6..e8aa35a212067 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cassandra.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cassandra.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Cassandra::Keyspace.ReplicationSpecification": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-keyspace-replicationspecification.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CertificateManager.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CertificateManager.json index 6146ad33ed6a4..06764e317e2b2 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CertificateManager.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CertificateManager.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CertificateManager::Account.ExpiryEventsConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-account-expiryeventsconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Chatbot.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Chatbot.json index c5fabb17bf05f..9aa3cb5d033c2 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Chatbot.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Chatbot.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CleanRooms.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CleanRooms.json index 608215394b8fa..7f0e7cb4509ba 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CleanRooms.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CleanRooms.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-collaboration-dataencryptionmetadata.html", @@ -125,6 +125,14 @@ "Type": "List", "UpdateType": "Mutable" }, + "AllowedJoinOperators": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisruleaggregation.html#cfn-cleanrooms-configuredtable-analysisruleaggregation-allowedjoinoperators", + "DuplicatesAllowed": true, + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, "DimensionColumns": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisruleaggregation.html#cfn-cleanrooms-configuredtable-analysisruleaggregation-dimensioncolumns", "DuplicatesAllowed": true, @@ -168,6 +176,14 @@ "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulelist.html", "Properties": { + "AllowedJoinOperators": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulelist.html#cfn-cleanrooms-configuredtable-analysisrulelist-allowedjoinoperators", + "DuplicatesAllowed": true, + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, "JoinColumns": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulelist.html#cfn-cleanrooms-configuredtable-analysisrulelist-joincolumns", "DuplicatesAllowed": true, diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cloud9.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cloud9.json index 5c17f0f197e1b..9ecf36e79e984 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cloud9.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cloud9.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Cloud9::EnvironmentEC2.Repository": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloud9-environmentec2-repository.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFormation.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFormation.json index 72aa1f1028ec1..48e1711751129 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFormation.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFormation.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CloudFormation::HookVersion.LoggingConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-hookversion-loggingconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFront.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFront.json index 44177f98b6280..365bbe3672f43 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFront.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudFront.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CloudFront::CachePolicy.CachePolicyConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudTrail.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudTrail.json index 8081886a8ca55..78619e75195fe 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudTrail.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudTrail.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CloudTrail::Channel.Destination": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-channel-destination.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudWatch.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudWatch.json index 5cc5e6f44bba0..8187fa6a0387c 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudWatch.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CloudWatch.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CloudWatch::Alarm.Dimension": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeArtifact.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeArtifact.json index 3ed8fd24b0226..f1fa3f15d1182 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeArtifact.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeArtifact.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::CodeArtifact::Domain": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeBuild.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeBuild.json index fffeb606a36a2..7300687655957 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeBuild.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeBuild.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodeBuild::Project.Artifacts": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeCommit.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeCommit.json index 7592da5c195f5..9f48e81cdee15 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeCommit.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeCommit.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodeCommit::Repository.Code": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-code.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeDeploy.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeDeploy.json index 660d9be491e8d..559a2b97148d1 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeDeploy.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeDeploy.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruProfiler.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruProfiler.json index aba188c74c6e0..8fbfc14672d44 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruProfiler.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruProfiler.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodeGuruProfiler::ProfilingGroup.AgentPermissions": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codeguruprofiler-profilinggroup-agentpermissions.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruReviewer.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruReviewer.json index 7acc1d435def9..b623b0a354ef1 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruReviewer.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeGuruReviewer.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::CodeGuruReviewer::RepositoryAssociation": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodePipeline.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodePipeline.json index 68f555b1500c6..b63b4e5bc0251 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodePipeline.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodePipeline.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodePipeline::CustomActionType.ArtifactDetails": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStar.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStar.json index ba52b4a9aa4f2..5d928a80615d9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStar.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStar.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodeStar::GitHubRepository.Code": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-code.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarConnections.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarConnections.json index bbf66be3a770f..9081da2db4788 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarConnections.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarConnections.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::CodeStarConnections::Connection": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarNotifications.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarNotifications.json index e46fe6f93632e..6f665deb596f9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarNotifications.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CodeStarNotifications.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CodeStarNotifications::NotificationRule.Target": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestarnotifications-notificationrule-target.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cognito.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cognito.json index 81e0ff042d364..1e97b4a2455d9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cognito.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Cognito.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Cognito::IdentityPool.CognitoIdentityProvider": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Comprehend.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Comprehend.json index 19f046ab1f82a..a23e46ad6e47a 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Comprehend.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Comprehend.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-augmentedmanifestslistitem.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Config.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Config.json index b1fa5e33a8808..448a460c32c1f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Config.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Config.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Config::ConfigRule.CustomPolicyDetails": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-custompolicydetails.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Connect.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Connect.json index 8af9acc8aa942..3c42bd62714c8 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Connect.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Connect.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Connect::EvaluationForm.EvaluationFormBaseItem": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-evaluationform-evaluationformbaseitem.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ConnectCampaigns.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ConnectCampaigns.json index 94b6cb34b9718..da89407cb7dde 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ConnectCampaigns.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ConnectCampaigns.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ConnectCampaigns::Campaign.AnswerMachineDetectionConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connectcampaigns-campaign-answermachinedetectionconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ControlTower.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ControlTower.json index 194fdd28e6441..6dfcff68475f1 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ControlTower.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ControlTower.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::ControlTower::EnabledControl": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CustomerProfiles.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CustomerProfiles.json index 1448a34f00bff..a6e254787c233 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CustomerProfiles.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_CustomerProfiles.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::CustomerProfiles::CalculatedAttributeDefinition.AttributeDetails": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-calculatedattributedefinition-attributedetails.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DAX.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DAX.json index 1420520c9abcc..2a6f3294e1645 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DAX.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DAX.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DAX::Cluster.SSESpecification": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DLM.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DLM.json index de55aa0b830ab..deccd40a49fdc 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DLM.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DLM.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DLM::LifecyclePolicy.Action": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-action.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DMS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DMS.json index f9f6219fafa5a..a75f1acdf3e02 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DMS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DMS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DMS::Endpoint.DocDbSettings": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-docdbsettings.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataBrew.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataBrew.json index 7bd220fc54886..dcc56a4687ae4 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataBrew.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataBrew.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DataBrew::Dataset.CsvOptions": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-csvoptions.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataPipeline.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataPipeline.json index d9c17ae9e2bb1..57d7b115660c7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataPipeline.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataPipeline.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DataPipeline::Pipeline.Field": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-field.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataSync.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataSync.json index cf50c6230ef5a..742edf72c9896 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataSync.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DataSync.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DataSync::LocationEFS.Ec2Config": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationefs-ec2config.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Detective.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Detective.json index aba33e2c9b5c4..68e4e29b9a95a 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Detective.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Detective.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::Detective::Graph": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DevOpsGuru.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DevOpsGuru.json index 39bcfd08069f3..f877dd5caaa4d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DevOpsGuru.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DevOpsGuru.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-notificationchannel-notificationchannelconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DirectoryService.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DirectoryService.json index effa6a8d015a1..e0fef77aa2cce 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DirectoryService.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DirectoryService.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DirectoryService::MicrosoftAD.VpcSettings": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDB.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDB.json index b21ea1857f440..b1de20db8ffce 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDB.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDB.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::DocDB::DBCluster": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDBElastic.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDBElastic.json index 0b99aefe4e28f..64120eb0718b2 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDBElastic.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DocDBElastic.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::DocDBElastic::Cluster": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DynamoDB.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DynamoDB.json index 838e2ae1b3225..f70e270564e0d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DynamoDB.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_DynamoDB.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DynamoDB::GlobalTable.AttributeDefinition": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-attributedefinition.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EC2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EC2.json index 4fb398b2f2b80..287feafa1704f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EC2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EC2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EC2::CapacityReservation.TagSpecification": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservation-tagspecification.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECR.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECR.json index 7acbd33729712..a7fda206f51ad 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECR.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECR.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ECR::PublicRepository.RepositoryCatalogData": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-publicrepository-repositorycatalogdata.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECS.json index ba4bb9d50ee46..2ab7f36ddee51 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ECS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ECS::CapacityProvider.AutoScalingGroupProvider": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-autoscalinggroupprovider.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EFS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EFS.json index 21514e0db000c..97942f05515ab 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EFS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EFS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EFS::AccessPoint.AccessPointTag": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-accesspointtag.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EKS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EKS.json index 3cab5bf3921a5..0f55204bc1958 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EKS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EKS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EKS::Cluster.ClusterLogging": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-clusterlogging.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMR.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMR.json index f5dee0bafed7e..9c0f46380a38f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMR.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMR.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EMR::Cluster.Application": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRContainers.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRContainers.json index 97b471901cb01..7b07bfd3caa92 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRContainers.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRContainers.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EMRContainers::VirtualCluster.ContainerInfo": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerinfo.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRServerless.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRServerless.json index 72ca2bc23ecfb..35b8ab6dc1071 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRServerless.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EMRServerless.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EMRServerless::Application.AutoStartConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-autostartconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElastiCache.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElastiCache.json index 58d74e12ce5c4..4c88e97e800a3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElastiCache.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElastiCache.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-cloudwatchlogsdestinationdetails.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticBeanstalk.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticBeanstalk.json index 8ac95ad2bb3b0..36c5374e7d5a1 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticBeanstalk.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticBeanstalk.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancing.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancing.json index 9c9eec77cd68a..5f2ac624a3546 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancing.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancing.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancingV2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancingV2.json index 4ccbef6613cda..3bbd42fa4e131 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancingV2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ElasticLoadBalancingV2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ElasticLoadBalancingV2::Listener.Action": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Elasticsearch.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Elasticsearch.json index 0d5440f2ae287..c7e83958f4678 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Elasticsearch.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Elasticsearch.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-advancedsecurityoptionsinput.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EventSchemas.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EventSchemas.json index 99375e92c6e63..187fa80a5acc3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EventSchemas.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_EventSchemas.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::EventSchemas::Discoverer.TagsEntry": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-discoverer-tagsentry.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Events.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Events.json index c630b03ad0415..cb441e4cd7a5f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Events.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Events.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Events::Connection.ApiKeyAuthParameters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-connection-apikeyauthparameters.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Evidently.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Evidently.json index 49f32725f214b..8d6507ecfb4f3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Evidently.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Evidently.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Evidently::Experiment.MetricGoalObject": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FIS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FIS.json index e03a7b23f326a..f942e6c97e4f0 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FIS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FIS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::FIS::ExperimentTemplate.CloudWatchLogsConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-cloudwatchlogsconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FMS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FMS.json index 5de9dfcbf6efa..d359fb6111667 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FMS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FMS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::FMS::Policy.IEMap": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-iemap.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FSx.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FSx.json index c101d98dc6e0a..0e28c4f368861 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FSx.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FSx.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-datarepositoryassociation-autoexportpolicy.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FinSpace.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FinSpace.json index bbfb946e1f368..b10dffe7b7bf2 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FinSpace.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FinSpace.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::FinSpace::Environment.AttributeMapItems": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-attributemapitems.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Forecast.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Forecast.json index a639ec194fbde..26e315eff60b3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Forecast.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Forecast.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Forecast::Dataset.AttributesItems": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-forecast-dataset-attributesitems.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FraudDetector.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FraudDetector.json index fc19465554ac1..f59ca0aff4c68 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FraudDetector.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_FraudDetector.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::FraudDetector::Detector.EntityType": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GameLift.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GameLift.json index e18e2f187b771..c85f020d5da83 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GameLift.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GameLift.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::GameLift::Alias.RoutingStrategy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GlobalAccelerator.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GlobalAccelerator.json index d88068d12a0e1..3bd79a4a2d494 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GlobalAccelerator.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GlobalAccelerator.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-endpointconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Glue.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Glue.json index 7c4eba479048c..75eb94f1c708b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Glue.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Glue.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Glue::Classifier.CsvClassifier": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Grafana.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Grafana.json index 3c1715e90c57f..057363dbd7558 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Grafana.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Grafana.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Grafana::Workspace.AssertionAttributes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-grafana-workspace-assertionattributes.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Greengrass.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Greengrass.json index 20e4503f15c28..2cf3eb7c81a41 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Greengrass.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Greengrass.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Greengrass::ConnectorDefinition.Connector": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connector.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GreengrassV2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GreengrassV2.json index 001cd8b937964..e79c9da08f20d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GreengrassV2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GreengrassV2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentdependencyrequirement.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GroundStation.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GroundStation.json index 5c314e4012025..c527b2bf81354 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GroundStation.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GroundStation.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::GroundStation::Config.AntennaDownlinkConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GuardDuty.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GuardDuty.json index 3d6f438b20c64..bd38a45bd105f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GuardDuty.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_GuardDuty.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::GuardDuty::Detector.CFNDataSourceConfigurations": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-detector-cfndatasourceconfigurations.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_HealthLake.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_HealthLake.json index 68b1f0b2c5fb9..33a36b2d70928 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_HealthLake.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_HealthLake.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::HealthLake::FHIRDatastore.CreatedAt": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-createdat.html", @@ -18,6 +18,35 @@ } } }, + "AWS::HealthLake::FHIRDatastore.IdentityProviderConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-identityproviderconfiguration.html", + "Properties": { + "AuthorizationStrategy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-identityproviderconfiguration.html#cfn-healthlake-fhirdatastore-identityproviderconfiguration-authorizationstrategy", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "FineGrainedAuthorizationEnabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-identityproviderconfiguration.html#cfn-healthlake-fhirdatastore-identityproviderconfiguration-finegrainedauthorizationenabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "IdpLambdaArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-identityproviderconfiguration.html#cfn-healthlake-fhirdatastore-identityproviderconfiguration-idplambdaarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Metadata": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-identityproviderconfiguration.html#cfn-healthlake-fhirdatastore-identityproviderconfiguration-metadata", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + }, "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-kmsencryptionconfig.html", "Properties": { @@ -97,6 +126,12 @@ "Required": true, "UpdateType": "Immutable" }, + "IdentityProviderConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-identityproviderconfiguration", + "Required": false, + "Type": "IdentityProviderConfiguration", + "UpdateType": "Immutable" + }, "PreloadDataConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-preloaddataconfig", "Required": false, diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IAM.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IAM.json index 50c96759c5d4b..4a6cd332fe581 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IAM.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IAM.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IAM::Group.Policy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVS.json index e46383584e706..15996adba4876 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IVS::RecordingConfiguration.DestinationConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-recordingconfiguration-destinationconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVSChat.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVSChat.json index a799537b22bab..8a203df4bcaa8 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVSChat.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IVSChat.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IVSChat::LoggingConfiguration.CloudWatchLogsDestinationConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivschat-loggingconfiguration-cloudwatchlogsdestinationconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IdentityStore.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IdentityStore.json index 4b757f1d01d94..5e3885c0c31df 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IdentityStore.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IdentityStore.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IdentityStore::GroupMembership.MemberId": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-identitystore-groupmembership-memberid.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ImageBuilder.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ImageBuilder.json index 3aa60f7fecf05..b76ebeeeed309 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ImageBuilder.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ImageBuilder.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-componentconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Inspector.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Inspector.json index eb8c4391d0e88..610cb2b031979 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Inspector.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Inspector.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::Inspector::AssessmentTarget": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InspectorV2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InspectorV2.json index 318f0faf0e706..d80d8ee52e306 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InspectorV2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InspectorV2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::InspectorV2::Filter.DateFilter": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-filter-datefilter.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InternetMonitor.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InternetMonitor.json index a92ce1665c5ee..a548e508115c4 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InternetMonitor.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_InternetMonitor.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::InternetMonitor::Monitor.HealthEventsConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-internetmonitor-monitor-healtheventsconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json index 9c0d64d5c1b85..648d981636a87 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT1Click.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT1Click.json index 07dc23dcc41e2..1fea959f6c4f6 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT1Click.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT1Click.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoT1Click::Project.DeviceTemplate": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-devicetemplate.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTAnalytics.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTAnalytics.json index 4dca5995fa828..ef9b8e1f32eb2 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTAnalytics.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTAnalytics.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTAnalytics::Channel.ChannelStorage": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-channelstorage.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTCoreDeviceAdvisor.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTCoreDeviceAdvisor.json index 13b68fe318871..12386cf57958d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTCoreDeviceAdvisor.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTCoreDeviceAdvisor.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTCoreDeviceAdvisor::SuiteDefinition.DeviceUnderTest": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotcoredeviceadvisor-suitedefinition-deviceundertest.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTEvents.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTEvents.json index 5826cdc751687..fd6eeade0d0ba 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTEvents.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTEvents.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTEvents::AlarmModel.AcknowledgeFlow": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-alarmmodel-acknowledgeflow.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetHub.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetHub.json index 9cc20233d8975..6ee311083183d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetHub.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetHub.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::IoTFleetHub::Application": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetWise.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetWise.json index 15fe4a2049c5d..8b24b94609790 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetWise.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTFleetWise.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTFleetWise::Campaign.CollectionScheme": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-collectionscheme.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTSiteWise.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTSiteWise.json index 84dc860b9cf9c..758abcb06dae9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTSiteWise.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTSiteWise.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyidentity.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTThingsGraph.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTThingsGraph.json index 4ab3b41b1900f..b1c7d89baeab7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTThingsGraph.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTThingsGraph.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotthingsgraph-flowtemplate-definitiondocument.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTTwinMaker.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTTwinMaker.json index 04e466ba94584..f507165ac0299 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTTwinMaker.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTTwinMaker.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTTwinMaker::ComponentType.DataConnector": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iottwinmaker-componenttype-dataconnector.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTWireless.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTWireless.json index 83c73151abe2e..104baa347ddeb 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTWireless.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoTWireless.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KMS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KMS.json index 7219503ef3dda..223073823ed4b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KMS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KMS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::KMS::Alias": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KafkaConnect.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KafkaConnect.json index aba87b948005d..7b3667a9e0cf5 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KafkaConnect.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KafkaConnect.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::KafkaConnect::Connector.ApacheKafkaCluster": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-connector-apachekafkacluster.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kendra.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kendra.json index 2951b323ae2a2..a3d86124411db 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kendra.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kendra.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Kendra::DataSource.AccessControlListConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-accesscontrollistconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KendraRanking.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KendraRanking.json index bdf48bcdcd230..405032869e8e3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KendraRanking.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KendraRanking.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::KendraRanking::ExecutionPlan.CapacityUnitsConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendraranking-executionplan-capacityunitsconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kinesis.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kinesis.json index 6c69b1418b0ca..277a66d15886d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kinesis.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Kinesis.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Kinesis::Stream.StreamEncryption": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesis-stream-streamencryption.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalytics.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalytics.json index ddc03a4df2104..494482998b37c 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalytics.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalytics.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::KinesisAnalytics::Application.CSVMappingParameters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalyticsV2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalyticsV2.json index 0f3e2a5cacacb..cc608e41c35ab 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalyticsV2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisAnalyticsV2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationcodeconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisFirehose.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisFirehose.json index 039c440995b37..f5d6c4dbd4808 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisFirehose.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisFirehose.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::KinesisFirehose::DeliveryStream.AmazonOpenSearchServerlessBufferingHints": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchserverlessbufferinghints.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisVideo.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisVideo.json index 0f97511723580..10c6416e67437 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisVideo.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_KinesisVideo.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::KinesisVideo::SignalingChannel": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LakeFormation.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LakeFormation.json index 379029a0da46c..f201c78aa8450 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LakeFormation.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LakeFormation.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::LakeFormation::DataCellsFilter.ColumnWildcard": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datacellsfilter-columnwildcard.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lambda.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lambda.json index e5f6bbdbcfb0b..21724239c05d4 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lambda.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lambda.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Lambda::Alias.AliasRoutingConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lex.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lex.json index 575f21d90b809..115b79db93b93 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lex.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lex.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Lex::Bot.AdvancedRecognitionSetting": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lex-bot-advancedrecognitionsetting.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LicenseManager.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LicenseManager.json index 363f0cf28d076..9b01489ad59df 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LicenseManager.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LicenseManager.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::LicenseManager::License.BorrowConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-borrowconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lightsail.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lightsail.json index ff9b1ab0eb8f1..ffa046c672cf7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lightsail.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Lightsail.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Lightsail::Bucket.AccessRules": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-bucket-accessrules.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Location.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Location.json index 003c75b1d429a..bab696fc0cfd0 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Location.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Location.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Location::Map.MapConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-location-map-mapconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Logs.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Logs.json index b4381e82d3e7b..3929df9d7e20b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Logs.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Logs.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Logs::MetricFilter.Dimension": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-dimension.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutEquipment.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutEquipment.json index a5525ef7e4c92..ddeb7a0a61008 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutEquipment.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutEquipment.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::LookoutEquipment::InferenceScheduler.DataInputConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutequipment-inferencescheduler-datainputconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutMetrics.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutMetrics.json index 3d1f8137328e2..5f871579a8be3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutMetrics.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutMetrics.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::LookoutMetrics::Alert.Action": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-action.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutVision.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutVision.json index c93e3055ea39e..7228efb859576 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutVision.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_LookoutVision.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::LookoutVision::Project": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_M2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_M2.json index 0922055a4cd1c..a3802c27f31ef 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_M2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_M2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::M2::Application.Definition": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-m2-application-definition.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MSK.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MSK.json index 8d06dd4e14940..6152ba0e62e00 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MSK.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MSK.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MSK::Cluster.BrokerLogs": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokerlogs.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MWAA.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MWAA.json index 19da48fd48cb1..a68436e435cce 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MWAA.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MWAA.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MWAA::Environment.LoggingConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Macie.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Macie.json index 1a8a900714e6e..c9e01f2b64c33 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Macie.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Macie.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Macie::AllowList.Criteria": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-allowlist-criteria.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ManagedBlockchain.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ManagedBlockchain.json index dfdf742c34e27..a44da4a53a984 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ManagedBlockchain.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ManagedBlockchain.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-approvalthresholdpolicy.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConnect.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConnect.json index 1ca5adfd00c52..85e9758814161 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConnect.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConnect.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MediaConnect::Bridge.BridgeFlowSource": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-bridge-bridgeflowsource.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConvert.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConvert.json index 427d1c2a00a20..218d825142f0a 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConvert.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaConvert.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MediaConvert::JobTemplate.AccelerationSettings": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-accelerationsettings.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaLive.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaLive.json index 1ae7355499b4e..34b02938d24f5 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaLive.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaLive.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MediaLive::Channel.AacSettings": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaPackage.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaPackage.json index 991c4f70671dc..19abba776ff2b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaPackage.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaPackage.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MediaPackage::Asset.EgressEndpoint": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaStore.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaStore.json index 94754dfb09dd9..ec3a20d403a13 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaStore.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaStore.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MediaStore::Container.CorsRule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaTailor.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaTailor.json index b9477a8aca1e8..bd08cbe8d07d0 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaTailor.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MediaTailor.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MediaTailor::PlaybackConfiguration.AdMarkerPassthrough": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediatailor-playbackconfiguration-admarkerpassthrough.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MemoryDB.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MemoryDB.json index faf398cb3862f..f6f0ac8eed325 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MemoryDB.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_MemoryDB.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::MemoryDB::Cluster.Endpoint": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-memorydb-cluster-endpoint.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Neptune.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Neptune.json index 1d320af7df7c3..6871e10adef36 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Neptune.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Neptune.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Neptune::DBCluster.DBClusterRole": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-neptune-dbcluster-dbclusterrole.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkFirewall.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkFirewall.json index 67b17cdd79a95..c94c310046aaf 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkFirewall.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkFirewall.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::NetworkFirewall::Firewall.SubnetMapping": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewall-subnetmapping.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkManager.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkManager.json index 0737207babd2d..1502ad9377fde 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkManager.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NetworkManager.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-connectattachment-connectattachmentoptions.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NimbleStudio.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NimbleStudio.json index ef1cc703c90cf..fc1e1b254bf9c 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NimbleStudio.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_NimbleStudio.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::NimbleStudio::LaunchProfile.StreamConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OSIS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OSIS.json index cd6af142651d6..b366f24276ca8 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OSIS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OSIS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::OSIS::Pipeline.CloudWatchLogDestination": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-cloudwatchlogdestination.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Oam.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Oam.json index b46cb48172c95..5f737ed64b096 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Oam.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Oam.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::Oam::Link": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Omics.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Omics.json index f3b89b5363682..81df1dc3b9687 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Omics.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Omics.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Omics::AnnotationStore.ReferenceItem": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-omics-annotationstore-referenceitem.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchServerless.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchServerless.json index d7b2a73a858c5..60349748529eb 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchServerless.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchServerless.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::OpenSearchServerless::SecurityConfig.SamlConfigOptions": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchserverless-securityconfig-samlconfigoptions.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchService.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchService.json index b6465559564d7..e4f4c887f796b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchService.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpenSearchService.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorks.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorks.json index 2ce9d7083eed7..da5a4d502b754 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorks.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorks.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::OpsWorks::App.DataSource": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorksCM.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorksCM.json index 76c27daebb26e..ba3a00db13b77 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorksCM.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_OpsWorksCM.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::OpsWorksCM::Server.EngineAttribute": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworkscm-server-engineattribute.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Organizations.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Organizations.json index 133045326f1f2..1a0d5b646239b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Organizations.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Organizations.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::Organizations::Account": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Panorama.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Panorama.json index fa0419995c07a..646d909984b94 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Panorama.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Panorama.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Panorama::ApplicationInstance.ManifestOverridesPayload": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-panorama-applicationinstance-manifestoverridespayload.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Personalize.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Personalize.json index a2d1628cfa640..ec1f8b623fc8d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Personalize.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Personalize.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Personalize::Dataset.DataSource": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-personalize-dataset-datasource.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pinpoint.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pinpoint.json index c538761814685..ad0916a1a9bf3 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pinpoint.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pinpoint.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Pinpoint::ApplicationSettings.CampaignHook": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-campaignhook.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_PinpointEmail.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_PinpointEmail.json index 4f26ae25d9f78..30252573dd20c 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_PinpointEmail.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_PinpointEmail.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::PinpointEmail::ConfigurationSet.DeliveryOptions": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-deliveryoptions.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pipes.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pipes.json index b9f13aa3b2ec3..abd08937d5f60 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pipes.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Pipes.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Pipes::Pipe.AwsVpcConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-awsvpcconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Proton.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Proton.json index 2278208373342..6d3ce8e8a8a30 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Proton.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Proton.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::Proton::EnvironmentAccountConnection": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QLDB.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QLDB.json index 06d553f8ba87d..f37e79fee4313 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QLDB.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QLDB.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::QLDB::Stream.KinesisConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qldb-stream-kinesisconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QuickSight.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QuickSight.json index 78c15b1cd9ec6..741e6d9c7720f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QuickSight.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_QuickSight.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::QuickSight::Analysis.AggregationFunction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-aggregationfunction.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RAM.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RAM.json index 6c916820cbfb0..2c1d5fa9803c9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RAM.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RAM.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::RAM::Permission": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RDS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RDS.json index 213db68196519..49198694cfcda 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RDS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RDS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::RDS::DBCluster.DBClusterRole": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-dbclusterrole.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RUM.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RUM.json index 46958fb0539ca..ca4fec6b3579e 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RUM.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RUM.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::RUM::AppMonitor.AppMonitorConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Redshift.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Redshift.json index 4412176156d44..d3fa0e5508db7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Redshift.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Redshift.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Redshift::Cluster.Endpoint": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RedshiftServerless.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RedshiftServerless.json index 2b065ffbc6285..7798ce911a963 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RedshiftServerless.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RedshiftServerless.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::RedshiftServerless::Namespace.Namespace": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshiftserverless-namespace-namespace.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RefactorSpaces.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RefactorSpaces.json index 2a41853ac303d..1ff10dcb07b16 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RefactorSpaces.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RefactorSpaces.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::RefactorSpaces::Application.ApiGatewayProxyInput": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-application-apigatewayproxyinput.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Rekognition.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Rekognition.json index 17683a9729344..e259ebde50327 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Rekognition.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Rekognition.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Rekognition::StreamProcessor.BoundingBox": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rekognition-streamprocessor-boundingbox.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResilienceHub.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResilienceHub.json index affabdfdae535..1591956be5717 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResilienceHub.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResilienceHub.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ResilienceHub::App.PhysicalResourceId": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-physicalresourceid.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceExplorer2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceExplorer2.json index 7a98bebcb9d1c..206bee5c066d5 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceExplorer2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceExplorer2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ResourceExplorer2::View.Filters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourceexplorer2-view-filters.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceGroups.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceGroups.json index 3c93914fa3760..9f89c3fbdcf6b 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceGroups.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ResourceGroups.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ResourceGroups::Group.ConfigurationItem": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationitem.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RoboMaker.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RoboMaker.json index 5cccbd1eafb45..ebb81c880cc12 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RoboMaker.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RoboMaker.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::RoboMaker::RobotApplication.RobotSoftwareSuite": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-robotsoftwaresuite.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RolesAnywhere.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RolesAnywhere.json index 78d4c567a58a4..e964e057d2601 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RolesAnywhere.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_RolesAnywhere.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::RolesAnywhere::TrustAnchor.Source": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-source.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53.json index 7eb826397c902..ae2f5f85d1660 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Route53::CidrCollection.Location": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-cidrcollection-location.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryControl.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryControl.json index 419959d55adc6..a556004cd7c4d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryControl.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryControl.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Route53RecoveryControl::Cluster.ClusterEndpoint": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-cluster-clusterendpoint.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryReadiness.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryReadiness.json index a146a286c2de1..7e22252ec6b1f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryReadiness.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53RecoveryReadiness.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53Resolver.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53Resolver.json index 4c739d5f7acd7..3e96d8d6e22be 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53Resolver.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Route53Resolver.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Route53Resolver::FirewallRuleGroup.FirewallRule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3.json index aea4d3bd419fa..91acab4c615cb 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::S3::AccessPoint.PublicAccessBlockConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-publicaccessblockconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3ObjectLambda.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3ObjectLambda.json index 40b3153abd834..57bd72e65e282 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3ObjectLambda.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3ObjectLambda.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::S3ObjectLambda::AccessPoint.Alias": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-alias.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3Outposts.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3Outposts.json index 36c9cb6495a8c..e419e9f258156 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3Outposts.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_S3Outposts.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::S3Outposts::AccessPoint.VpcConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-accesspoint-vpcconfiguration.html", @@ -136,6 +136,23 @@ } } }, + "AWS::S3Outposts::Endpoint.FailedReason": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-endpoint-failedreason.html", + "Properties": { + "ErrorCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-endpoint-failedreason.html#cfn-s3outposts-endpoint-failedreason-errorcode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Message": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-endpoint-failedreason.html#cfn-s3outposts-endpoint-failedreason-message", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::S3Outposts::Endpoint.NetworkInterface": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-endpoint-networkinterface.html", "Properties": { @@ -272,6 +289,12 @@ "Required": false, "UpdateType": "Immutable" }, + "FailedReason": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-failedreason", + "Required": false, + "Type": "FailedReason", + "UpdateType": "Mutable" + }, "OutpostId": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-outpostid", "PrimitiveType": "String", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SDB.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SDB.json index afdd19a420932..59ded78c6f122 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SDB.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SDB.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::SDB::Domain": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SES.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SES.json index 20c885327b9dc..121daa07b76ce 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SES.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SES.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SES::ConfigurationSet.DashboardOptions": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationset-dashboardoptions.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SNS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SNS.json index 6a953c86cbb48..7608e188234bc 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SNS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SNS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SNS::Topic.Subscription": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic-subscription.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SQS.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SQS.json index ebb81efce9ebe..73b14866ce5c6 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SQS.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SQS.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::SQS::Queue": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSM.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSM.json index 6234a97ab02d8..e06614341692f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSM.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSM.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SSM::Association.InstanceAssociationOutputLocation": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-instanceassociationoutputlocation.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMContacts.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMContacts.json index 9ab09f1ee1a1c..619fb6444a722 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMContacts.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMContacts.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SSMContacts::Contact.ChannelTargetInfo": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-channeltargetinfo.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMIncidents.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMIncidents.json index abadc225b5b27..772ed00f09fa9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMIncidents.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSMIncidents.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SSMIncidents::ReplicationSet.RegionConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-replicationset-regionconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSO.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSO.json index 3ff65b812d9c5..2e6afc022c0a7 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSO.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SSO.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattribute.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SageMaker.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SageMaker.json index 4b8c01b1d034e..fb67176046f4f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SageMaker.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SageMaker.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SageMaker::App.ResourceSpec": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Scheduler.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Scheduler.json index 644002aa51d90..5647368499e10 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Scheduler.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Scheduler.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Scheduler::Schedule.AwsVpcConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-scheduler-schedule-awsvpcconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecretsManager.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecretsManager.json index 6b6695e53a41b..f3cf654e04293 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecretsManager.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecretsManager.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SecretsManager::RotationSchedule.HostedRotationLambda": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecurityHub.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecurityHub.json index c800319d03dfe..ca57068e6da1a 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecurityHub.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SecurityHub.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SecurityHub::AutomationRule.AutomationRulesAction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-automationrule-automationrulesaction.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalog.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalog.json index b6b2c98746d36..93385ed63b591 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalog.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalog.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ServiceCatalog::CloudFormationProduct.CodeStarParameters": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationproduct-codestarparameters.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalogAppRegistry.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalogAppRegistry.json index 8ff0de4938701..a2ca6bcd07c94 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalogAppRegistry.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceCatalogAppRegistry.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::ServiceCatalogAppRegistry::Application": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceDiscovery.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceDiscovery.json index 004e5a9af210f..ef400ef2e7ace 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceDiscovery.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_ServiceDiscovery.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-privatednspropertiesmutable.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Shield.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Shield.json index fdc1bf902d293..69199d477c018 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Shield.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Shield.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Shield::ProactiveEngagement.EmergencyContact": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-shield-proactiveengagement-emergencycontact.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Signer.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Signer.json index 04fb4c403b482..2a782d235eea1 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Signer.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Signer.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Signer::SigningProfile.SignatureValidityPeriod": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-signer-signingprofile-signaturevalidityperiod.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SimSpaceWeaver.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SimSpaceWeaver.json index 3a0ff6c95421d..06df4495a346f 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SimSpaceWeaver.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SimSpaceWeaver.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SimSpaceWeaver::Simulation.S3Location": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simspaceweaver-simulation-s3location.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_StepFunctions.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_StepFunctions.json index 5e5a9bcfcb56f..468830ca1a0a0 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_StepFunctions.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_StepFunctions.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::StepFunctions::Activity.TagsEntry": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-tagsentry.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SupportApp.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SupportApp.json index fa3168ac3b645..8649f3df164fe 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SupportApp.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SupportApp.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": {}, "ResourceTypes": { "AWS::SupportApp::AccountAlias": { diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Synthetics.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Synthetics.json index 8bf0653b2d11c..2812b16de60fe 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Synthetics.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Synthetics.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Synthetics::Canary.ArtifactConfig": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-artifactconfig.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SystemsManagerSAP.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SystemsManagerSAP.json index d6a3b1a79d55f..7e306748148cf 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SystemsManagerSAP.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_SystemsManagerSAP.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::SystemsManagerSAP::Application.Credential": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-systemsmanagersap-application-credential.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Timestream.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Timestream.json index b9ffba944fad3..1c7b7e5a7d17a 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Timestream.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Timestream.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Timestream::ScheduledQuery.DimensionMapping": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-dimensionmapping.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Transfer.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Transfer.json index f0cbfc799aedc..b0b51ff503266 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Transfer.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Transfer.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Transfer::Connector.As2Config": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-connector-as2config.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VerifiedPermissions.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VerifiedPermissions.json index 17545a1519644..3c6339d16e42e 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VerifiedPermissions.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VerifiedPermissions.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-cognitouserpoolconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VoiceID.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VoiceID.json index b8f4031e4b033..8b207f1c4a067 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VoiceID.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VoiceID.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::VoiceID::Domain.ServerSideEncryptionConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-voiceid-domain-serversideencryptionconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VpcLattice.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VpcLattice.json index effc1d8ee622c..a91dc51bdc0c8 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VpcLattice.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_VpcLattice.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::VpcLattice::Listener.DefaultAction": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-vpclattice-listener-defaultaction.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAF.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAF.json index 0d501770a9bb8..0a3e07814e71e 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAF.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAF.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::WAF::ByteMatchSet.ByteMatchTuple": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFRegional.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFRegional.json index 345f566ecc618..2f490398b71c6 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFRegional.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFRegional.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFv2.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFv2.json index 94db988d3f7ea..b0dd10994355e 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFv2.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WAFv2.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::WAFv2::LoggingConfiguration.ActionCondition": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-actioncondition.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Wisdom.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Wisdom.json index f4b3431c79bfb..1dec105dc7575 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Wisdom.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_Wisdom.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-assistant-serversideencryptionconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WorkSpaces.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WorkSpaces.json index 006cb90675682..d645fda38b215 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WorkSpaces.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_WorkSpaces.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-connectionalias-connectionaliasassociation.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_XRay.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_XRay.json index 57961cca00dc9..936548856834a 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_XRay.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_XRay.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::XRay::Group.InsightsConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-group-insightsconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Alexa_ASK.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Alexa_ASK.json index e1f5c2034ee61..432f09f9b426d 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Alexa_ASK.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Alexa_ASK.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "Alexa::ASK::Skill.AuthenticationConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-authenticationconfiguration.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Tag.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Tag.json index 416931cd75813..c2a526e5eb1f8 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Tag.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_Tag.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "Tag": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/001_Version.json b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/001_Version.json index b007b95c914cf..7c24340e5c63e 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/001_Version.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/001_Version.json @@ -1,3 +1,3 @@ { - "ResourceSpecificationVersion": "130.0.0" + "ResourceSpecificationVersion": "130.1.0" } diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/000_AWS_DeviceFarm.json b/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/000_AWS_DeviceFarm.json index 3db1e9178bbfe..3bcc91253baa5 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/000_AWS_DeviceFarm.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/000_AWS_DeviceFarm.json @@ -1,5 +1,5 @@ { - "$version": "130.0.0", + "$version": "130.1.0", "PropertyTypes": { "AWS::DeviceFarm::DevicePool.Rule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devicefarm-devicepool-rule.html", diff --git a/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/001_Version.json b/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/001_Version.json index b007b95c914cf..7c24340e5c63e 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/001_Version.json +++ b/packages/@aws-cdk/cfnspec/spec-source/specification/001_cfn_us-west-2/000_official/001_Version.json @@ -1,3 +1,3 @@ { - "ResourceSpecificationVersion": "130.0.0" + "ResourceSpecificationVersion": "130.1.0" } diff --git a/packages/aws-cdk-lib/aws-apigateway/README.md b/packages/aws-cdk-lib/aws-apigateway/README.md index 3008ba27848b3..68634e9f3528a 100644 --- a/packages/aws-cdk-lib/aws-apigateway/README.md +++ b/packages/aws-cdk-lib/aws-apigateway/README.md @@ -63,9 +63,11 @@ book.addMethod('DELETE'); To give an IAM User or Role permission to invoke a method, use `grantExecute`: ```ts -declare user: iam.User; -const books = api.root.addResource('books'); -books.grantExecute(user); +declare const api: apigateway.RestApi; +declare const user: iam.User; + +const method = api.root.addResource('books').addMethod('GET'); +method.grantExecute(user); ``` ## AWS Lambda-backed APIs diff --git a/packages/aws-cdk-lib/aws-appmesh/README.md b/packages/aws-cdk-lib/aws-appmesh/README.md index fb1eefa3d4536..78cb0154c2c72 100644 --- a/packages/aws-cdk-lib/aws-appmesh/README.md +++ b/packages/aws-cdk-lib/aws-appmesh/README.md @@ -233,7 +233,7 @@ const node = new appmesh.VirtualNode(this, 'node', { By using a key-value pair indexed signature, you can specify json key pairs to customize the log entry pattern. You can also use text format as below. You can only specify one of these 2 formats. -```ts +```text accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout', appmesh.LoggingFormat.fromText('test_pattern')), ``` diff --git a/packages/aws-cdk-lib/aws-appsync/README.md b/packages/aws-cdk-lib/aws-appsync/README.md index 4b14d3a147096..bd67a20ec5e65 100644 --- a/packages/aws-cdk-lib/aws-appsync/README.md +++ b/packages/aws-cdk-lib/aws-appsync/README.md @@ -220,8 +220,8 @@ const httpDs = api.addHttpDataSource( authorizationConfig: { signingRegion: 'us-east-1', signingServiceName: 'states', - } - } + }, + }, ); httpDs.createResolver('MutationCallStepFunctionResolver', { @@ -302,12 +302,14 @@ events. More information can be found CDK stack file `app-stack.ts`: ```ts -const api = new appsync.GraphqlApi(stack, 'EventBridgeApi', { +import * as events from 'aws-cdk-lib/aws-events'; + +const api = new appsync.GraphqlApi(this, 'EventBridgeApi', { name: 'EventBridgeApi', schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.eventbridge.graphql')), }); -const bus = new events.EventBus(stack, 'DestinationEventBus', {}); +const bus = new events.EventBus(this, 'DestinationEventBus', {}); const dataSource = api.addEventBridgeDataSource('NoneDS', bus); @@ -468,15 +470,15 @@ sources and resolvers, an `apiId` is sufficient. By default all AppSync GraphQL APIs are public and can be accessed from the internet. For customers that want to limit access to be from their VPC, the optional API `visibility` property can be set to `Visibility.PRIVATE` at creation time. To explicitly create a public API, the `visibility` property should be set to `Visibility.GLOBAL`. -If visbility is not set, the service will default to `GLOBAL`. +If visibility is not set, the service will default to `GLOBAL`. CDK stack file `app-stack.ts`: ```ts -const api = new appsync.GraphqlApi(stack, 'api', { +const api = new appsync.GraphqlApi(this, 'api', { name: 'MyPrivateAPI', schema: appsync.SchemaFile.fromAsset(path.join(__dirname, 'appsync.schema.graphql')), - visbility: appsync.Visibility.PRIVATE, + visibility: appsync.Visibility.PRIVATE, }); ``` diff --git a/packages/aws-cdk-lib/aws-backupgateway/README.md b/packages/aws-cdk-lib/aws-backupgateway/README.md index 71de5ac737451..1eb7cabfc3507 100644 --- a/packages/aws-cdk-lib/aws-backupgateway/README.md +++ b/packages/aws-cdk-lib/aws-backupgateway/README.md @@ -16,7 +16,7 @@ This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture -import * as backupgateway from '@aws-cdk/aws-backupgateway'; +import * as backupgateway from 'aws-cdk-lib/aws-backupgateway'; ``` diff --git a/packages/aws-cdk-lib/aws-cleanrooms/README.md b/packages/aws-cdk-lib/aws-cleanrooms/README.md index 117249fc13e53..d5704db2b153e 100644 --- a/packages/aws-cdk-lib/aws-cleanrooms/README.md +++ b/packages/aws-cdk-lib/aws-cleanrooms/README.md @@ -16,7 +16,7 @@ This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture -import * as cleanrooms from '@aws-cdk/aws-cleanrooms'; +import * as cleanrooms from 'aws-cdk-lib/aws-cleanrooms'; ``` diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/README.md b/packages/aws-cdk-lib/aws-codepipeline-actions/README.md index e5a2b9976c60f..4ec898d87b14d 100644 --- a/packages/aws-cdk-lib/aws-codepipeline-actions/README.md +++ b/packages/aws-cdk-lib/aws-codepipeline-actions/README.md @@ -857,9 +857,11 @@ Here's an example: To use an S3 Bucket as a deployment target in CodePipeline: ```ts +import * as kms from 'aws-cdk-lib/aws-kms'; + const sourceOutput = new codepipeline.Artifact(); const targetBucket = new s3.Bucket(this, 'MyBucket'); -const key: kms.IKey = new kms.Key(stack, 'EnvVarEncryptKey', { +const key: kms.IKey = new kms.Key(this, 'EnvVarEncryptKey', { description: 'sample key', }); diff --git a/packages/aws-cdk-lib/aws-ec2/README.md b/packages/aws-cdk-lib/aws-ec2/README.md index 389bac824a51f..50a9ed93d6372 100644 --- a/packages/aws-cdk-lib/aws-ec2/README.md +++ b/packages/aws-cdk-lib/aws-ec2/README.md @@ -392,6 +392,22 @@ beforehand. This can be useful for configuring routing using a combination of gateways: for more information see [Routing](#routing) below. +### Disabling the creation of the default internet gateway + +If you need to control the creation of the internet gateway explicitly, +you can disable the creation of the default one using the `createInternetGateway` +property: + +```ts +const vpc = new ec2.Vpc(this, "VPC", { + createInternetGateway: false, + subnetConfiguration: [{ + subnetType: ec2.SubnetType.PUBLIC, + name: 'Public', + }] +}); +``` + #### Routing It's possible to add routes to any subnets using the `addRoute()` method. If for @@ -1846,8 +1862,6 @@ an instance. For information on Launch Templates please see the The following demonstrates how to create a launch template with an Amazon Machine Image, security group, and an instance profile. ```ts -import * as iam from 'aws-cdk-lib/aws-iam'; - declare const vpc: ec2.Vpc; const role = new iam.Role(this, 'Role', { @@ -1881,14 +1895,16 @@ new ec2.LaunchTemplate(this, 'LaunchTemplate', { And the following demonstrates how to add one or more security groups to launch template. ```ts -const sg1 = new ec2.SecurityGroup(stack, 'sg1', { +declare const vpc: ec2.Vpc; + +const sg1 = new ec2.SecurityGroup(this, 'sg1', { vpc: vpc, }); -const sg2 = new ec2.SecurityGroup(stack, 'sg2', { +const sg2 = new ec2.SecurityGroup(this, 'sg2', { vpc: vpc, }); -const launchTemplate = new ec2.LaunchTemplate(stack, 'LaunchTemplate', { +const launchTemplate = new ec2.LaunchTemplate(this, 'LaunchTemplate', { machineImage: ec2.MachineImage.latestAmazonLinux2022(), securityGroup: sg1, }); @@ -1899,8 +1915,8 @@ launchTemplate.addSecurityGroup(sg2); To use [AWS Systems Manager parameters instead of AMI IDs](https://docs.aws.amazon.com/autoscaling/ec2/userguide/using-systems-manager-parameters.html) in launch templates and resolve the AMI IDs at instance launch time: ```ts -const launchTemplate = new ec2.LaunchTemplate(stack, 'LaunchTemplate', { - machineImage: ec2.MachineImage.resolveSsmParameterAtLaunch('parameterName'); +const launchTemplate = new ec2.LaunchTemplate(this, 'LaunchTemplate', { + machineImage: ec2.MachineImage.resolveSsmParameterAtLaunch('parameterName'), }); ``` diff --git a/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts b/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts index 2721cf61412b6..e30ba479f34bf 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/launch-template.ts @@ -245,15 +245,14 @@ export interface LaunchTemplateProps { /** * An IAM role to associate with the instance profile that is used by instances. * - * The role must be assumable by the service principal `ec2.amazonaws.com`: + * The role must be assumable by the service principal `ec2.amazonaws.com`. + * Note: You can provide an instanceProfile or a role, but not both. * * @example * const role = new iam.Role(this, 'MyRole', { * assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com') * }); * - * Note: You can provide an instanceProfile or a role, but not both. - * * @default - No new role is created. */ readonly role?: iam.IRole; diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts index 271b48efe3c38..f67991963f240 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts @@ -1088,6 +1088,13 @@ export interface VpcProps { * @default true if '@aws-cdk/aws-ec2:restrictDefaultSecurityGroup' is enabled, false otherwise */ readonly restrictDefaultSecurityGroup?: boolean; + + /** + * If set to false then disable the creation of the default internet gateway + * + * @default true + */ + readonly createInternetGateway?: boolean; } /** @@ -1482,11 +1489,12 @@ export class Vpc extends VpcBase { // subnetConfiguration must be set before calling createSubnets this.createSubnets(); + const createInternetGateway = props.createInternetGateway ?? true; const allowOutbound = this.subnetConfiguration.filter( subnet => (subnet.subnetType !== SubnetType.PRIVATE_ISOLATED && subnet.subnetType !== SubnetType.ISOLATED)).length > 0; // Create an Internet Gateway and attach it if necessary - if (allowOutbound) { + if (allowOutbound && createInternetGateway) { const igw = new CfnInternetGateway(this, 'IGW', { }); diff --git a/packages/aws-cdk-lib/aws-ec2/test/vpc.test.ts b/packages/aws-cdk-lib/aws-ec2/test/vpc.test.ts index 64f046e48b670..c62567345a929 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/vpc.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/vpc.test.ts @@ -281,6 +281,26 @@ describe('vpc', () => { Template.fromStack(stack).resourceCountIs('AWS::EC2::NatGateway', 0); }); + + test('with createInternetGateway: false, the VPC should not have an IGW nor NAT Gateways', () => { + const stack = getTestStack(); + new Vpc(stack, 'TheVPC', { + createInternetGateway: false, + subnetConfiguration: [ + { + subnetType: SubnetType.PUBLIC, + name: 'Public', + }, + { + subnetType: SubnetType.PRIVATE_ISOLATED, + name: 'Isolated', + }, + ], + }); + Template.fromStack(stack).resourceCountIs('AWS::EC2::InternetGateway', 0); + Template.fromStack(stack).resourceCountIs('AWS::EC2::NatGateway', 0); + }); + test('with private subnets and custom networkAcl.', () => { const stack = getTestStack(); const vpc = new Vpc(stack, 'TheVPC', { diff --git a/packages/aws-cdk-lib/aws-ecr/README.md b/packages/aws-cdk-lib/aws-ecr/README.md index e88a076d94bc2..288b91f214fe1 100644 --- a/packages/aws-cdk-lib/aws-ecr/README.md +++ b/packages/aws-cdk-lib/aws-ecr/README.md @@ -1,6 +1,5 @@ # Amazon ECR Construct Library - This package contains constructs for working with Amazon Elastic Container Registry. ## Repositories @@ -14,7 +13,10 @@ const repository = new ecr.Repository(this, 'Repository'); ## Image scanning -Amazon ECR image scanning helps in identifying software vulnerabilities in your container images. You can manually scan container images stored in Amazon ECR, or you can configure your repositories to scan images when you push them to a repository. To create a new repository to scan on push, simply enable `imageScanOnPush` in the properties +Amazon ECR image scanning helps in identifying software vulnerabilities in your container images. +You can manually scan container images stored in Amazon ECR, or you can configure your repositories +to scan images when you push them to a repository. To create a new repository to scan on push, simply +enable `imageScanOnPush` in the properties. ```ts const repository = new ecr.Repository(this, 'Repo', { @@ -76,6 +78,8 @@ The grantPush method grants the specified IAM entity (the grantee) permission to Here is an example of granting a user push permissions: ```ts +declare const repository: ecr.Repository; + const role = new iam.Role(this, 'Role', { assumedBy: new iam.ServicePrincipal('codebuild.amazonaws.com'), }); @@ -91,6 +95,8 @@ The grantPull method grants the specified IAM entity (the grantee) permission to - 'ecr:GetAuthorizationToken' ```ts +declare const repository: ecr.Repository; + const role = new iam.Role(this, 'Role', { assumedBy: new iam.ServicePrincipal('codebuild.amazonaws.com'), }); @@ -103,6 +109,8 @@ The grantPullPush method grants the specified IAM entity (the grantee) permissio Here is an example of granting a user both pull and push permissions: ```ts +declare const repository: ecr.Repository; + const role = new iam.Role(this, 'Role', { assumedBy: new iam.ServicePrincipal('codebuild.amazonaws.com'), }); diff --git a/packages/aws-cdk-lib/aws-ecs/README.md b/packages/aws-cdk-lib/aws-ecs/README.md index ac10f5c8d9dc6..c050947d2c93e 100644 --- a/packages/aws-cdk-lib/aws-ecs/README.md +++ b/packages/aws-cdk-lib/aws-ecs/README.md @@ -631,15 +631,17 @@ changes the status of the primary deployment to COMPLETED. ```ts import * as cw from 'aws-cdk-lib/aws-cloudwatch'; + declare const cluster: ecs.Cluster; declare const taskDefinition: ecs.TaskDefinition; -declare const elbAlarm: cloudwatch.Alarm; +declare const elbAlarm: cw.Alarm; + const service = new ecs.FargateService(this, 'Service', { cluster, taskDefinition, deploymentAlarms: { - alarms: [elbAlarm.alarmName] - behavior: AlarmBehavior.ROLLBACK_ON_ALARM, + alarmNames: [elbAlarm.alarmName], + behavior: ecs.AlarmBehavior.ROLLBACK_ON_ALARM, }, }); @@ -651,8 +653,11 @@ new cw.Alarm(this, 'CPUAlarm', { evaluationPeriods: 2, threshold: 80, }); -service.enableDeploymentAlarms([cpuAlarmName], AlarmBehavior.FAIL_ON_ALARM); +service.enableDeploymentAlarms([cpuAlarmName], { + behavior: ecs.AlarmBehavior.FAIL_ON_ALARM, +}); ``` + > Note: Deployment alarms are only available when `deploymentController` is set > to `DeploymentControllerType.ECS`, which is the default. @@ -685,8 +690,10 @@ there are two options to avoid the circular dependency. Option 1, defining a physical name for the alarm: ```ts import * as cw from 'aws-cdk-lib/aws-cloudwatch'; + declare const cluster: ecs.Cluster; declare const taskDefinition: ecs.TaskDefinition; + const service = new ecs.FargateService(this, 'Service', { cluster, taskDefinition, @@ -701,13 +708,16 @@ const myAlarm = new cw.Alarm(this, 'CPUAlarm', { }); // Using `myAlarm.alarmName` here will cause a circular dependency -service.enableDeploymentAlarms([cpuAlarmName], AlarmBehavior.FAIL_ON_ALARM); +service.enableDeploymentAlarms([cpuAlarmName], { + behavior: ecs.AlarmBehavior.FAIL_ON_ALARM, +}); ``` Option 2, defining a physical name for the service: + ```ts -import * as cdk from 'aws-cdk-lib' import * as cw from 'aws-cdk-lib/aws-cloudwatch'; + declare const cluster: ecs.Cluster; declare const taskDefinition: ecs.TaskDefinition; const serviceName = 'MyFargateService'; @@ -717,25 +727,27 @@ const service = new ecs.FargateService(this, 'Service', { taskDefinition, }); -const cpuMetric = new cw.Metric( - metricName: 'CPUUtilization' - namespace: 'AWS/ECS' - period: cdk.Duration.minutes(5), +const cpuMetric = new cw.Metric({ + metricName: 'CPUUtilization', + namespace: 'AWS/ECS', + period: Duration.minutes(5), statistic: 'Average', dimensionsMap: { ClusterName: cluster.clusterName, // Using `service.serviceName` here will cause a circular dependency ServiceName: serviceName, }, -); +}); const myAlarm = new cw.Alarm(this, 'CPUAlarm', { - alarmName: cpuAlarmName, + alarmName: 'cpuAlarmName', metric: cpuMetric, evaluationPeriods: 2, threshold: 80, }); -service.enableDeploymentAlarms([myAlarm.alarmName], AlarmBehavior.FAIL_ON_ALARM); +service.enableDeploymentAlarms([myAlarm.alarmName], { + behavior: ecs.AlarmBehavior.FAIL_ON_ALARM, +}); ``` This issue only applies if the metrics to alarm on are emitted by the service diff --git a/packages/aws-cdk-lib/aws-ecs/lib/amis.ts b/packages/aws-cdk-lib/aws-ecs/lib/amis.ts index 7069cf43644c5..9d68b2dc7fce9 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/amis.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/amis.ts @@ -31,6 +31,7 @@ export enum AmiHardwareType { * ECS-optimized Windows version list */ export enum WindowsOptimizedVersion { + SERVER_2022 = '2022', SERVER_2019 = '2019', SERVER_2016 = '2016', } @@ -134,13 +135,14 @@ export class EcsOptimizedAmi implements ec2.IMachineImage { } // set the SSM parameter name - this.amiParameterName = '/aws/service/ecs/optimized-ami/' + this.amiParameterName = '/aws/service/' + + (this.windowsVersion ? 'ami-windows-latest/' : 'ecs/optimized-ami/') + (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX ? 'amazon-linux/' : '') + (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX_2 ? 'amazon-linux-2/' : '') - + (this.windowsVersion ? `windows_server/${this.windowsVersion}/english/full/` : '') + + (this.windowsVersion ? `Windows_Server-${this.windowsVersion}-English-Full-ECS_Optimized/` : '') + (this.hwType === AmiHardwareType.GPU ? 'gpu/' : '') + (this.hwType === AmiHardwareType.ARM ? 'arm64/' : '') - + 'recommended/image_id'; + + (this.windowsVersion ? 'image_id' : 'recommended/image_id'); this.cachedInContext = props?.cachedInContext ?? false; } @@ -247,13 +249,14 @@ export class EcsOptimizedImage implements ec2.IMachineImage { } // set the SSM parameter name - this.amiParameterName = '/aws/service/ecs/optimized-ami/' + this.amiParameterName = '/aws/service/' + + (this.windowsVersion ? 'ami-windows-latest/' : 'ecs/optimized-ami/') + (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX ? 'amazon-linux/' : '') + (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX_2 ? 'amazon-linux-2/' : '') - + (this.windowsVersion ? `windows_server/${this.windowsVersion}/english/full/` : '') + + (this.windowsVersion ? `Windows_Server-${this.windowsVersion}-English-Full-ECS_Optimized/` : '') + (this.hwType === AmiHardwareType.GPU ? 'gpu/' : '') + (this.hwType === AmiHardwareType.ARM ? 'arm64/' : '') - + 'recommended/image_id'; + + (this.windowsVersion ? 'image_id' : 'recommended/image_id'); this.cachedInContext = props?.cachedInContext ?? false; } diff --git a/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts b/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts index 60af60677adfb..a05083dcc0a5c 100644 --- a/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts @@ -792,7 +792,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::LaunchConfiguration', { ImageId: { - Ref: 'SsmParameterValueawsserviceecsoptimizedamiwindowsserver2019englishfullrecommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter', + Ref: 'SsmParameterValueawsserviceamiwindowslatestWindowsServer2019EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter', }, InstanceType: 't2.micro', IamInstanceProfile: { @@ -901,9 +901,9 @@ describe('cluster', () => { const assembly = app.synth(); const template = assembly.getStackByName(stack.stackName).template; expect(template.Parameters).toEqual({ - SsmParameterValueawsserviceecsoptimizedamiwindowsserver2019englishfullrecommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter: { + SsmParameterValueawsserviceamiwindowslatestWindowsServer2019EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter: { Type: 'AWS::SSM::Parameter::Value', - Default: '/aws/service/ecs/optimized-ami/windows_server/2019/english/full/recommended/image_id', + Default: '/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-ECS_Optimized/image_id', }, }); @@ -1135,9 +1135,9 @@ describe('cluster', () => { const assembly = app.synth(); const template = assembly.getStackByName(stack.stackName).template; expect(template.Parameters).toEqual({ - SsmParameterValueawsserviceecsoptimizedamiwindowsserver2019englishfullrecommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter: { + SsmParameterValueawsserviceamiwindowslatestWindowsServer2019EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter: { Type: 'AWS::SSM::Parameter::Value', - Default: '/aws/service/ecs/optimized-ami/windows_server/2019/english/full/recommended/image_id', + Default: '/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-ECS_Optimized/image_id', }, }); diff --git a/packages/aws-cdk-lib/aws-eks/README.md b/packages/aws-cdk-lib/aws-eks/README.md index d8bff843d4667..9aa98935a79af 100644 --- a/packages/aws-cdk-lib/aws-eks/README.md +++ b/packages/aws-cdk-lib/aws-eks/README.md @@ -654,6 +654,12 @@ You can optionally choose to configure your cluster to use IPv6 using the [`ipFa ```ts declare const vpc: ec2.Vpc; +function associateSubnetWithV6Cidr(vpc: ec2.Vpc, count: number, subnet: ec2.ISubnet) { + const cfnSubnet = subnet.node.defaultChild as ec2.CfnSubnet; + cfnSubnet.ipv6CidrBlock = Fn.select(count, Fn.cidr(Fn.select(0, vpc.vpcIpv6CidrBlocks), 256, (128 - 64).toString())); + cfnSubnet.assignIpv6AddressOnCreation = true; +} + // make an ipv6 cidr const ipv6cidr = new ec2.CfnVPCCidrBlock(this, 'CIDR6', { vpcId: vpc.vpcId, @@ -662,20 +668,20 @@ const ipv6cidr = new ec2.CfnVPCCidrBlock(this, 'CIDR6', { // connect the ipv6 cidr to all vpc subnets let subnetcount = 0; -let subnets = [...vpc.publicSubnets, ...vpc.privateSubnets]; -for ( let subnet of subnets) { +const subnets = vpc.publicSubnets.concat(vpc.privateSubnets); +for (let subnet of subnets) { // Wait for the ipv6 cidr to complete subnet.node.addDependency(ipv6cidr); - this._associate_subnet_with_v6_cidr(subnetcount, subnet); - subnetcount++; + associateSubnetWithV6Cidr(vpc, subnetcount, subnet); + subnetcount = subnetcount + 1; } const cluster = new eks.Cluster(this, 'hello-eks', { + version: eks.KubernetesVersion.V1_27, vpc: vpc, ipFamily: eks.IpFamily.IP_V6, - vpcSubnets: [{ subnets: [...vpc.publicSubnets] }], + vpcSubnets: [{ subnets: vpc.publicSubnets }], }); - ``` ### Kubectl Support diff --git a/packages/aws-cdk-lib/aws-events-targets/README.md b/packages/aws-cdk-lib/aws-events-targets/README.md index 085245218edf3..8675ddca64151 100644 --- a/packages/aws-cdk-lib/aws-events-targets/README.md +++ b/packages/aws-cdk-lib/aws-events-targets/README.md @@ -365,26 +365,27 @@ can use the `tags` array. Both of these fields can be used together or separatel to set tags on the triggered task. ```ts -import * as ecs from "aws-cdk-lib/aws-ecs" -declare const cluster: ecs.ICluster -declare const taskDefinition: ecs.TaskDefinition +import * as ecs from 'aws-cdk-lib/aws-ecs'; + +declare const cluster: ecs.ICluster; +declare const taskDefinition: ecs.TaskDefinition; const rule = new events.Rule(this, 'Rule', { schedule: events.Schedule.rate(cdk.Duration.hours(1)), }); rule.addTarget( - new targets.EcsTask( { - cluster: cluster, - taskDefinition: taskDefinition, - propagateTags: ecs.PropagatedTagSource.TASK_DEFINITION, - tags: [ - { - key: 'my-tag', - value: 'my-tag-value', - }, - ], - }) + new targets.EcsTask({ + cluster: cluster, + taskDefinition: taskDefinition, + propagateTags: ecs.PropagatedTagSource.TASK_DEFINITION, + tags: [ + { + key: 'my-tag', + value: 'my-tag-value', + }, + ], + }), ); ``` @@ -395,9 +396,11 @@ If you want to detach the public IP address from the task, you have to set the f You can specify the flag `true` only when the launch type is set to FARGATE. ```ts -import * as ecs from "aws-cdk-lib/aws-ecs" -declare const cluster: ecs.ICluster -declare const taskDefinition: ecs.TaskDefinition +import * as ecs from 'aws-cdk-lib/aws-ecs'; +import * as ec2 from 'aws-cdk-lib/aws-ec2'; + +declare const cluster: ecs.ICluster; +declare const taskDefinition: ecs.TaskDefinition; const rule = new events.Rule(this, 'Rule', { schedule: events.Schedule.rate(cdk.Duration.hours(1)), @@ -411,7 +414,6 @@ rule.addTarget( subnetSelection: { subnetType: ec2.SubnetType.PUBLIC }, }), ); -declare const rule: events.Rule ``` ### enable Amazon ECS Exec for ECS Task @@ -419,9 +421,10 @@ declare const rule: events.Rule If you use Amazon ECS Exec, you can run commands in or get a shell to a container running on an Amazon EC2 instance or on AWS Fargate. ```ts -import * as ecs from "aws-cdk-lib/aws-ecs" -declare const cluster: ecs.ICluster -declare const taskDefinition: ecs.TaskDefinition +import * as ecs from 'aws-cdk-lib/aws-ecs'; + +declare const cluster: ecs.ICluster; +declare const taskDefinition: ecs.TaskDefinition; const rule = new events.Rule(this, 'Rule', { schedule: events.Schedule.rate(cdk.Duration.hours(1)), diff --git a/packages/aws-cdk-lib/aws-iam/README.md b/packages/aws-cdk-lib/aws-iam/README.md index b6079aa8c3b54..f65db55f9f482 100644 --- a/packages/aws-cdk-lib/aws-iam/README.md +++ b/packages/aws-cdk-lib/aws-iam/README.md @@ -382,28 +382,28 @@ const policyDocument = { "Sid": "FirstStatement", "Effect": "Allow", "Action": ["iam:ChangePassword"], - "Resource": "*" + "Resource": ["*"], }, { "Sid": "SecondStatement", "Effect": "Allow", - "Action": "s3:ListAllMyBuckets", - "Resource": "*" + "Action": ["s3:ListAllMyBuckets"], + "Resource": ["*"], }, { "Sid": "ThirdStatement", "Effect": "Allow", "Action": [ "s3:List*", - "s3:Get*" + "s3:Get*", ], "Resource": [ "arn:aws:s3:::confidential-data", - "arn:aws:s3:::confidential-data/*" + "arn:aws:s3:::confidential-data/*", ], - "Condition": {"Bool": {"aws:MultiFactorAuthPresent": "true"}} - } - ] + "Condition": {"Bool": {"aws:MultiFactorAuthPresent": "true"}}, + }, + ], }; const customPolicyDocument = iam.PolicyDocument.fromJson(policyDocument); @@ -785,7 +785,7 @@ const role = new iam.Role(this, 'Role', { assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com'), }); -const instanceProfile = iam.InstanceProfile.fromInstanceAttributes(this, 'ImportedInstanceProfile', { +const instanceProfile = iam.InstanceProfile.fromInstanceProfileAttributes(this, 'ImportedInstanceProfile', { instanceProfileArn: 'arn:aws:iam::account-id:instance-profile/MyInstanceProfile', role, }); @@ -794,8 +794,8 @@ const instanceProfile = iam.InstanceProfile.fromInstanceAttributes(this, 'Import ## Features * Policy name uniqueness is enforced. If two policies by the same name are attached to the same - principal, the attachment will fail. + principal, the attachment will fail. * Policy names are not required - the CDK logical ID will be used and ensured to be unique. * Policies are validated during synthesis to ensure that they have actions, and that policies - attached to IAM principals specify relevant resources, while policies attached to resources - specify which IAM principals they apply to. + attached to IAM principals specify relevant resources, while policies attached to resources + specify which IAM principals they apply to. diff --git a/packages/aws-cdk-lib/aws-lambda/README.md b/packages/aws-cdk-lib/aws-lambda/README.md index c3eaefbfe74da..3c5ed908b91c0 100644 --- a/packages/aws-cdk-lib/aws-lambda/README.md +++ b/packages/aws-cdk-lib/aws-lambda/README.md @@ -591,15 +591,15 @@ Lambda functions can be configured to use the Parameters and Secrets Extension. import * as sm from 'aws-cdk-lib/aws-secretsmanager'; import * as ssm from 'aws-cdk-lib/aws-ssm'; -const secret = new sm.Secret(stack, 'Secret'); -const parameter = new ssm.StringParameter(stack, 'Parameter', { +const secret = new sm.Secret(this, 'Secret'); +const parameter = new ssm.StringParameter(this, 'Parameter', { parameterName: 'mySsmParameterName', stringValue: 'mySsmParameterValue', }); const paramsAndSecrets = lambda.ParamsAndSecretsLayerVersion.fromVersion(lambda.ParamsAndSecretsVersions.V1_0_103, { cacheSize: 500, - logLevel: lamabda.ParamsAndSecretsLogLevel.DEBUG, + logLevel: lambda.ParamsAndSecretsLogLevel.DEBUG, }); const lambdaFunction = new lambda.Function(this, 'MyFunction', { @@ -620,8 +620,8 @@ If the version of Parameters and Secrets Extension is not yet available in the C import * as sm from 'aws-cdk-lib/aws-secretsmanager'; import * as ssm from 'aws-cdk-lib/aws-ssm'; -const secret = new sm.Secret(stack, 'Secret'); -const parameter = new ssm.StringParameter(stack, 'Parameter', { +const secret = new sm.Secret(this, 'Secret'); +const parameter = new ssm.StringParameter(this, 'Parameter', { parameterName: 'mySsmParameterName', stringValue: 'mySsmParameterValue', }); @@ -640,7 +640,7 @@ const lambdaFunction = new lambda.Function(this, 'MyFunction', { }); secret.grantRead(lambdaFunction); -parameters.grantRead(lambdaFunction); +parameter.grantRead(lambdaFunction); ``` ## Event Rule Target diff --git a/packages/aws-cdk-lib/aws-logs/README.md b/packages/aws-cdk-lib/aws-logs/README.md index 2b5283f287ab1..3f89ae6084e97 100644 --- a/packages/aws-cdk-lib/aws-logs/README.md +++ b/packages/aws-cdk-lib/aws-logs/README.md @@ -108,6 +108,7 @@ below) and supply the intended destination: ```ts import * as destinations from 'aws-cdk-lib/aws-logs-destinations'; + declare const fn: lambda.Function; declare const logGroup: logs.LogGroup; @@ -349,31 +350,30 @@ Each policy may consist of a log group, S3 bucket, and/or Firehose delivery stre Example: ```ts -import { Bucket } from '@aws-cdk/aws-s3'; -import { LogGroup } from '@aws-cdk/logs'; -import * as kinesisfirehose from '@aws-cdk/aws-kinesisfirehose'; - +import * as kinesisfirehose from '@aws-cdk/aws-kinesisfirehose-alpha'; +import * as destinations from '@aws-cdk/aws-kinesisfirehose-destinations-alpha'; -const logGroupDestination = new LogGroup(this, 'LogGroupLambdaAudit', { +const logGroupDestination = new logs.LogGroup(this, 'LogGroupLambdaAudit', { logGroupName: 'auditDestinationForCDK', }); -const s3Destination = new Bucket(this, 'audit-bucket-id'); +const bucket = new s3.Bucket(this, 'audit-bucket'); +const s3Destination = new destinations.S3Bucket(bucket); -const deliveryStream = new firehose.DeliveryStream(this, 'Delivery Stream', { +const deliveryStream = new kinesisfirehose.DeliveryStream(this, 'Delivery Stream', { destinations: [s3Destination], }); -const dataProtectionPolicy = new DataProtectionPolicy({ +const dataProtectionPolicy = new logs.DataProtectionPolicy({ name: 'data protection policy', description: 'policy description', - identifiers: [DataIdentifier.DRIVERSLICENSE_US, new DataIdentifier('EmailAddress')], + identifiers: [logs.DataIdentifier.DRIVERSLICENSE_US, new logs.DataIdentifier('EmailAddress')], logGroupAuditDestination: logGroupDestination, - s3BucketAuditDestination: s3Destination, - deliveryStreamAuditDestination: deliveryStream.deliveryStreamName, + s3BucketAuditDestination: bucket, + deliveryStreamNameAuditDestination: deliveryStream.deliveryStreamName, }); -new LogGroup(this, 'LogGroupLambda', { +new logs.LogGroup(this, 'LogGroupLambda', { logGroupName: 'cdkIntegLogGroup', dataProtectionPolicy: dataProtectionPolicy, }); diff --git a/packages/aws-cdk-lib/aws-osis/README.md b/packages/aws-cdk-lib/aws-osis/README.md index a029115ea92cb..f111362a4b76f 100644 --- a/packages/aws-cdk-lib/aws-osis/README.md +++ b/packages/aws-cdk-lib/aws-osis/README.md @@ -16,7 +16,7 @@ This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture -import * as osis from '@aws-cdk/aws-osis'; +import * as osis from 'aws-cdk-lib/aws-osis'; ``` diff --git a/packages/aws-cdk-lib/aws-proton/README.md b/packages/aws-cdk-lib/aws-proton/README.md index 557882eeb9b6e..6b751e418d18d 100644 --- a/packages/aws-cdk-lib/aws-proton/README.md +++ b/packages/aws-cdk-lib/aws-proton/README.md @@ -16,7 +16,7 @@ This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture -import * as proton from '@aws-cdk/aws-proton'; +import * as proton from 'aws-cdk-lib/aws-proton'; ``` diff --git a/packages/aws-cdk-lib/aws-rds/README.md b/packages/aws-cdk-lib/aws-rds/README.md index 1ed797a8a5683..1768cad3c9914 100644 --- a/packages/aws-cdk-lib/aws-rds/README.md +++ b/packages/aws-cdk-lib/aws-rds/README.md @@ -21,10 +21,12 @@ const cluster = new rds.DatabaseCluster(this, 'Database', { engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_2_08_1 }), credentials: rds.Credentials.fromGeneratedSecret('clusteradmin'), // Optional - will default to 'admin' username and generated password writer: rds.ClusterInstance.provisioned('writer', { + publiclyAccessible: false, + }), readers: [ rds.ClusterInstance.provisioned('reader1', { promotionTier: 1 }), rds.ClusterInstance.serverlessV2('reader2'), - ] + ], vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS, }, @@ -38,7 +40,7 @@ To adopt Aurora I/O-Optimized. Speicify `DBClusterStorageType.AURORA_IOPT1` on t declare const vpc: ec2.Vpc; const cluster = new rds.DatabaseCluster(this, 'Database', { engine: rds.DatabaseClusterEngine.auroraPostgres({ version: rds.AuroraPostgresEngineVersion.VER_15_2 }), - credentials: rds.Credentials.fromUsername('adminuser', { password: cdk.SecretValue.unsafePlainText('7959866cacc02c2d243ecfe177464fe6') }), + credentials: rds.Credentials.fromUsername('adminuser', { password: SecretValue.unsafePlainText('7959866cacc02c2d243ecfe177464fe6') }), instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.X2G, ec2.InstanceSize.XLARGE), vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC }, @@ -92,7 +94,9 @@ new rds.DatabaseClusterFromSnapshot(this, 'Database', { Database cluster instances may be updated in bulk or on a rolling basis. -An update to all instances in a cluster may cause significant downtime. To reduce the downtime, set the `instanceUpdateBehavior` property in `DatabaseClusterBaseProps` to `InstanceUpdateBehavior.ROLLING`. This adds a dependency between each instance so the update is performed on only one instance at a time. +An update to all instances in a cluster may cause significant downtime. To reduce the downtime, set the +`instanceUpdateBehavior` property in `DatabaseClusterBaseProps` to `InstanceUpdateBehavior.ROLLING`. +This adds a dependency between each instance so the update is performed on only one instance at a time. Use `InstanceUpdateBehavior.BULK` to update all instances at once. @@ -100,10 +104,10 @@ Use `InstanceUpdateBehavior.BULK` to update all instances at once. declare const vpc: ec2.Vpc; const cluster = new rds.DatabaseCluster(this, 'Database', { engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_01_0 }), - writer: rds.ClusterInstance.provisioned({ + writer: rds.ClusterInstance.provisioned('Instance', { instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL), }), - readers [rds.ClusterInstance.provisioned('reader')], + readers: [rds.ClusterInstance.provisioned('reader')], instanceUpdateBehaviour: rds.InstanceUpdateBehaviour.ROLLING, // Optional - defaults to rds.InstanceUpdateBehaviour.BULK vpc, }); @@ -127,7 +131,7 @@ const cluster = new rds.DatabaseCluster(this, 'Database', { writer: rds.ClusterInstance.provisioned('writer'), readers: [ rds.ClusterInstance.serverlessV2('reader'), - ] + ], vpc, }); ``` @@ -150,7 +154,7 @@ const cluster = new rds.DatabaseCluster(this, 'Database', { writer: rds.ClusterInstance.provisioned('writer'), readers: [ rds.ClusterInstance.serverlessV2('reader'), - ] + ], vpc, }); @@ -223,7 +227,7 @@ const cluster = new rds.DatabaseCluster(this, 'Database', { rds.ClusterInstance.serverlessV2('reader1', { scaleWithWriter: true }), // will be put in promotion tier 2 and will not scale with the writer rds.ClusterInstance.serverlessV2('reader2'), - ] + ], vpc, }); ``` @@ -276,7 +280,7 @@ const cluster = new rds.DatabaseCluster(this, 'Database', { rds.ClusterInstance.serverlessV2('reader1', { scaleWithWriter: true }), // will be put in promotion tier 2 and will not scale with the writer rds.ClusterInstance.serverlessV2('reader2'), - ] + ], vpc, }); ``` @@ -303,7 +307,7 @@ For example, in order to migrate from this deprecated config: ```ts declare const vpc: ec2.Vpc; -const cluster = new rds.DatabaseCluster(stack, 'Database', { +const cluster = new rds.DatabaseCluster(this, 'Database', { engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_03_0, }), @@ -332,18 +336,20 @@ const instanceProps = { }; declare const vpc: ec2.Vpc; -const cluster = new rds.DatabaseCluster(stack, 'Database', { +const cluster = new rds.DatabaseCluster(this, 'Database', { engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_03_0, }), vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC }, vpc, - writer: ClusterInstance.provisioned('Instance1', { - ...instanceProps, + writer: rds.ClusterInstance.provisioned('Instance1', { + instanceType: instanceProps.instanceType, + isFromLegacyInstanceProps: instanceProps.isFromLegacyInstanceProps, }), readers: [ - ClusterInstance.provisioned('Instance2', { - ...instanceProps, + rds.ClusterInstance.provisioned('Instance2', { + instanceType: instanceProps.instanceType, + isFromLegacyInstanceProps: instanceProps.isFromLegacyInstanceProps, }), ], }); diff --git a/packages/aws-cdk-lib/aws-rds/lib/aurora-cluster-instance.ts b/packages/aws-cdk-lib/aws-rds/lib/aurora-cluster-instance.ts index 3b5a5ef8f2afc..6e289821cd4da 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/aurora-cluster-instance.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/aurora-cluster-instance.ts @@ -135,7 +135,7 @@ export interface ProvisionedClusterInstanceProps extends ClusterInstanceOptions * @example * // existing cluster * declare const vpc: ec2.Vpc; - * const cluster = new rds.DatabaseCluster(stack, 'Database', { + * const cluster = new rds.DatabaseCluster(this, 'Database', { * engine: rds.DatabaseClusterEngine.auroraMysql({ * version: rds.AuroraMysqlEngineVersion.VER_3_03_0, * }), @@ -154,19 +154,20 @@ export interface ProvisionedClusterInstanceProps extends ClusterInstanceOptions * isFromLegacyInstanceProps: true, * }; * - * declare const vpc: ec2.Vpc; - * const cluster = new rds.DatabaseCluster(stack, 'Database', { + * const myCluster = new rds.DatabaseCluster(this, 'Database', { * engine: rds.DatabaseClusterEngine.auroraMysql({ * version: rds.AuroraMysqlEngineVersion.VER_3_03_0, * }), * vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC }, * vpc, - * writer: ClusterInstance.provisioned('Instance1', { - * ...instanceProps, + * writer: rds.ClusterInstance.provisioned('Instance1', { + * instanceType: instanceProps.instanceType, + * isFromLegacyInstanceProps: instanceProps.isFromLegacyInstanceProps, * }), * readers: [ - * ClusterInstance.provisioned('Instance2', { - * ...instanceProps, + * rds.ClusterInstance.provisioned('Instance2', { + * instanceType: instanceProps.instanceType, + * isFromLegacyInstanceProps: instanceProps.isFromLegacyInstanceProps, * }), * ], * }); @@ -307,7 +308,7 @@ export interface ClusterInstanceOptions { * @example * * declare const vpc: ec2.Vpc; - * const cluster = new rds.DatabaseCluster(this, 'Database', { + * const myCluster = new rds.DatabaseCluster(this, 'Database', { * engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_2_08_1 }), * writer: rds.ClusterInstance.provisioned('writer', { * instanceType: ec2.InstanceType.of(ec2.InstanceClass.R6G, ec2.InstanceSize.XLARGE4), @@ -319,7 +320,7 @@ export interface ClusterInstanceOptions { * rds.ClusterInstance.serverlessV2('reader1', { scaleWithWriter: true }), * // will be put in promotion tier 2 and will not scale with the writer * rds.ClusterInstance.serverlessV2('reader2'), - * ] + * ], * vpc, * }); */ @@ -328,7 +329,7 @@ export class ClusterInstance implements IClusterInstance { * Add a provisioned instance to the cluster * * @example - * ClusterInstance.provisioned('ClusterInstance', { + * rds.ClusterInstance.provisioned('ClusterInstance', { * instanceType: ec2.InstanceType.of(ec2.InstanceClass.R6G, ec2.InstanceSize.XLARGE4), * }); */ @@ -343,7 +344,7 @@ export class ClusterInstance implements IClusterInstance { * Add a serverless v2 instance to the cluster * * @example - * ClusterInstance.serverlessV2('ClusterInstance', { + * rds.ClusterInstance.serverlessV2('ClusterInstance', { * scaleWithWriter: true, * }); */ diff --git a/packages/aws-cdk-lib/aws-s3-deployment/README.md b/packages/aws-cdk-lib/aws-s3-deployment/README.md index abf4b2afa48f8..87285c17bc8fa 100644 --- a/packages/aws-cdk-lib/aws-s3-deployment/README.md +++ b/packages/aws-cdk-lib/aws-s3-deployment/README.md @@ -362,19 +362,20 @@ to make from placeholders in a local file which will be resolved during deployme is especially useful in situations like creating an API from a spec file, where users might want to reference other CDK resources they have created. -The syntax for template variables is `{{ variable-name }}` in your local file. Then, you would +The syntax for template variables is `{{ variableName }}` in your local file. Then, you would specify the substitutions in CDK like this: ```ts import * as lambda from 'aws-cdk-lib/aws-lambda'; declare const myLambdaFunction: lambda.Function; +declare const destinationBucket: s3.Bucket; new s3deploy.DeployTimeSubstitutedFile(this, 'MyFile', { source: 'my-file.yaml', destinationBucket: destinationBucket, substitutions: { - variable-name: myLambdaFunction.functionName, + variableName: myLambdaFunction.functionName, }, }); ``` diff --git a/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts b/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts index b1efdcf6e7ab4..7ed1fd182bf38 100644 --- a/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts +++ b/packages/aws-cdk-lib/aws-s3-deployment/lib/bucket-deployment.ts @@ -377,9 +377,9 @@ export class BucketDeployment extends Construct { serviceToken: handler.functionArn, resourceType: 'Custom::CDKBucketDeployment', properties: { - SourceBucketNames: cdk.Lazy.list({ produce: () => this.sources.map(source => source.bucket.bucketName) }), - SourceObjectKeys: cdk.Lazy.list({ produce: () => this.sources.map(source => source.zipObjectKey) }), - SourceMarkers: cdk.Lazy.any({ + SourceBucketNames: cdk.Lazy.uncachedList({ produce: () => this.sources.map(source => source.bucket.bucketName) }), + SourceObjectKeys: cdk.Lazy.uncachedList({ produce: () => this.sources.map(source => source.zipObjectKey) }), + SourceMarkers: cdk.Lazy.uncachedAny({ produce: () => { return this.sources.reduce((acc, source) => { if (source.markers) { diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/private/product-stack-synthesizer.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/private/product-stack-synthesizer.ts index 6c963443374ff..214097fef3344 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/private/product-stack-synthesizer.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/private/product-stack-synthesizer.ts @@ -1,8 +1,37 @@ -import * as path from 'path'; -import { CfnBucket, IBucket } from '../../../aws-s3'; +import { CfnBucket, IBucket, Bucket } from '../../../aws-s3'; import { BucketDeployment, ServerSideEncryption, Source } from '../../../aws-s3-deployment'; import * as cdk from '../../../core'; -import { ProductStack } from '../product-stack'; + +/** + * Product stack synthesizer props. + */ +export interface ProductStackSynthesizerProps { + /** + * The parent stack of the stack that this synthesizer is bound to. + */ + readonly parentStack: cdk.Stack; + + /** + * The bucket used to store assets and enable ProductStack asset support. + * + * @default - No bucket provided and assets will not be supported + */ + readonly assetBucket?: IBucket; + + /** + * A ServerSideEncryption can be enabled to encrypt assets that are put into assetBucket. + * + * @default - No encryption is used + */ + readonly serverSideEncryption? : ServerSideEncryption; + + /** + * For AWS_KMS ServerSideEncryption a KMS KeyId must be provided which will be used to encrypt assets. + * + * @default - No KMS KeyId and SSE_KMS encryption cannot be used + */ + readonly serverSideEncryptionAwsKmsKeyId? : string; +} /** * Deployment environment for an AWS Service Catalog product stack. @@ -10,38 +39,47 @@ import { ProductStack } from '../product-stack'; * Interoperates with the StackSynthesizer of the parent stack. */ export class ProductStackSynthesizer extends cdk.StackSynthesizer { + private readonly parentStack: cdk.Stack; private readonly assetBucket?: IBucket; private readonly serverSideEncryption? : ServerSideEncryption; private readonly serverSideEncryptionAwsKmsKeyId? : string; private bucketDeployment?: BucketDeployment; + private parentAssetBucket?: IBucket; - constructor(assetBucket?: IBucket, serverSideEncryption? : ServerSideEncryption, serverSideEncryptionAwsKmsKeyId? : string) { + constructor(props: ProductStackSynthesizerProps) { super(); - this.assetBucket = assetBucket; - this.serverSideEncryption = serverSideEncryption; - this.serverSideEncryptionAwsKmsKeyId = serverSideEncryptionAwsKmsKeyId; + this.parentStack = props.parentStack; + this.assetBucket = props.assetBucket; + this.serverSideEncryption = props.serverSideEncryption; + this.serverSideEncryptionAwsKmsKeyId = props.serverSideEncryptionAwsKmsKeyId; } public addFileAsset(asset: cdk.FileAssetSource): cdk.FileAssetLocation { if (!this.assetBucket) { throw new Error('An Asset Bucket must be provided to use Assets'); } - if (this.serverSideEncryption == ServerSideEncryption.AWS_KMS && !this.serverSideEncryptionAwsKmsKeyId) { + + const location = this.parentStack.synthesizer.addFileAsset(asset); + if (!this.parentAssetBucket) { + this.parentAssetBucket = Bucket.fromBucketName(this.boundStack, 'ParentAssetBucket', location.bucketName); + } + const objectKey = location.objectKey; + const source = Source.bucket(this.parentAssetBucket, location.objectKey); + + if (this.serverSideEncryption === ServerSideEncryption.AWS_KMS && !this.serverSideEncryptionAwsKmsKeyId) { throw new Error('A KMS Key must be provided to use SSE_KMS'); } - if (this.serverSideEncryption != ServerSideEncryption.AWS_KMS && this.serverSideEncryptionAwsKmsKeyId) { + if (this.serverSideEncryption !== ServerSideEncryption.AWS_KMS && this.serverSideEncryptionAwsKmsKeyId) { throw new Error('A SSE_KMS encryption must be enabled if you provide KMS Key'); } - const outdir = cdk.App.of(this.boundStack)?.outdir ?? 'cdk.out'; - const assetPath = `${outdir}/${asset.fileName}`; + if (!this.bucketDeployment) { - const parentStack = (this.boundStack as ProductStack)._getParentStack(); if (!cdk.Resource.isOwnedResource(this.assetBucket)) { - cdk.Annotations.of(parentStack).addWarning('[WARNING] Bucket Policy Permissions cannot be added to' + + cdk.Annotations.of(this.parentStack).addWarning('[WARNING] Bucket Policy Permissions cannot be added to' + ' referenced Bucket. Please make sure your bucket has the correct permissions'); } - this.bucketDeployment = new BucketDeployment(parentStack, 'AssetsBucketDeployment', { - sources: [Source.asset(assetPath)], + this.bucketDeployment = new BucketDeployment(this.parentStack, 'AssetsBucketDeployment', { + sources: [source], destinationBucket: this.assetBucket, extract: false, prune: false, @@ -49,16 +87,13 @@ export class ProductStackSynthesizer extends cdk.StackSynthesizer { serverSideEncryptionAwsKmsKeyId: this.serverSideEncryptionAwsKmsKeyId, }); } else { - this.bucketDeployment.addSource(Source.asset(assetPath)); + this.bucketDeployment.addSource(source); } - const bucketName = this.physicalNameOfBucket(this.assetBucket);; + const bucketName = this.physicalNameOfBucket(this.assetBucket); if (!asset.fileName) { throw new Error('Asset file name is undefined'); } - const assetFileBaseName = path.basename(asset.fileName); - const s3Filename = assetFileBaseName.split('.')[1] + '.zip'; - const objectKey = `${s3Filename}`; const s3ObjectUrl = `s3://${bucketName}/${objectKey}`; const httpUrl = `https://s3.${bucketName}/${objectKey}`; diff --git a/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts b/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts index 3c9f3e9f58e9d..08db79eea7994 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/lib/product-stack.ts @@ -14,17 +14,22 @@ import * as cdk from '../../core'; export interface ProductStackProps { /** * A Bucket can be passed to store assets, enabling ProductStack Asset support - * @default No Bucket provided and Assets will not be supported. + * + * @default - No Bucket provided and Assets will not be supported. */ readonly assetBucket?: IBucket; + /** * A ServerSideEncryption can be enabled to encrypt assets that are put into assetBucket - * @default No encryption is used + * + * @default - No encryption is used */ readonly serverSideEncryption? : ServerSideEncryption; + /** * For AWS_KMS ServerSideEncryption a KMS KeyId must be provided which will be used to encrypt assets - * @default No KMS KeyId and SSE_KMS encryption cannot be used + * + * @default - No KMS KeyId and SSE_KMS encryption cannot be used */ readonly serverSideEncryptionAwsKmsKeyId? : string; } @@ -43,15 +48,20 @@ export class ProductStack extends cdk.Stack { private _parentProductStackHistory?: ProductStackHistory; private _templateUrl?: string; private _parentStack: cdk.Stack; - private assetBucket?: IBucket; constructor(scope: Construct, id: string, props: ProductStackProps = {}) { + const parentStack = findParentStack(scope); super(scope, id, { - synthesizer: new ProductStackSynthesizer(props.assetBucket, props.serverSideEncryption, props.serverSideEncryptionAwsKmsKeyId), + synthesizer: new ProductStackSynthesizer({ + parentStack, + assetBucket: props.assetBucket, + serverSideEncryption: props.serverSideEncryption, + serverSideEncryptionAwsKmsKeyId: props.serverSideEncryptionAwsKmsKeyId, + }), }); - this._parentStack = findParentStack(scope); + this._parentStack = parentStack; // this is the file name of the synthesized template file within the cloud assembly this.templateFile = `${cdk.Names.uniqueId(this)}.product.template.json`; diff --git a/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts b/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts index 5a1addf28da22..0ee71cafc4126 100644 --- a/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts +++ b/packages/aws-cdk-lib/aws-servicecatalog/test/product-stack.test.ts @@ -128,6 +128,78 @@ describe('ProductStack', () => { }); }); + test('nested stack in product stack', () => { + // GIVEN + const app = new cdk.App(); + + class ServiceCatalogSampleStack extends cdk.Stack { + constructor(scope: Construct, id: string) { + super(scope, id); + + new servicecatalog.CloudFormationProduct(this, 'SampleProduct', { + productName: 'Sample Product', + owner: 'owner', + productVersions: [ + { + productVersionName: 'v1', + cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack( + new SampleProductStack(this, 'SampleProductStack', { + assetBucket: new s3.Bucket(this, 'AssetBucket', { + bucketName: 'test-asset-bucket', + }), + }), + ), + }, + ], + }); + } + } + + class SampleNestedStack extends cdk.NestedStack { + constructor(scope: Construct, id: string) { + super(scope, id); + + new lambda.Function(this, 'HelloHandler', { + runtime: lambda.Runtime.PYTHON_3_9, + code: lambda.Code.fromAsset(path.join(__dirname, 'assets')), + handler: 'index.handler', + }); + } + } + + class SampleProductStack extends servicecatalog.ProductStack { + constructor(scope: Construct, id: string, props: servicecatalog.ProductStackProps) { + super(scope, id, props); + + new SampleNestedStack(this, 'SampleNestedStack'); + } + } + + const stack = new ServiceCatalogSampleStack(app, 'ServicecatalogSampleStack'); + + // WHEN + app.synth(); + + // THEN + Template.fromJSON(Template.fromStack(stack)).hasResourceProperties('Custom::CDKBucketDeployment', { + SourceBucketNames: [ + { + 'Fn::Sub': 'cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}', + }, + { + 'Fn::Sub': 'cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}', + }, + ], + SourceObjectKeys: [ + 'd3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip', + 'da185071753dd5fcd7bd1ff5f2882a5449980d60ed72cf65fe2b779dbbb30eeb.json', + ], + DestinationBucketName: { + Ref: 'AssetBucket1D025086', + }, + }); + }); + test('fails if bucketName is not specified in product stack with assets', () => { // GIVEN const app = new cdk.App( diff --git a/packages/aws-cdk-lib/aws-shield/README.md b/packages/aws-cdk-lib/aws-shield/README.md index 98045de30e9b6..b9937a3f8fc90 100644 --- a/packages/aws-cdk-lib/aws-shield/README.md +++ b/packages/aws-cdk-lib/aws-shield/README.md @@ -16,7 +16,7 @@ This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture -import * as shield from '@aws-cdk/aws-shield'; +import * as shield from 'aws-cdk-lib/aws-shield'; ``` diff --git a/packages/aws-cdk-lib/aws-stepfunctions/README.md b/packages/aws-cdk-lib/aws-stepfunctions/README.md index 57e6b61d47665..13f6be9b8af4a 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/README.md +++ b/packages/aws-cdk-lib/aws-stepfunctions/README.md @@ -98,11 +98,11 @@ history when CloudFormation deletes your state machine. Alternatively you can specify an existing step functions definition by providing a string or a file that contains the ASL JSON. ```ts -new sfn.StateMachine(stack, 'StateMachineFromString', { +new sfn.StateMachine(this, 'StateMachineFromString', { definitionBody: sfn.DefinitionBody.fromString('{"StartAt":"Pass","States":{"Pass":{"Type":"Pass","End":true}}}'), }); -new sfn.StateMachine(stack, 'StateMachineFromFile', { +new sfn.StateMachine(this, 'StateMachineFromFile', { definitionBody: sfn.DefinitionBody.fromFile('./asl.json'), }); ``` diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts index c78622ee03399..552a60d7c320e 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts +++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/state-machine.ts @@ -647,8 +647,7 @@ export interface DefinitionConfig { } export abstract class DefinitionBody { - - public static fromFile(path: string, options: s3_assets.AssetOptions): DefinitionBody { + public static fromFile(path: string, options?: s3_assets.AssetOptions): DefinitionBody { return new FileDefinitionBody(path, options); } @@ -661,11 +660,9 @@ export abstract class DefinitionBody { } public abstract bind(scope: Construct, sfnPrincipal: iam.IPrincipal, sfnProps: StateMachineProps): DefinitionConfig; - } export class FileDefinitionBody extends DefinitionBody { - constructor(public readonly path: string, private readonly options: s3_assets.AssetOptions = {}) { super(); } @@ -682,11 +679,9 @@ export class FileDefinitionBody extends DefinitionBody { }, }; } - } export class StringDefinitionBody extends DefinitionBody { - constructor(public readonly body: string) { super(); } @@ -699,7 +694,6 @@ export class StringDefinitionBody extends DefinitionBody { } export class ChainDefinitionBody extends DefinitionBody { - constructor(public readonly chainable: IChainable) { super(); } @@ -714,5 +708,4 @@ export class ChainDefinitionBody extends DefinitionBody { definitionString: Stack.of(scope).toJsonString(graph.toGraphJson()), }; } - -} \ No newline at end of file +} diff --git a/packages/aws-cdk-lib/aws-synthetics/README.md b/packages/aws-cdk-lib/aws-synthetics/README.md index b8914384a868c..3bb396a164eea 100644 --- a/packages/aws-cdk-lib/aws-synthetics/README.md +++ b/packages/aws-cdk-lib/aws-synthetics/README.md @@ -1,6 +1,5 @@ # AWS::Synthetics Construct Library - This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture diff --git a/packages/aws-cdk-lib/aws-verifiedpermissions/README.md b/packages/aws-cdk-lib/aws-verifiedpermissions/README.md index aa170f78bf7f1..8d5ba13c3ce17 100644 --- a/packages/aws-cdk-lib/aws-verifiedpermissions/README.md +++ b/packages/aws-cdk-lib/aws-verifiedpermissions/README.md @@ -16,7 +16,7 @@ This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture -import * as verifiedpermissions from '@aws-cdk/aws-verifiedpermissions'; +import * as verifiedpermissions from 'aws-cdk-lib/aws-verifiedpermissions'; ``` diff --git a/packages/aws-cdk-lib/aws-wafv2/README.md b/packages/aws-cdk-lib/aws-wafv2/README.md index 6361e71723f42..ec45be19b799b 100644 --- a/packages/aws-cdk-lib/aws-wafv2/README.md +++ b/packages/aws-cdk-lib/aws-wafv2/README.md @@ -1,6 +1,5 @@ # AWS::WAFv2 Construct Library - This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture diff --git a/packages/aws-cdk-lib/aws-workspaces/README.md b/packages/aws-cdk-lib/aws-workspaces/README.md index 3eddbb58cdf37..b04900fedd712 100644 --- a/packages/aws-cdk-lib/aws-workspaces/README.md +++ b/packages/aws-cdk-lib/aws-workspaces/README.md @@ -1,6 +1,5 @@ # Amazon WorkSpaces Construct Library - This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture diff --git a/packages/aws-cdk-lib/aws-xray/README.md b/packages/aws-cdk-lib/aws-xray/README.md index 743b0408c482f..aed2b2f62a31d 100644 --- a/packages/aws-cdk-lib/aws-xray/README.md +++ b/packages/aws-cdk-lib/aws-xray/README.md @@ -1,6 +1,5 @@ # AWS::XRay Construct Library - This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ```ts nofixture diff --git a/packages/aws-cdk-lib/cloud-assembly-schema/lib/cloud-assembly/metadata-schema.ts b/packages/aws-cdk-lib/cloud-assembly-schema/lib/cloud-assembly/metadata-schema.ts index 569ef31d1e8c9..ba3ab6d87cff2 100644 --- a/packages/aws-cdk-lib/cloud-assembly-schema/lib/cloud-assembly/metadata-schema.ts +++ b/packages/aws-cdk-lib/cloud-assembly-schema/lib/cloud-assembly/metadata-schema.ts @@ -25,6 +25,14 @@ interface BaseAssetMetadataEntry { /** * Metadata Entry spec for files. + * + * @example + * const entry = { + * packaging: 'file', + * s3BucketParameter: 'bucket-parameter', + * s3KeyParamenter: 'key-parameter', + * artifactHashParameter: 'hash-parameter', + * } */ export interface FileAssetMetadataEntry extends BaseAssetMetadataEntry { /** @@ -101,6 +109,13 @@ export interface ContainerImageAssetCacheOption { /** * Metadata Entry spec for container images. + * + * @example + * const entry = { + * packaging: 'container-image', + * repositoryName: 'repository-name', + * imageTag: 'tag', + * } */ export interface ContainerImageAssetMetadataEntry extends BaseAssetMetadataEntry { /** diff --git a/packages/aws-cdk-lib/cloudformation-include/test/nested-stacks.test.ts b/packages/aws-cdk-lib/cloudformation-include/test/nested-stacks.test.ts index e29277e605cd8..6d43433c3b74b 100644 --- a/packages/aws-cdk-lib/cloudformation-include/test/nested-stacks.test.ts +++ b/packages/aws-cdk-lib/cloudformation-include/test/nested-stacks.test.ts @@ -526,15 +526,15 @@ describe('CDK Include for nested stacks', () => { grandChild = child.includedTemplate.getNestedStack('GrandChildStack'); hash1 = '5dc7d4a99cfe2979687dc74f2db9fd75f253b5505a1912b5ceecf70c9aefba50'; - hash2 = '7775730164edb5faae717ac1d2e90d9c0d0fdbeafe48763e5c1b7fb5e39e00a5'; + hash2 = 'e5a13211dc428f077438af77fb9807401b0fe4ec327a22ee7d6b889a8d4d4240'; parentBucketParam = `AssetParameters${hash1}S3BucketEAA24F0C`; parentKeyParam = `AssetParameters${hash1}S3VersionKey1194CAB2`; grandChildBucketParam = `referencetoAssetParameters${hash1}S3BucketEAA24F0CRef`; grandChildKeyParam = `referencetoAssetParameters${hash1}S3VersionKey1194CAB2Ref`; - childBucketParam = `AssetParameters${hash2}S3BucketDEB194C6`; - childKeyParam = `AssetParameters${hash2}S3VersionKey8B342ED1`; + childBucketParam = `AssetParameters${hash2}S3BucketBFD439A3`; + childKeyParam = `AssetParameters${hash2}S3VersionKey2E0E4821`; }); test('correctly creates parameters in the parent stack, and passes them to the child stack', () => { @@ -560,7 +560,7 @@ describe('CDK Include for nested stacks', () => { "Type": "String", "Description": `S3 key for asset version \"${hash2}\"`, }, - [`AssetParameters${hash2}ArtifactHashAA82D4CC`]: { + [`AssetParameters${hash2}ArtifactHashBC693046`]: { "Type": "String", "Description": `Artifact hash for asset \"${hash2}\"`, }, diff --git a/packages/aws-cdk-lib/custom-resources/README.md b/packages/aws-cdk-lib/custom-resources/README.md index b36075ac9199c..ff26dce218187 100644 --- a/packages/aws-cdk-lib/custom-resources/README.md +++ b/packages/aws-cdk-lib/custom-resources/README.md @@ -1,5 +1,6 @@ # AWS CDK Custom Resources +This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. ## Provider Framework @@ -344,7 +345,10 @@ This sample demonstrates the following concepts: #### S3Assert -Checks that the textual contents of an S3 object matches a certain value. The check will be retried for 5 minutes as long as the object is not found or the value is different. See the source code for the [construct](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert.ts) and [handler](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert-handler/index.py). +Checks that the textual contents of an S3 object matches a certain value. The check will be retried +for 5 minutes as long as the object is not found or the value is different. See the source code for the +[construct](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert.ts) +and [handler](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/custom-resources/test/provider-framework/integration-test-fixtures/s3-assert-handler/index.py). The following example defines an `S3Assert` resource which waits until `myfile.txt` in `myBucket` exists and includes the contents `foo bar`: @@ -384,7 +388,6 @@ const myProvider = new cr.Provider(this, 'MyProvider', { role: myRole, providerFunctionName: 'the-lambda-name', // Optional }); - ``` ### Customizing Provider Function environment encryption key @@ -393,6 +396,8 @@ Sometimes it may be useful to manually set a AWS KMS key for the Provider Functi be able to view, manage and audit the key usage. ```ts +import * as kms from 'aws-cdk-lib/aws-kms'; + declare const onEvent: lambda.Function; declare const isComplete: lambda.Function; declare const myRole: iam.Role; @@ -405,7 +410,6 @@ const myProvider = new cr.Provider(this, 'MyProvider', { role: myRole, providerFunctionEnvEncryption: key, // Optional }); - ``` ## Custom Resources for AWS APIs @@ -652,13 +656,16 @@ const getParameter = new cr.AwsCustomResource(this, 'AssociateVPCWithHostedZone' ```ts import * as regionInfo from 'aws-cdk-lib/region-info'; +class MyFact implements regionInfo.IFact { + public readonly region = 'us-east-1'; + public readonly name = regionInfo.FactName.DEFAULT_CR_NODE_VERSION; + public readonly value = lambda.Runtime.NODEJS_18_X.name; +} + // change custom resource default runtime -regionInfo.Fact.register({ - region: 'us-east-1', // your region - name: regionInfo.FactName.DEFAULT_CR_NODE_VERSION, - value: lambda.Runtime.NODEJS_18_X.name, -}, true); -new AwsCustomResource(this, 'GetParameter', { +regionInfo.Fact.register(new MyFact(), true); + +new cr.AwsCustomResource(this, 'GetParameter', { resourceType: 'Custom::SSMParameter', onUpdate: { service: '@aws-sdk/client-ssm', // 'SSM' in v2 @@ -667,13 +674,9 @@ new AwsCustomResource(this, 'GetParameter', { Name: 'foo', WithDecryption: true, }, - physicalResourceId: PhysicalResourceId.fromResponse('Parameter.ARN'), + physicalResourceId: cr.PhysicalResourceId.fromResponse('Parameter.ARN'), }, }); ``` If you are using `NODEJS_18_X` or higher, you can also use the existing AWS SDK for JavaScript v2 style. - ---- - -This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. diff --git a/packages/aws-cdk-lib/jest.config.js b/packages/aws-cdk-lib/jest.config.js index 6c006365c8d35..3e40b01eb4e1d 100644 --- a/packages/aws-cdk-lib/jest.config.js +++ b/packages/aws-cdk-lib/jest.config.js @@ -8,7 +8,7 @@ module.exports = { testEnvironment: 'node', coverageThreshold: { global: { - branches: 40, + branches: 35, statements: 55, }, }, diff --git a/packages/aws-cdk-lib/lambda-layer-awscli/README.md b/packages/aws-cdk-lib/lambda-layer-awscli/README.md index d58a2638958a2..66791bfd66e1c 100644 --- a/packages/aws-cdk-lib/lambda-layer-awscli/README.md +++ b/packages/aws-cdk-lib/lambda-layer-awscli/README.md @@ -1,7 +1,5 @@ # AWS Lambda Layer with AWS CLI - - This module exports a single class called `AwsCliLayer` which is a `lambda.Layer` that bundles the AWS CLI. Any Lambda Function that uses this layer must use a Python 3.x runtime. diff --git a/packages/aws-cdk-lib/lambda-layer-kubectl/README.md b/packages/aws-cdk-lib/lambda-layer-kubectl/README.md index 63c6ed18d4610..9ee6680a6e28d 100644 --- a/packages/aws-cdk-lib/lambda-layer-kubectl/README.md +++ b/packages/aws-cdk-lib/lambda-layer-kubectl/README.md @@ -1,11 +1,9 @@ # AWS Lambda Layer with kubectl (and helm) - This module exports a single class called `KubectlLayer` which is a `lambda.Layer` that bundles the [`kubectl`](https://kubernetes.io/docs/reference/kubectl/kubectl/) and the [`helm`](https://helm.sh/) command line. > - Helm Version: 3.5.4 > - Kubectl Version: 1.20.0 -> Usage: diff --git a/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/README.md b/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/README.md index 7fcafaaea9075..944511e4067fa 100644 --- a/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/README.md +++ b/packages/aws-cdk-lib/lambda-layer-node-proxy-agent/README.md @@ -1,6 +1,5 @@ # AWS Lambda Layer with the NPM dependency proxy-agent - This module exports a single class called `NodeProxyAgentLayer` which is a `lambda.Layer` that bundles the NPM dependency [`proxy-agent`](https://www.npmjs.com/package/proxy-agent). > - proxy-agent Version: 5.0.0 diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index c0b9cc673c4ec..8578defba0207 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -66,7 +66,8 @@ }, "jsii": { "excludeTypescript": [ - "scripts" + "scripts", + "**/*.d.ts" ], "outdir": "dist", "targets": { @@ -95,7 +96,7 @@ "metadata": { "jsii": { "rosetta": { - "strict": false + "strict": true } } } @@ -483,11 +484,12 @@ }, "jsiiRosetta": { "exampleDependencies": { - "@aws-cdk/lambda-layer-kubectl-v25": "^2.0.3", + "@aws-cdk/lambda-layer-kubectl-v27": "^2.0.0", "cdk8s-plus-25": "^2.7.0", "@aws-cdk/aws-apigatewayv2-alpha": "*", "@aws-cdk/aws-batch-alpha": "*", - "@aws-cdk/aws-kinesisfirehose-alpha": "*" + "@aws-cdk/aws-kinesisfirehose-alpha": "*", + "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*" } }, "awslint": { diff --git a/packages/aws-cdk-lib/rosetta/aws_ecs/default.ts-fixture b/packages/aws-cdk-lib/rosetta/aws_ecs/default.ts-fixture index 09d0cdb164a1b..473ccf7252fdf 100644 --- a/packages/aws-cdk-lib/rosetta/aws_ecs/default.ts-fixture +++ b/packages/aws-cdk-lib/rosetta/aws_ecs/default.ts-fixture @@ -1,21 +1,21 @@ // Fixture with packages imported, but nothing else import { Construct } from 'constructs'; -import { SecretValue, Stack, Size } from 'aws-cdk-lib'; -import autoscaling = require('aws-cdk-lib/aws-autoscaling'); -import cloudmap = require('aws-cdk-lib/aws-servicediscovery'); -import ecs = require('aws-cdk-lib/aws-ecs'); -import ec2 = require('aws-cdk-lib/aws-ec2'); -import elb = require('aws-cdk-lib/aws-elasticloadbalancing'); -import elbv2 = require('aws-cdk-lib/aws-elasticloadbalancingv2'); -import events = require('aws-cdk-lib/aws-events'); -import kms = require('aws-cdk-lib/aws-kms'); -import logs = require('aws-cdk-lib/aws-logs'); -import s3 = require('aws-cdk-lib/aws-s3'); -import secretsmanager = require('aws-cdk-lib/aws-secretsmanager'); -import ssm = require('aws-cdk-lib/aws-ssm'); -import targets = require('aws-cdk-lib/aws-events-targets'); -import iam = require('aws-cdk-lib/aws-iam'); -import path = require('path'); +import { SecretValue, Stack, Size, Duration } from 'aws-cdk-lib'; +import * as autoscaling from 'aws-cdk-lib/aws-autoscaling'; +import * as cloudmap from 'aws-cdk-lib/aws-servicediscovery'; +import * as ecs from 'aws-cdk-lib/aws-ecs'; +import * as ec2 from 'aws-cdk-lib/aws-ec2'; +import * as elb from 'aws-cdk-lib/aws-elasticloadbalancing'; +import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2'; +import * as events from 'aws-cdk-lib/aws-events'; +import * as kms from 'aws-cdk-lib/aws-kms'; +import * as logs from 'aws-cdk-lib/aws-logs'; +import * as s3 from 'aws-cdk-lib/aws-s3'; +import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; +import * as ssm from 'aws-cdk-lib/aws-ssm'; +import * as targets from 'aws-cdk-lib/aws-events-targets'; +import * as iam from 'aws-cdk-lib/aws-iam'; +import * as path from 'path'; class Fixture extends Stack { constructor(scope: Construct, id: string) { diff --git a/packages/aws-cdk-lib/rosetta/aws_logs/default.ts-fixture b/packages/aws-cdk-lib/rosetta/aws_logs/default.ts-fixture index 3c2c490434a31..40d2f7649a57b 100644 --- a/packages/aws-cdk-lib/rosetta/aws_logs/default.ts-fixture +++ b/packages/aws-cdk-lib/rosetta/aws_logs/default.ts-fixture @@ -3,6 +3,7 @@ import { Construct } from 'constructs'; import { Stack } from 'aws-cdk-lib'; import * as logs from 'aws-cdk-lib/aws-logs'; import * as iam from 'aws-cdk-lib/aws-iam'; +import * as s3 from 'aws-cdk-lib/aws-s3'; import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch'; import * as lambda from 'aws-cdk-lib/aws-lambda'; diff --git a/packages/aws-cdk-lib/scripts/codegen.ts b/packages/aws-cdk-lib/scripts/codegen.ts index 19969bb0b2d7a..579f4b7bc1353 100644 --- a/packages/aws-cdk-lib/scripts/codegen.ts +++ b/packages/aws-cdk-lib/scripts/codegen.ts @@ -1 +1 @@ -export * from '@aws-cdk/cfn2ts'; +export * from '@aws-cdk/spec2cdk/lib/cfn2ts'; diff --git a/scripts/gen.sh b/scripts/gen.sh index 1a6bd48530e51..4dc3542d8b608 100755 --- a/scripts/gen.sh +++ b/scripts/gen.sh @@ -14,7 +14,7 @@ fail() { echo "=============================================================================================" echo "building required build tools..." -time npx lerna run --stream build --scope @aws-cdk/cfn2ts --scope @aws-cdk/spec2cdk --include-dependencies || fail +time npx lerna run --stream build --scope @aws-cdk/spec2cdk --include-dependencies || fail echo "=============================================================================================" echo "executing gen..." diff --git a/scripts/regen-l1.sh b/scripts/regen-l1.sh deleted file mode 100755 index 150ae0f6e608e..0000000000000 --- a/scripts/regen-l1.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -export NODE_OPTIONS="--max-old-space-size=8196 ${NODE_OPTIONS:-}" - -rm -f packages/@aws-cdk/*/lib/*.generated.* -node_modules/.bin/lerna --scope @aws-cdk/cfnspec run build -node_modules/.bin/lerna --scope @aws-cdk/cfn2ts run build -cfn2ts=$(pwd)/tools/@aws-cdk/cfn2ts/bin/cfn2ts -node_modules/.bin/lerna --concurrency=1 --no-bail exec -- bash -c "pwd && $cfn2ts --scope \$(node -p 'require(\"./package.json\")[\"cdk-build\"].cloudformation')" diff --git a/scripts/run-rosetta.sh b/scripts/run-rosetta.sh index 4383f6b52d345..f5c8ba77f2ea5 100755 --- a/scripts/run-rosetta.sh +++ b/scripts/run-rosetta.sh @@ -73,7 +73,7 @@ time $ROSETTA extract \ if $infuse; then echo "💎 Generating synthetic examples for the remainder" >&2 - time npx cdk-generate-synthetic-examples@^0.1.260 \ + time npx cdk-generate-synthetic-examples@^0.1.291 \ $(cat $jsii_pkgs_file) time $ROSETTA extract \ diff --git a/tools/@aws-cdk/pkglint/lib/library-creation.ts b/tools/@aws-cdk/pkglint/lib/library-creation.ts index c035ce168c7e0..4287f99d5f969 100644 --- a/tools/@aws-cdk/pkglint/lib/library-creation.ts +++ b/tools/@aws-cdk/pkglint/lib/library-creation.ts @@ -24,7 +24,7 @@ export function createModuleDefinitionFromCfnNamespace(namespace: string): Modul const submoduleName = moduleName.replace('-', '_'); const lowcaseModuleName = moduleBaseName.toLocaleLowerCase(); - const packageName = `@aws-cdk/${moduleName}`; + const packageName = `aws-cdk-lib/${moduleName}`; // dotnet names const dotnetPackage = `Amazon.CDK.${moduleFamily}.${moduleBaseName}`; diff --git a/tools/@aws-cdk/pkglint/test/libary-creation.test.ts b/tools/@aws-cdk/pkglint/test/libary-creation.test.ts index bf7a2e03ed5ca..d2d76b2c3ce9e 100644 --- a/tools/@aws-cdk/pkglint/test/libary-creation.test.ts +++ b/tools/@aws-cdk/pkglint/test/libary-creation.test.ts @@ -11,7 +11,7 @@ describe('createModuleDefinitionFromCfnNamespace', () => { moduleName: 'aws-ec2', moduleFamily: 'AWS', moduleBaseName: 'EC2', - packageName: '@aws-cdk/aws-ec2', + packageName: 'aws-cdk-lib/aws-ec2', dotnetPackage: 'Amazon.CDK.AWS.EC2', javaGroupId: 'software.amazon.awscdk', javaPackage: 'services.ec2', @@ -30,7 +30,7 @@ describe('createModuleDefinitionFromCfnNamespace', () => { moduleName: 'aws-sam', moduleFamily: 'AWS', moduleBaseName: 'SAM', - packageName: '@aws-cdk/aws-sam', + packageName: 'aws-cdk-lib/aws-sam', dotnetPackage: 'Amazon.CDK.AWS.SAM', javaGroupId: 'software.amazon.awscdk', javaPackage: 'services.sam', @@ -49,7 +49,7 @@ describe('createModuleDefinitionFromCfnNamespace', () => { moduleName: 'alexa-ask', moduleFamily: 'Alexa', moduleBaseName: 'ASK', - packageName: '@aws-cdk/alexa-ask', + packageName: 'aws-cdk-lib/alexa-ask', dotnetPackage: 'Amazon.CDK.Alexa.ASK', javaGroupId: 'software.amazon.awscdk', javaPackage: 'alexa.ask', @@ -81,6 +81,6 @@ describe('createLibraryReadme', () => { await createLibraryReadme('Alexa::ASK', readmePath); const readme = fs.readFileSync(readmePath, { encoding: 'utf8' }); - expect(readme).toContain("import * as alexa_ask from '@aws-cdk/alexa-ask';"); + expect(readme).toContain("import * as alexa_ask from 'aws-cdk-lib/alexa-ask';"); }); }); diff --git a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts index 64c1858761267..144194e69ee26 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts @@ -157,6 +157,7 @@ export async function generateAll( importLocations: { core: options.coreImport, coreHelpers: `${options.coreImport}/lib/helpers-internal`, + cloudwatch: options.cloudwatchImport, }, }, ); diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json index 427a833f3394d..5c37d1a7aa06c 100644 --- a/tools/@aws-cdk/spec2cdk/package.json +++ b/tools/@aws-cdk/spec2cdk/package.json @@ -32,8 +32,8 @@ }, "license": "Apache-2.0", "dependencies": { - "@aws-cdk/aws-service-spec": "^0.0.1", - "@aws-cdk/service-spec-types": "^0.0.1", + "@aws-cdk/aws-service-spec": "^0.0.2", + "@aws-cdk/service-spec-types": "^0.0.2", "@cdklabs/tskb": "^0.0.1", "@cdklabs/typewriter": "^0.0.1", "camelcase": "^6", diff --git a/yarn.lock b/yarn.lock index e2e6413c7e63a..9335e02a8687c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,25 +50,25 @@ resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.165.tgz#c169599d83beceea7e638082ef9833997f04c85d" integrity sha512-bsyLQD/vqXQcc9RDmlM1XqiFNO/yewgVFXmkMcQkndJbmE/jgYkzewwYGrBlfL725hGLQipXq19+jwWwdsXQqg== -"@aws-cdk/aws-service-spec@^0.0.1": - version "0.0.1" - resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.1.tgz#97ae97815bd504a23d497f18203c45f1416d7871" - integrity sha512-WdVtyTEjgJCRgvbd0oOu9YawNKe8MppKQWh1WFawjErwa1LtSRdT6yjQSu+IU0c4KpXgTE9gSz6cBK6nlU8LSQ== +"@aws-cdk/aws-service-spec@^0.0.2": + version "0.0.2" + resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.2.tgz#e7bbcb182cb429a82dc3464ea68a25c1c922d061" + integrity sha512-7aWw22j82sC+8IF1aAc6PrehKWAp9pxAPf8F6SSoNpknyzPkyVlMK8Z9VRuhBT3XMoGZ3kgEOinYig9/2UF6gw== dependencies: - "@aws-cdk/service-spec-types" "^0.0.1" - "@cdklabs/tskb" "^0.0.0" + "@aws-cdk/service-spec-types" "^0.0.2" + "@cdklabs/tskb" "^0.0.1" "@aws-cdk/lambda-layer-kubectl-v24@^2.0.195": version "2.0.229" resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.229.tgz#fc766bcf0899e24ba9af5b8757264479e3f1c662" integrity sha512-ATloS7yCcJHxMaOwItTndudTzmtbfYYyw9seaIeTvAHLeRcwIdpT0fDJKGzNVq+Aqn3nu0RjJI3kOpmJ7/sM7A== -"@aws-cdk/service-spec-types@^0.0.1": - version "0.0.1" - resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.1.tgz#adf5b3b987bac7ebbfa1c58176b4d98a35192ffd" - integrity sha512-WpYRdOSLT+dGDbzbZQKcdqnIm5JA9HIvLdxOvz9hIySYTTSXLPzMBRHmmZ2XUpwxxp9YVVJZcIHuK7q9rKivSw== +"@aws-cdk/service-spec-types@^0.0.2": + version "0.0.2" + resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.2.tgz#54ad3f4c14ca3559d44e22f209b0be69aa35a009" + integrity sha512-J9Wkiv0AV2k8lOqOVKcZsKZU7NMX+qFGBYZwR4SRtjIh5R9u+tdUUD7VDu5sj9lxtf2TteThi2sJ4I6Sv6iaeg== dependencies: - "@cdklabs/tskb" "^0.0.0" + "@cdklabs/tskb" "^0.0.1" "@aws-crypto/crc32@3.0.0": version "3.0.0" @@ -1824,11 +1824,6 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cdklabs/tskb@^0.0.0": - version "0.0.0" - resolved "https://registry.npmjs.org/@cdklabs/tskb/-/tskb-0.0.0.tgz#2d7e1ae75ab1d65e1cdb3f586819c606128e0d56" - integrity sha512-smJy/KlMifb6WzCDU2ONlkSmr2fzp+rvlE8AHAAUQH2uBO5odHUKGzNEnpnlynPfodt6/pvXQv6ly0OtzuFanQ== - "@cdklabs/tskb@^0.0.1": version "0.0.1" resolved "https://registry.npmjs.org/@cdklabs/tskb/-/tskb-0.0.1.tgz#dc2732703d8ef080369db5e7ad150223f60cc519" @@ -4987,10 +4982,10 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk-generate-synthetic-examples@^0.1.287: - version "0.1.287" - resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.1.287.tgz#6ea883857e3afe6164c1a45c9a95dad554447aa0" - integrity sha512-fUfqPzq4bMhPhzG6LZhTIGvjUIg7AB6MPuIo334Pr0tILahWS1LrF/pXmmKN4leysu7vgGGxJrXOfIKTWMB6iQ== +cdk-generate-synthetic-examples@^0.1.291: + version "0.1.291" + resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.1.291.tgz#67660f4c620ee4a994abb142e4d385086e248bc9" + integrity sha512-pixtUlwPWE0URquqviOC/f06ATcetf5EfgE5UP44cmNlZRp1+qqm+U9yeHvc/QfJhyBd3aTXVtuHYs4AuBWB5g== dependencies: "@jsii/spec" "^1.84.0" fs-extra "^10.1.0"