From deb0d4de935d9358fb28f0e255ca178bcb1e3f6a Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Wed, 6 Oct 2021 15:08:10 +0200 Subject: [PATCH] chore: downgrade custom resources to Node 12 (#16818) Some AWS regions do not yet support the Node 14.x runtime for Lambda, which makes it challenging to use anything that involves a vended custom resource that uses it. Downgrading all those resources to use Node 12.x instead, which is available in all regions where Lambda is, and hence provides better coverage and usability. Fixes cdklabs/cdk-ops#1686 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../test/integ.assign-public-ip.expected.json | 44 +- .../lib/dns-validated-certificate.ts | 2 +- .../test/dns-validated-certificate.test.ts | 2 +- .../lib/global-table-coordinator.ts | 2 +- .../test/integ.dynamodb.global.expected.json | 3 +- ...teg.eks-cluster-handlers-vpc.expected.json | 132 +-- ...eks-cluster-private-endpoint.expected.json | 181 +++-- .../test/integ.eks-cluster.expected.json | 757 +++++++++++++----- .../integ.eks-oidc-provider.expected.json | 10 +- .../test/integ.fargate-cluster.expected.json | 177 ++-- .../lib/private/database-query.ts | 2 +- .../test/integ.database.expected.json | 26 +- .../test/integ.actions.expected.json | 2 +- packages/@aws-cdk/aws-ses/lib/receipt-rule.ts | 2 +- .../aws-ses/test/integ.receipt.expected.json | 2 +- .../lib/provider-framework/provider.ts | 2 +- .../integ.provider.expected.json | 8 +- .../lib/private/application-security-check.ts | 4 +- .../integ.pipeline-security.expected.json | 4 +- 19 files changed, 953 insertions(+), 409 deletions(-) diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.expected.json b/packages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.expected.json index f3a7aeeb43fb1..1c061588d688d 100644 --- a/packages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.expected.json +++ b/packages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.expected.json @@ -714,7 +714,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3Bucket52DB41A7" + "Ref": "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3Bucket1AECFCFD" }, "S3Key": { "Fn::Join": [ @@ -727,7 +727,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3VersionKey0F583551" + "Ref": "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3VersionKey2ACFB47F" } ] } @@ -740,7 +740,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3VersionKey0F583551" + "Ref": "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3VersionKey2ACFB47F" } ] } @@ -877,7 +877,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3Bucket52DB41A7" + "Ref": "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3Bucket1AECFCFD" }, "S3Key": { "Fn::Join": [ @@ -890,7 +890,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3VersionKey0F583551" + "Ref": "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3VersionKey2ACFB47F" } ] } @@ -903,7 +903,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3VersionKey0F583551" + "Ref": "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3VersionKey2ACFB47F" } ] } @@ -1044,7 +1044,7 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -1190,7 +1190,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3BucketD609D0D9" + "Ref": "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3Bucket4C71F166" }, "S3Key": { "Fn::Join": [ @@ -1203,7 +1203,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3VersionKey77CF589B" + "Ref": "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3VersionKey0124EFC4" } ] } @@ -1216,7 +1216,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3VersionKey77CF589B" + "Ref": "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3VersionKey0124EFC4" } ] } @@ -1242,17 +1242,17 @@ } }, "Parameters": { - "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3Bucket52DB41A7": { + "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3Bucket1AECFCFD": { "Type": "String", - "Description": "S3 bucket for asset \"c02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4\"" + "Description": "S3 bucket for asset \"1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3e\"" }, - "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4S3VersionKey0F583551": { + "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eS3VersionKey2ACFB47F": { "Type": "String", - "Description": "S3 key for asset version \"c02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4\"" + "Description": "S3 key for asset version \"1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3e\"" }, - "AssetParametersc02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4ArtifactHash85B8E84D": { + "AssetParameters1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3eArtifactHashC1CF90D5": { "Type": "String", - "Description": "Artifact hash for asset \"c02a0f4f3094701fe7fc414690fc416909b3a1f04dcba086e366807a15f2b0b4\"" + "Description": "Artifact hash for asset \"1cd4a64795df8938c7ff3d71caa4b3fd27d3d5caa222517813b08ae2a6494d3e\"" }, "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1": { "Type": "String", @@ -1266,17 +1266,17 @@ "Type": "String", "Description": "Artifact hash for asset \"daeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1\"" }, - "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3BucketD609D0D9": { + "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3Bucket4C71F166": { "Type": "String", - "Description": "S3 bucket for asset \"4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02c\"" + "Description": "S3 bucket for asset \"1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2d\"" }, - "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3VersionKey77CF589B": { + "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dS3VersionKey0124EFC4": { "Type": "String", - "Description": "S3 key for asset version \"4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02c\"" + "Description": "S3 key for asset version \"1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2d\"" }, - "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cArtifactHash86CFA15D": { + "AssetParameters1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2dArtifactHash6350D824": { "Type": "String", - "Description": "Artifact hash for asset \"4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02c\"" + "Description": "Artifact hash for asset \"1c4eb88f5a8270f387281dcff6e3493840634113c4d57044f4aff74e3ef94c2d\"" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts b/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts index fff0ef7df7d7d..60c965e21a6ab 100644 --- a/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts +++ b/packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts @@ -88,7 +88,7 @@ export class DnsValidatedCertificate extends CertificateBase implements ICertifi const requestorFunction = new lambda.Function(this, 'CertificateRequestorFunction', { code: lambda.Code.fromAsset(path.resolve(__dirname, '..', 'lambda-packages', 'dns_validated_certificate_handler', 'lib')), handler: 'index.certificateRequestHandler', - runtime: lambda.Runtime.NODEJS_14_X, + runtime: lambda.Runtime.NODEJS_12_X, timeout: cdk.Duration.minutes(15), role: props.customResourceRole, }); diff --git a/packages/@aws-cdk/aws-certificatemanager/test/dns-validated-certificate.test.ts b/packages/@aws-cdk/aws-certificatemanager/test/dns-validated-certificate.test.ts index 1b0a667b52738..aadce823b74a0 100644 --- a/packages/@aws-cdk/aws-certificatemanager/test/dns-validated-certificate.test.ts +++ b/packages/@aws-cdk/aws-certificatemanager/test/dns-validated-certificate.test.ts @@ -31,7 +31,7 @@ test('creates CloudFormation Custom Resource', () => { }); expect(stack).toHaveResource('AWS::Lambda::Function', { Handler: 'index.certificateRequestHandler', - Runtime: 'nodejs14.x', + Runtime: 'nodejs12.x', Timeout: 900, }); expect(stack).toHaveResource('AWS::IAM::Policy', { diff --git a/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts b/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts index 924c84b9237f1..8605e36fda54b 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts +++ b/packages/@aws-cdk/aws-dynamodb-global/lib/global-table-coordinator.ts @@ -19,7 +19,7 @@ export class GlobalTableCoordinator extends cdk.Stack { code: lambda.Code.fromAsset(path.resolve(__dirname, '../', 'lambda-packages', 'aws-global-table-coordinator', 'lib')), description: 'Lambda to make DynamoDB a global table', handler: 'index.handler', - runtime: lambda.Runtime.NODEJS_14_X, + runtime: lambda.Runtime.NODEJS_12_X, timeout: cdk.Duration.minutes(5), uuid: 'D38B65A6-6B54-4FB6-9BAD-9CD40A6DAC12', }); diff --git a/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json b/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json index b4dfc40358bd1..3aab4c4f3a64b 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json +++ b/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json @@ -202,10 +202,9 @@ "Arn" ] }, - "Runtime": "nodejs14.x", "Description": "Lambda to make DynamoDB a global table", "Handler": "index.handler", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 300 }, "DependsOn": [ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.expected.json index 02d74f9efcf49..bc3c838b43ef3 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.expected.json @@ -84,7 +84,9 @@ "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" } }, - "DependsOn": ["EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4"] + "DependsOn": [ + "EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4" + ] }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet1EIP9380B54C": { "Type": "AWS::EC2::EIP", @@ -195,7 +197,9 @@ "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" } }, - "DependsOn": ["EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4"] + "DependsOn": [ + "EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4" + ] }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet2EIP9186922F": { "Type": "AWS::EC2::EIP", @@ -306,7 +310,9 @@ "Ref": "EksAllHandlersInVpcStackDefaultVpcIGW916D42F1" } }, - "DependsOn": ["EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4"] + "DependsOn": [ + "EksAllHandlersInVpcStackDefaultVpcVPCGW5DC3BDB4" + ] }, "EksAllHandlersInVpcStackDefaultVpcPublicSubnet3EIPBF5ED908": { "Type": "AWS::EC2::EIP", @@ -699,7 +705,10 @@ "Action": "iam:PassRole", "Effect": "Allow", "Resource": { - "Fn::GetAtt": ["EksAllHandlersInVpcStackRoleC36F09F0", "Arn"] + "Fn::GetAtt": [ + "EksAllHandlersInVpcStackRoleC36F09F0", + "Arn" + ] } }, { @@ -715,7 +724,9 @@ "eks:UntagResource" ], "Effect": "Allow", - "Resource": ["*"] + "Resource": [ + "*" + ] }, { "Action": [ @@ -726,7 +737,10 @@ "Resource": "*" }, { - "Action": ["iam:GetRole", "iam:listAttachedRolePolicies"], + "Action": [ + "iam:GetRole", + "iam:listAttachedRolePolicies" + ], "Effect": "Allow", "Resource": "*" }, @@ -806,7 +820,10 @@ "Config": { "version": "1.21", "roleArn": { - "Fn::GetAtt": ["EksAllHandlersInVpcStackRoleC36F09F0", "Arn"] + "Fn::GetAtt": [ + "EksAllHandlersInVpcStackRoleC36F09F0", + "Arn" + ] }, "resourcesVpcConfig": { "subnetIds": [ @@ -842,7 +859,10 @@ } }, "AssumeRoleArn": { - "Fn::GetAtt": ["EksAllHandlersInVpcStackCreationRole0BAA4CDC", "Arn"] + "Fn::GetAtt": [ + "EksAllHandlersInVpcStackCreationRole0BAA4CDC", + "Arn" + ] }, "AttributesRevision": 2 }, @@ -968,12 +988,17 @@ "Ref": "EksAllHandlersInVpcStack9ED695D7" }, "RoleArn": { - "Fn::GetAtt": ["EksAllHandlersInVpcStackCreationRole0BAA4CDC", "Arn"] + "Fn::GetAtt": [ + "EksAllHandlersInVpcStackCreationRole0BAA4CDC", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c8fa2698c0d935568a51a7732ad19350286b302ae8", "Overwrite": true }, - "DependsOn": ["EksAllHandlersInVpcStackKubectlReadyBarrier8687350F"], + "DependsOn": [ + "EksAllHandlersInVpcStackKubectlReadyBarrier8687350F" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -1067,7 +1092,9 @@ ], "AmiType": "AL2_x86_64", "ForceUpdateEnabled": true, - "InstanceTypes": ["m5.large"], + "InstanceTypes": [ + "m5.large" + ], "ScalingConfig": { "DesiredSize": 2, "MaxSize": 2, @@ -1088,7 +1115,7 @@ }, "/", { - "Ref": "AssetParametersaaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7S3Bucket995BE909" + "Ref": "AssetParameters30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742S3BucketA4A228F5" }, "/", { @@ -1098,7 +1125,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersaaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7S3VersionKeyFC082341" + "Ref": "AssetParameters30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742S3VersionKey6CE1DED5" } ] } @@ -1111,7 +1138,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersaaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7S3VersionKeyFC082341" + "Ref": "AssetParameters30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742S3VersionKey6CE1DED5" } ] } @@ -1130,11 +1157,11 @@ "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcE40EA7ACRef": { "Ref": "EksAllHandlersInVpcStackDefaultVpcBE11D4AE" }, - "referencetoawscdkekshandlersinvpctestAssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket2733AD2BRef": { - "Ref": "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket85C441D9" + "referencetoawscdkekshandlersinvpctestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket4A93429DRef": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C" }, - "referencetoawscdkekshandlersinvpctestAssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKey97FD1B55Ref": { - "Ref": "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKeyABBEC6F6" + "referencetoawscdkekshandlersinvpctestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey7F5C23CBRef": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9" }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet1Subnet9479BAA8Ref": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet1SubnetE2B86978" @@ -1145,11 +1172,11 @@ "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackDefaultVpcPrivateSubnet3Subnet1B127970Ref": { "Ref": "EksAllHandlersInVpcStackDefaultVpcPrivateSubnet3SubnetA75A8BA9" }, - "referencetoawscdkekshandlersinvpctestAssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket99F890C4Ref": { - "Ref": "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket208EDB42" + "referencetoawscdkekshandlersinvpctestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3BucketE24ADE21Ref": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135" }, - "referencetoawscdkekshandlersinvpctestAssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey12E014F2Ref": { - "Ref": "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey08C22772" + "referencetoawscdkekshandlersinvpctestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKeyEA8B9B47Ref": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB" }, "referencetoawscdkekshandlersinvpctestAssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3Bucket9D7E9998Ref": { "Ref": "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1" @@ -1175,7 +1202,7 @@ }, "/", { - "Ref": "AssetParametersabc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8S3Bucket6909A78C" + "Ref": "AssetParameters21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345S3BucketC59A67EA" }, "/", { @@ -1185,7 +1212,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersabc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8S3VersionKeyF89BBD63" + "Ref": "AssetParameters21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345S3VersionKey10DC54D0" } ] } @@ -1198,7 +1225,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersabc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8S3VersionKeyF89BBD63" + "Ref": "AssetParameters21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345S3VersionKey10DC54D0" } ] } @@ -1209,7 +1236,10 @@ }, "Parameters": { "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStack429D29C0Arn": { - "Fn::GetAtt": ["EksAllHandlersInVpcStack9ED695D7", "Arn"] + "Fn::GetAtt": [ + "EksAllHandlersInVpcStack9ED695D7", + "Arn" + ] }, "referencetoawscdkekshandlersinvpctestEksAllHandlersInVpcStackCreationRoleADAAC7FDArn": { "Fn::GetAtt": [ @@ -1305,29 +1335,29 @@ } }, "Parameters": { - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket85C441D9": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C": { "Type": "String", - "Description": "S3 bucket for asset \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "S3 bucket for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKeyABBEC6F6": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9": { "Type": "String", - "Description": "S3 key for asset version \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "S3 key for asset version \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcArtifactHashC6D6393C": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4ArtifactHash26192139": { "Type": "String", - "Description": "Artifact hash for asset \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "Artifact hash for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket208EDB42": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135": { "Type": "String", - "Description": "S3 bucket for asset \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "S3 bucket for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey08C22772": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB": { "Type": "String", - "Description": "S3 key for asset version \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "S3 key for asset version \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefArtifactHash861FF133": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccArtifactHashCC7E7A09": { "Type": "String", - "Description": "Artifact hash for asset \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "Artifact hash for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1": { "Type": "String", @@ -1377,29 +1407,29 @@ "Type": "String", "Description": "Artifact hash for asset \"ea17febe6d04c66048f3e8e060c71685c0cb53122abceff44842d27bc0d4a03e\"" }, - "AssetParametersaaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7S3Bucket995BE909": { + "AssetParameters30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742S3BucketA4A228F5": { "Type": "String", - "Description": "S3 bucket for asset \"aaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7\"" + "Description": "S3 bucket for asset \"30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742\"" }, - "AssetParametersaaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7S3VersionKeyFC082341": { + "AssetParameters30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742S3VersionKey6CE1DED5": { "Type": "String", - "Description": "S3 key for asset version \"aaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7\"" + "Description": "S3 key for asset version \"30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742\"" }, - "AssetParametersaaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7ArtifactHashABA2E5E1": { + "AssetParameters30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742ArtifactHashBC7D3F16": { "Type": "String", - "Description": "Artifact hash for asset \"aaf0702521101dbd9f595a941bc4553dc343cd8e278677ab192eee285c3cb5f7\"" + "Description": "Artifact hash for asset \"30ee592ed790de2e3261605468c9775597d2246a8fe1db5e656f903f536f3742\"" }, - "AssetParametersabc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8S3Bucket6909A78C": { + "AssetParameters21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345S3BucketC59A67EA": { "Type": "String", - "Description": "S3 bucket for asset \"abc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8\"" + "Description": "S3 bucket for asset \"21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345\"" }, - "AssetParametersabc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8S3VersionKeyF89BBD63": { + "AssetParameters21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345S3VersionKey10DC54D0": { "Type": "String", - "Description": "S3 key for asset version \"abc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8\"" + "Description": "S3 key for asset version \"21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345\"" }, - "AssetParametersabc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8ArtifactHashFAE25270": { + "AssetParameters21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345ArtifactHash9BBC26F6": { "Type": "String", - "Description": "Artifact hash for asset \"abc0a1f8e9cd253f3d630dc9e75261dfb185a252be4394b39e92e90423a7aae8\"" + "Description": "Artifact hash for asset \"21c400ec0eb62a3fa5c541809780b108a89b7772406cc58eb6d989827ce09345\"" } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.expected.json index e9c0e267b04f5..b4da9f1c8825f 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.expected.json @@ -112,7 +112,9 @@ "Ref": "VpcIGWD7BA715C" } }, - "DependsOn": ["VpcVPCGWBF912B6E"] + "DependsOn": [ + "VpcVPCGWBF912B6E" + ] }, "VpcPublicSubnet1EIPD7E02669": { "Type": "AWS::EC2::EIP", @@ -137,7 +139,10 @@ "Ref": "VpcPublicSubnet1Subnet5C2D37C4" }, "AllocationId": { - "Fn::GetAtt": ["VpcPublicSubnet1EIPD7E02669", "AllocationId"] + "Fn::GetAtt": [ + "VpcPublicSubnet1EIPD7E02669", + "AllocationId" + ] }, "Tags": [ { @@ -220,7 +225,9 @@ "Ref": "VpcIGWD7BA715C" } }, - "DependsOn": ["VpcVPCGWBF912B6E"] + "DependsOn": [ + "VpcVPCGWBF912B6E" + ] }, "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", @@ -291,7 +298,9 @@ "Ref": "VpcIGWD7BA715C" } }, - "DependsOn": ["VpcVPCGWBF912B6E"] + "DependsOn": [ + "VpcVPCGWBF912B6E" + ] }, "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", @@ -640,7 +649,10 @@ "Action": "iam:PassRole", "Effect": "Allow", "Resource": { - "Fn::GetAtt": ["ClusterRoleFA261979", "Arn"] + "Fn::GetAtt": [ + "ClusterRoleFA261979", + "Arn" + ] } }, { @@ -656,7 +668,9 @@ "eks:UntagResource" ], "Effect": "Allow", - "Resource": ["*"] + "Resource": [ + "*" + ] }, { "Action": [ @@ -667,7 +681,10 @@ "Resource": "*" }, { - "Action": ["iam:GetRole", "iam:listAttachedRolePolicies"], + "Action": [ + "iam:GetRole", + "iam:listAttachedRolePolicies" + ], "Effect": "Allow", "Resource": "*" }, @@ -743,7 +760,10 @@ "Config": { "version": "1.21", "roleArn": { - "Fn::GetAtt": ["ClusterRoleFA261979", "Arn"] + "Fn::GetAtt": [ + "ClusterRoleFA261979", + "Arn" + ] }, "resourcesVpcConfig": { "subnetIds": [ @@ -779,7 +799,10 @@ } }, "AssumeRoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "AttributesRevision": 2 }, @@ -846,11 +869,17 @@ [ "[{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\",\"metadata\":{\"name\":\"aws-auth\",\"namespace\":\"kube-system\"},\"data\":{\"mapRoles\":\"[{\\\"rolearn\\\":\\\"", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] }, "\\\",\\\"username\\\":\\\"", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] }, "\\\",\\\"groups\\\":[\\\"system:masters\\\"]},{\\\"rolearn\\\":\\\"", { @@ -867,11 +896,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "Overwrite": true }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -965,7 +999,9 @@ ], "AmiType": "AL2_x86_64", "ForceUpdateEnabled": true, - "InstanceTypes": ["m5.large"], + "InstanceTypes": [ + "m5.large" + ], "ScalingConfig": { "DesiredSize": 2, "MaxSize": 2, @@ -987,10 +1023,15 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] } }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -1007,7 +1048,7 @@ }, "/", { - "Ref": "AssetParameters2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85eS3Bucket880F308A" + "Ref": "AssetParametersa56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890S3Bucket02F74E4B" }, "/", { @@ -1017,7 +1058,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85eS3VersionKey67C8FBE4" + "Ref": "AssetParametersa56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890S3VersionKey0582948B" } ] } @@ -1030,7 +1071,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85eS3VersionKey67C8FBE4" + "Ref": "AssetParametersa56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890S3VersionKey0582948B" } ] } @@ -1041,19 +1082,22 @@ }, "Parameters": { "referencetoawscdkeksclusterprivateendpointtestClusterCreationRole990BAAEAArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, - "referencetoawscdkeksclusterprivateendpointtestAssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3BucketE0A870AERef": { - "Ref": "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket85C441D9" + "referencetoawscdkeksclusterprivateendpointtestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3BucketE84B7538Ref": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C" }, - "referencetoawscdkeksclusterprivateendpointtestAssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKey087D1457Ref": { - "Ref": "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKeyABBEC6F6" + "referencetoawscdkeksclusterprivateendpointtestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey5FC346A2Ref": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9" }, - "referencetoawscdkeksclusterprivateendpointtestAssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket3935A25BRef": { - "Ref": "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket208EDB42" + "referencetoawscdkeksclusterprivateendpointtestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3BucketF4479BE8Ref": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135" }, - "referencetoawscdkeksclusterprivateendpointtestAssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKeyAEEB2678Ref": { - "Ref": "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey08C22772" + "referencetoawscdkeksclusterprivateendpointtestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKeyBBC4B419Ref": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB" }, "referencetoawscdkeksclusterprivateendpointtestAssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3Bucket7DDAFC04Ref": { "Ref": "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1" @@ -1079,7 +1123,7 @@ }, "/", { - "Ref": "AssetParameters15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5S3BucketEFCDE17E" + "Ref": "AssetParametersb9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026S3BucketAF6BC29D" }, "/", { @@ -1089,7 +1133,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5S3VersionKey45DCD631" + "Ref": "AssetParametersb9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026S3VersionKey979EE7C4" } ] } @@ -1102,7 +1146,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5S3VersionKey45DCD631" + "Ref": "AssetParametersb9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026S3VersionKey979EE7C4" } ] } @@ -1113,10 +1157,16 @@ }, "Parameters": { "referencetoawscdkeksclusterprivateendpointtestClusterF4CF4FE8Arn": { - "Fn::GetAtt": ["Cluster9EE0221C", "Arn"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Arn" + ] }, "referencetoawscdkeksclusterprivateendpointtestClusterCreationRole990BAAEAArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "referencetoawscdkeksclusterprivateendpointtestAssetParameters4129bbca38164ecb28fee8e5b674f0d05e5957b4b8ed97d9c950527b5cc4ce10S3Bucket5F23B36DRef": { "Ref": "AssetParameters4129bbca38164ecb28fee8e5b674f0d05e5957b4b8ed97d9c950527b5cc4ce10S3BucketC6FAEEC9" @@ -1134,7 +1184,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" }, "referencetoawscdkeksclusterprivateendpointtestClusterF4CF4FE8ClusterSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "referencetoawscdkeksclusterprivateendpointtestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketFD6C4D26Ref": { "Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7" @@ -1172,7 +1225,10 @@ }, " --region test-region --role-arn ", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] } ] ] @@ -1189,7 +1245,10 @@ }, " --region test-region --role-arn ", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] } ] ] @@ -1197,29 +1256,29 @@ } }, "Parameters": { - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket85C441D9": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C": { "Type": "String", - "Description": "S3 bucket for asset \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "S3 bucket for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKeyABBEC6F6": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9": { "Type": "String", - "Description": "S3 key for asset version \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "S3 key for asset version \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcArtifactHashC6D6393C": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4ArtifactHash26192139": { "Type": "String", - "Description": "Artifact hash for asset \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "Artifact hash for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket208EDB42": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135": { "Type": "String", - "Description": "S3 bucket for asset \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "S3 bucket for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey08C22772": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB": { "Type": "String", - "Description": "S3 key for asset version \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "S3 key for asset version \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefArtifactHash861FF133": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccArtifactHashCC7E7A09": { "Type": "String", - "Description": "Artifact hash for asset \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "Artifact hash for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1": { "Type": "String", @@ -1269,29 +1328,29 @@ "Type": "String", "Description": "Artifact hash for asset \"ea17febe6d04c66048f3e8e060c71685c0cb53122abceff44842d27bc0d4a03e\"" }, - "AssetParameters2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85eS3Bucket880F308A": { + "AssetParametersa56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890S3Bucket02F74E4B": { "Type": "String", - "Description": "S3 bucket for asset \"2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85e\"" + "Description": "S3 bucket for asset \"a56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890\"" }, - "AssetParameters2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85eS3VersionKey67C8FBE4": { + "AssetParametersa56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890S3VersionKey0582948B": { "Type": "String", - "Description": "S3 key for asset version \"2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85e\"" + "Description": "S3 key for asset version \"a56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890\"" }, - "AssetParameters2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85eArtifactHash5B39BCF8": { + "AssetParametersa56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890ArtifactHash67434B72": { "Type": "String", - "Description": "Artifact hash for asset \"2b4b27a5dbac433df377885ab4121999042fe5e0b5ba995556de20f74c03b85e\"" + "Description": "Artifact hash for asset \"a56d8928013d02a98785ea769489d44faab804343ca2ee759e7f29a34f05c890\"" }, - "AssetParameters15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5S3BucketEFCDE17E": { + "AssetParametersb9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026S3BucketAF6BC29D": { "Type": "String", - "Description": "S3 bucket for asset \"15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5\"" + "Description": "S3 bucket for asset \"b9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026\"" }, - "AssetParameters15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5S3VersionKey45DCD631": { + "AssetParametersb9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026S3VersionKey979EE7C4": { "Type": "String", - "Description": "S3 key for asset version \"15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5\"" + "Description": "S3 key for asset version \"b9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026\"" }, - "AssetParameters15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5ArtifactHash155A4596": { + "AssetParametersb9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026ArtifactHash8B6627D0": { "Type": "String", - "Description": "Artifact hash for asset \"15015fc8ee187f2f31b7de5655eca3d8eff4e1c48e7c7243f61841f14cf5d6f5\"" + "Description": "Artifact hash for asset \"b9c099cddd88daf1512888f8ad4404f0f292ed3432f712d6a0eeddd74499b026\"" } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json index 252abae7c493c..8ec7f02e4bd0c 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json @@ -143,7 +143,9 @@ "Ref": "VpcIGWD7BA715C" } }, - "DependsOn": ["VpcVPCGWBF912B6E"] + "DependsOn": [ + "VpcVPCGWBF912B6E" + ] }, "VpcPublicSubnet1EIPD7E02669": { "Type": "AWS::EC2::EIP", @@ -168,7 +170,10 @@ "Ref": "VpcPublicSubnet1Subnet5C2D37C4" }, "AllocationId": { - "Fn::GetAtt": ["VpcPublicSubnet1EIPD7E02669", "AllocationId"] + "Fn::GetAtt": [ + "VpcPublicSubnet1EIPD7E02669", + "AllocationId" + ] }, "Tags": [ { @@ -251,7 +256,9 @@ "Ref": "VpcIGWD7BA715C" } }, - "DependsOn": ["VpcVPCGWBF912B6E"] + "DependsOn": [ + "VpcVPCGWBF912B6E" + ] }, "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", @@ -322,7 +329,9 @@ "Ref": "VpcIGWD7BA715C" } }, - "DependsOn": ["VpcVPCGWBF912B6E"] + "DependsOn": [ + "VpcVPCGWBF912B6E" + ] }, "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", @@ -610,10 +619,16 @@ "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "ToPort": 443 } @@ -625,7 +640,10 @@ "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "SourceSecurityGroupId": { "Fn::GetAtt": [ @@ -643,7 +661,10 @@ "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "SourceSecurityGroupId": { "Fn::GetAtt": [ @@ -661,10 +682,16 @@ "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "ToPort": 443 } @@ -676,7 +703,10 @@ "Description": "from awscdkeksclustertestClusterInferenceInstancesInstanceSecurityGroup42C57C51:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "SourceSecurityGroupId": { "Fn::GetAtt": [ @@ -755,7 +785,10 @@ "Action": "iam:PassRole", "Effect": "Allow", "Resource": { - "Fn::GetAtt": ["ClusterRoleFA261979", "Arn"] + "Fn::GetAtt": [ + "ClusterRoleFA261979", + "Arn" + ] } }, { @@ -771,7 +804,9 @@ "eks:UntagResource" ], "Effect": "Allow", - "Resource": ["*"] + "Resource": [ + "*" + ] }, { "Action": [ @@ -782,7 +817,10 @@ "Resource": "*" }, { - "Action": ["iam:GetRole", "iam:listAttachedRolePolicies"], + "Action": [ + "iam:GetRole", + "iam:listAttachedRolePolicies" + ], "Effect": "Allow", "Resource": "*" }, @@ -813,7 +851,10 @@ ], "Effect": "Allow", "Resource": { - "Fn::GetAtt": ["SecretsKey317DCF94", "Arn"] + "Fn::GetAtt": [ + "SecretsKey317DCF94", + "Arn" + ] } }, { @@ -880,16 +921,24 @@ "Config": { "version": "1.21", "roleArn": { - "Fn::GetAtt": ["ClusterRoleFA261979", "Arn"] + "Fn::GetAtt": [ + "ClusterRoleFA261979", + "Arn" + ] }, "encryptionConfig": [ { "provider": { "keyArn": { - "Fn::GetAtt": ["SecretsKey317DCF94", "Arn"] + "Fn::GetAtt": [ + "SecretsKey317DCF94", + "Arn" + ] } }, - "resources": ["secrets"] + "resources": [ + "secrets" + ] } ], "resourcesVpcConfig": { @@ -926,7 +975,10 @@ } }, "AssumeRoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "AttributesRevision": 2 }, @@ -987,10 +1039,16 @@ "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "ToPort": 443 } @@ -1002,7 +1060,10 @@ "Description": "from awscdkeksclustertestClusterNodesArmInstanceSecurityGroup52C45858:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "SourceSecurityGroupId": { "Fn::GetAtt": [ @@ -1020,7 +1081,10 @@ "Description": "from awscdkeksclustertestClusterBottlerocketNodesInstanceSecurityGroup83FE7914:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "SourceSecurityGroupId": { "Fn::GetAtt": [ @@ -1038,10 +1102,16 @@ "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "ToPort": 443 } @@ -1053,7 +1123,10 @@ "Description": "from awscdkeksclustertestClusterInferenceInstancesInstanceSecurityGroup42C57C51:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "SourceSecurityGroupId": { "Fn::GetAtt": [ @@ -1079,11 +1152,17 @@ [ "[{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\",\"metadata\":{\"name\":\"aws-auth\",\"namespace\":\"kube-system\",\"labels\":{\"aws.cdk.eks/prune-c842be348c45337cd97b8759de76d5a68b4910d487\":\"\"}},\"data\":{\"mapRoles\":\"[{\\\"rolearn\\\":\\\"", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] }, "\\\",\\\"username\\\":\\\"", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] }, "\\\",\\\"groups\\\":[\\\"system:masters\\\"]},{\\\"rolearn\\\":\\\"", { @@ -1101,11 +1180,17 @@ }, "\\\",\\\"username\\\":\\\"system:node:{{SessionName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\",\\\"system:node-proxier\\\"]},{\\\"rolearn\\\":\\\"", { - "Fn::GetAtt": ["ClusterNodesInstanceRoleC3C01328", "Arn"] + "Fn::GetAtt": [ + "ClusterNodesInstanceRoleC3C01328", + "Arn" + ] }, "\\\",\\\"username\\\":\\\"system:node:{{EC2PrivateDNSName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\"]},{\\\"rolearn\\\":\\\"", { - "Fn::GetAtt": ["ClusterNodesArmInstanceRoleB93D3298", "Arn"] + "Fn::GetAtt": [ + "ClusterNodesArmInstanceRoleB93D3298", + "Arn" + ] }, "\\\",\\\"username\\\":\\\"system:node:{{EC2PrivateDNSName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\"]},{\\\"rolearn\\\":\\\"", { @@ -1116,7 +1201,10 @@ }, "\\\",\\\"username\\\":\\\"system:node:{{EC2PrivateDNSName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\"]},{\\\"rolearn\\\":\\\"", { - "Fn::GetAtt": ["ClusterspotInstanceRole39043830", "Arn"] + "Fn::GetAtt": [ + "ClusterspotInstanceRole39043830", + "Arn" + ] }, "\\\",\\\"username\\\":\\\"system:node:{{EC2PrivateDNSName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\"]},{\\\"rolearn\\\":\\\"", { @@ -1161,12 +1249,17 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c842be348c45337cd97b8759de76d5a68b4910d487", "Overwrite": true }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -1260,7 +1353,9 @@ ], "AmiType": "AL2_x86_64", "ForceUpdateEnabled": true, - "InstanceTypes": ["m5.large"], + "InstanceTypes": [ + "m5.large" + ], "ScalingConfig": { "DesiredSize": 2, "MaxSize": 2, @@ -1309,7 +1404,10 @@ ] }, "AssumeRoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "Config": { "clusterName": { @@ -1359,10 +1457,16 @@ "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterNodesInstanceSecurityGroupD0B64C54:ALL TRAFFIC", "GroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] } } }, @@ -1373,10 +1477,16 @@ "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 443 } @@ -1388,10 +1498,16 @@ "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 443 } @@ -1403,10 +1519,16 @@ "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 65535 } @@ -1418,10 +1540,16 @@ "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { - "Fn::GetAtt": ["ClusterNodesInstanceSecurityGroup899246BD", "GroupId"] + "Fn::GetAtt": [ + "ClusterNodesInstanceSecurityGroup899246BD", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 65535 } @@ -1539,7 +1667,10 @@ ] }, { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] } ], "UserData": { @@ -1553,11 +1684,17 @@ }, " --kubelet-extra-args \"--node-labels lifecycle=OnDemand\" --apiserver-endpoint '", { - "Fn::GetAtt": ["Cluster9EE0221C", "Endpoint"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Endpoint" + ] }, "' --b64-cluster-ca '", { - "Fn::GetAtt": ["Cluster9EE0221C", "CertificateAuthorityData"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "CertificateAuthorityData" + ] }, "' --use-max-pods true\n/opt/aws/bin/cfn-signal --exit-code $? --stack aws-cdk-eks-cluster-test --resource ClusterNodesASGF172BD19 --region test-region" ] @@ -1565,7 +1702,9 @@ } } }, - "DependsOn": ["ClusterNodesInstanceRoleC3C01328"] + "DependsOn": [ + "ClusterNodesInstanceRoleC3C01328" + ] }, "ClusterNodesASGF172BD19": { "Type": "AWS::AutoScaling::AutoScalingGroup", @@ -1669,7 +1808,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 443 } @@ -1687,7 +1829,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 443 } @@ -1705,7 +1850,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 65535 } @@ -1723,7 +1871,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 65535 } @@ -1841,7 +1992,10 @@ ] }, { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] } ], "UserData": { @@ -1855,11 +2009,17 @@ }, " --kubelet-extra-args \"--node-labels lifecycle=OnDemand\" --apiserver-endpoint '", { - "Fn::GetAtt": ["Cluster9EE0221C", "Endpoint"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Endpoint" + ] }, "' --b64-cluster-ca '", { - "Fn::GetAtt": ["Cluster9EE0221C", "CertificateAuthorityData"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "CertificateAuthorityData" + ] }, "' --use-max-pods true\n/opt/aws/bin/cfn-signal --exit-code $? --stack aws-cdk-eks-cluster-test --resource ClusterNodesArmASG40A593D0 --region test-region" ] @@ -1867,7 +2027,9 @@ } } }, - "DependsOn": ["ClusterNodesArmInstanceRoleB93D3298"] + "DependsOn": [ + "ClusterNodesArmInstanceRoleB93D3298" + ] }, "ClusterNodesArmASG40A593D0": { "Type": "AWS::AutoScaling::AutoScalingGroup", @@ -1971,7 +2133,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 443 } @@ -1989,7 +2154,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 443 } @@ -2007,7 +2175,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 65535 } @@ -2025,7 +2196,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 65535 } @@ -2143,7 +2317,10 @@ ] }, { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] } ], "UserData": { @@ -2153,11 +2330,17 @@ [ "\n[settings.kubernetes]\napi-server=\"", { - "Fn::GetAtt": ["Cluster9EE0221C", "Endpoint"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Endpoint" + ] }, "\"\ncluster-certificate=\"", { - "Fn::GetAtt": ["Cluster9EE0221C", "CertificateAuthorityData"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "CertificateAuthorityData" + ] }, "\"\ncluster-name=\"", { @@ -2169,7 +2352,9 @@ } } }, - "DependsOn": ["ClusterBottlerocketNodesInstanceRole68E4BCFB"] + "DependsOn": [ + "ClusterBottlerocketNodesInstanceRole68E4BCFB" + ] }, "ClusterBottlerocketNodesASGA27A9B70": { "Type": "AWS::AutoScaling::AutoScalingGroup", @@ -2247,10 +2432,16 @@ "IpProtocol": "-1", "Description": "from awscdkeksclustertestClusterspotInstanceSecurityGroupF50F5D47:ALL TRAFFIC", "GroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] } } }, @@ -2261,10 +2452,16 @@ "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 443 } @@ -2276,10 +2473,16 @@ "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:443", "FromPort": 443, "GroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 443 } @@ -2291,10 +2494,16 @@ "Description": "from awscdkeksclustertestClusterClusterSecurityGroupF7265A32:1025-65535", "FromPort": 1025, "GroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 65535 } @@ -2306,10 +2515,16 @@ "Description": "from awscdkeksclustertestClusterControlPlaneSecurityGroup2F130134:1025-65535", "FromPort": 1025, "GroupId": { - "Fn::GetAtt": ["ClusterspotInstanceSecurityGroup01F7B1CE", "GroupId"] + "Fn::GetAtt": [ + "ClusterspotInstanceSecurityGroup01F7B1CE", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 65535 } @@ -2427,7 +2642,10 @@ ] }, { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] } ], "SpotPrice": "0.1094", @@ -2442,11 +2660,17 @@ }, " --kubelet-extra-args \"--node-labels lifecycle=Ec2Spot --register-with-taints=spotInstance=true:PreferNoSchedule --node-labels foo=bar,goo=far\" --apiserver-endpoint '", { - "Fn::GetAtt": ["Cluster9EE0221C", "Endpoint"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Endpoint" + ] }, "' --b64-cluster-ca '", { - "Fn::GetAtt": ["Cluster9EE0221C", "CertificateAuthorityData"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "CertificateAuthorityData" + ] }, "' --use-max-pods true --aws-api-retry-attempts 5\n/opt/aws/bin/cfn-signal --exit-code $? --stack aws-cdk-eks-cluster-test --resource ClusterspotASG857494B6 --region test-region" ] @@ -2454,7 +2678,9 @@ } } }, - "DependsOn": ["ClusterspotInstanceRole39043830"] + "DependsOn": [ + "ClusterspotInstanceRole39043830" + ] }, "ClusterspotASG857494B6": { "Type": "AWS::AutoScaling::AutoScalingGroup", @@ -2517,7 +2743,10 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "Release": "ksclustertestclusterchartspotinterrupthandlerf41ba997", "Chart": "aws-node-termination-handler", @@ -2527,7 +2756,9 @@ "Repository": "https://aws.github.io/eks-charts", "CreateNamespace": true }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -2585,7 +2816,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 443 } @@ -2603,7 +2837,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 443 } @@ -2621,7 +2858,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "ToPort": 65535 } @@ -2639,7 +2879,10 @@ ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["ClusterControlPlaneSecurityGroupD274242C", "GroupId"] + "Fn::GetAtt": [ + "ClusterControlPlaneSecurityGroupD274242C", + "GroupId" + ] }, "ToPort": 65535 } @@ -2757,7 +3000,10 @@ ] }, { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] } ], "UserData": { @@ -2771,11 +3017,17 @@ }, " --kubelet-extra-args \"--node-labels lifecycle=OnDemand\" --apiserver-endpoint '", { - "Fn::GetAtt": ["Cluster9EE0221C", "Endpoint"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Endpoint" + ] }, "' --b64-cluster-ca '", { - "Fn::GetAtt": ["Cluster9EE0221C", "CertificateAuthorityData"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "CertificateAuthorityData" + ] }, "' --use-max-pods true\n/opt/aws/bin/cfn-signal --exit-code $? --stack aws-cdk-eks-cluster-test --resource ClusterInferenceInstancesASGE90717C7 --region test-region" ] @@ -2783,7 +3035,9 @@ } } }, - "DependsOn": ["ClusterInferenceInstancesInstanceRole59AC6F56"] + "DependsOn": [ + "ClusterInferenceInstancesInstanceRole59AC6F56" + ] }, "ClusterInferenceInstancesASGE90717C7": { "Type": "AWS::AutoScaling::AutoScalingGroup", @@ -2847,11 +3101,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c88223d575036bcf663303b6778373ae4854f1fe3b" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -2927,7 +3186,10 @@ "Ref": "Cluster9EE0221C" }, "NodeRole": { - "Fn::GetAtt": ["ClusterNodegroupextrangNodeGroupRole23AE23D0", "Arn"] + "Fn::GetAtt": [ + "ClusterNodegroupextrangNodeGroupRole23AE23D0", + "Arn" + ] }, "Subnets": [ { @@ -2942,7 +3204,9 @@ ], "AmiType": "AL2_x86_64", "ForceUpdateEnabled": true, - "InstanceTypes": ["t3.small"], + "InstanceTypes": [ + "t3.small" + ], "ScalingConfig": { "DesiredSize": 1, "MaxSize": 1, @@ -3041,7 +3305,11 @@ "AmiType": "AL2_x86_64", "CapacityType": "SPOT", "ForceUpdateEnabled": true, - "InstanceTypes": ["c5.large", "c5a.large", "c5d.large"], + "InstanceTypes": [ + "c5.large", + "c5a.large", + "c5d.large" + ], "ScalingConfig": { "DesiredSize": 3, "MaxSize": 3, @@ -3139,7 +3407,9 @@ ], "AmiType": "AL2_ARM_64", "ForceUpdateEnabled": true, - "InstanceTypes": ["m6g.medium"], + "InstanceTypes": [ + "m6g.medium" + ], "ScalingConfig": { "DesiredSize": 1, "MaxSize": 1, @@ -3176,7 +3446,10 @@ "Ref": "LaunchTemplate" }, "Version": { - "Fn::GetAtt": ["LaunchTemplate", "DefaultVersionNumber"] + "Fn::GetAtt": [ + "LaunchTemplate", + "DefaultVersionNumber" + ] } }, "ScalingConfig": { @@ -3200,11 +3473,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c8f0f7140f7358e29b7f58e81b507dcf744a3908f4" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3221,7 +3499,10 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "Release": "awscdkeksclustertestclusterchartdashboard1f3d83fe", "Chart": "kubernetes-dashboard", @@ -3229,7 +3510,9 @@ "Repository": "https://kubernetes.github.io/dashboard/", "CreateNamespace": true }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3258,11 +3541,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c8cd9cb2e127e0b0375ebc544f18d8513721895a27" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3280,11 +3568,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c84fd26f70b01a84daa5d3646e813820af6fde0970" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3301,7 +3594,10 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "Release": "awscdkeksclustertestclusterchartnginxingressa7f70129", "Chart": "nginx-ingress", @@ -3408,7 +3704,10 @@ [ "[{\"apiVersion\":\"v1\",\"kind\":\"ServiceAccount\",\"metadata\":{\"name\":\"awscdkeksclustertestclustermyserviceaccount4080bcdd\",\"namespace\":\"default\",\"labels\":{\"aws.cdk.eks/prune-c8f8dbf23319159cc2fef46283f7450b814e818252\":\"\",\"app.kubernetes.io/name\":\"awscdkeksclustertestclustermyserviceaccount4080bcdd\"},\"annotations\":{\"eks.amazonaws.com/role-arn\":\"", { - "Fn::GetAtt": ["ClusterMyServiceAccountRole85337B29", "Arn"] + "Fn::GetAtt": [ + "ClusterMyServiceAccountRole85337B29", + "Arn" + ] }, "\"}}}]" ] @@ -3418,11 +3717,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c8f8dbf23319159cc2fef46283f7450b814e818252" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3435,10 +3739,17 @@ "Arn" ] }, - "ClientIDList": ["sts.amazonaws.com"], - "ThumbprintList": ["9e99a48a9960b14926bb7f3b02e22da2b0ab7280"], + "ClientIDList": [ + "sts.amazonaws.com" + ], + "ThumbprintList": [ + "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" + ], "Url": { - "Fn::GetAtt": ["Cluster9EE0221C", "OpenIdConnectIssuerUrl"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "OpenIdConnectIssuerUrl" + ] } }, "UpdateReplacePolicy": "Delete", @@ -3458,11 +3769,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c8b6a5b3e6f9f4f1aa9dc400a13c96633da4822b2d" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3481,7 +3797,10 @@ [ "[{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"webservice\",\"annotations\":{\"service.beta.kubernetes.io/aws-load-balancer-internal\":\"true\",\"service.beta.kubernetes.io/aws-load-balancer-extra-security-groups\":\"", { - "Fn::GetAtt": ["WebServiceSecurityGroupA556AEB5", "GroupId"] + "Fn::GetAtt": [ + "WebServiceSecurityGroupA556AEB5", + "GroupId" + ] }, "\"},\"labels\":{\"aws.cdk.eks/prune-c84c09bc8d75d4cc4d672e0d3872dcdb35f628dc2c\":\"\"}},\"spec\":{\"type\":\"LoadBalancer\",\"ports\":[{\"port\":9000,\"targetPort\":80}],\"selector\":{\"app\":\"simple-web\"}}}]" ] @@ -3491,11 +3810,16 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c84c09bc8d75d4cc4d672e0d3872dcdb35f628dc2c" }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3512,7 +3836,10 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "ObjectType": "service", "ObjectName": "webservice", @@ -3520,7 +3847,9 @@ "JsonPath": ".status.loadBalancer.ingress[0].hostname", "TimeoutSeconds": 300 }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3537,7 +3866,7 @@ }, "/", { - "Ref": "AssetParameters4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996S3BucketDEC09A4A" + "Ref": "AssetParameters814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8cS3Bucket43FFBFD7" }, "/", { @@ -3547,7 +3876,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996S3VersionKey454B1BD5" + "Ref": "AssetParameters814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8cS3VersionKeyC7429316" } ] } @@ -3560,7 +3889,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996S3VersionKey454B1BD5" + "Ref": "AssetParameters814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8cS3VersionKeyC7429316" } ] } @@ -3571,19 +3900,22 @@ }, "Parameters": { "referencetoawscdkeksclustertestClusterCreationRole95F44854Arn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, - "referencetoawscdkeksclustertestAssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3BucketF0C34111Ref": { - "Ref": "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket85C441D9" + "referencetoawscdkeksclustertestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3BucketB7F30483Ref": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C" }, - "referencetoawscdkeksclustertestAssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKey01A2F046Ref": { - "Ref": "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKeyABBEC6F6" + "referencetoawscdkeksclustertestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKeyC41131F8Ref": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9" }, - "referencetoawscdkeksclustertestAssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket1C7DAFD3Ref": { - "Ref": "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket208EDB42" + "referencetoawscdkeksclustertestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3BucketEA485873Ref": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135" }, - "referencetoawscdkeksclustertestAssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey6FBDB806Ref": { - "Ref": "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey08C22772" + "referencetoawscdkeksclustertestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey2E164B3ERef": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB" }, "referencetoawscdkeksclustertestAssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3Bucket0815E7B5Ref": { "Ref": "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1" @@ -3609,7 +3941,7 @@ }, "/", { - "Ref": "AssetParameters0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52S3Bucket1BC62BBD" + "Ref": "AssetParameters8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22S3Bucket0782C98E" }, "/", { @@ -3619,7 +3951,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52S3VersionKey94294964" + "Ref": "AssetParameters8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22S3VersionKey5E9D14CC" } ] } @@ -3632,7 +3964,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52S3VersionKey94294964" + "Ref": "AssetParameters8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22S3VersionKey5E9D14CC" } ] } @@ -3643,10 +3975,16 @@ }, "Parameters": { "referencetoawscdkeksclustertestClusterD76DFF87Arn": { - "Fn::GetAtt": ["Cluster9EE0221C", "Arn"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Arn" + ] }, "referencetoawscdkeksclustertestClusterCreationRole95F44854Arn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "referencetoawscdkeksclustertestAssetParameters4129bbca38164ecb28fee8e5b674f0d05e5957b4b8ed97d9c950527b5cc4ce10S3Bucket3929FA93Ref": { "Ref": "AssetParameters4129bbca38164ecb28fee8e5b674f0d05e5957b4b8ed97d9c950527b5cc4ce10S3BucketC6FAEEC9" @@ -3664,7 +4002,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" }, "referencetoawscdkeksclustertestClusterD76DFF87ClusterSecurityGroupId": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] }, "referencetoawscdkeksclustertestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketB4E9C142Ref": { "Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7" @@ -3727,12 +4068,17 @@ "Ref": "Cluster9EE0221C" }, "RoleArn": { - "Fn::GetAtt": ["ClusterCreationRole360249B6", "Arn"] + "Fn::GetAtt": [ + "ClusterCreationRole360249B6", + "Arn" + ] }, "PruneLabel": "aws.cdk.eks/prune-c89cbcc5d9bdd35cfc69c0334c0a9af21d1e0e372e", "SkipValidation": true }, - "DependsOn": ["ClusterKubectlReadyBarrier200052AF"], + "DependsOn": [ + "ClusterKubectlReadyBarrier200052AF" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -3909,7 +4255,9 @@ }, "Runtime": "nodejs12.x" }, - "DependsOn": ["AWSCDKCfnUtilsProviderCustomResourceProviderRoleFE0EE867"] + "DependsOn": [ + "AWSCDKCfnUtilsProviderCustomResourceProviderRoleFE0EE867" + ] }, "WebServiceSecurityGroupA556AEB5": { "Type": "AWS::EC2::SecurityGroup", @@ -3934,10 +4282,16 @@ "Description": "allow http 9000 access from myself", "FromPort": 9000, "GroupId": { - "Fn::GetAtt": ["WebServiceSecurityGroupA556AEB5", "GroupId"] + "Fn::GetAtt": [ + "WebServiceSecurityGroupA556AEB5", + "GroupId" + ] }, "SourceSecurityGroupId": { - "Fn::GetAtt": ["WebServiceSecurityGroupA556AEB5", "GroupId"] + "Fn::GetAtt": [ + "WebServiceSecurityGroupA556AEB5", + "GroupId" + ] }, "ToPort": 9000 } @@ -4027,7 +4381,10 @@ } }, "Role": { - "Fn::GetAtt": ["ServicePingerFunctionServiceRole3120191B", "Arn"] + "Fn::GetAtt": [ + "ServicePingerFunctionServiceRole3120191B", + "Arn" + ] }, "Handler": "index.handler", "Runtime": "python3.6", @@ -4035,7 +4392,10 @@ "VpcConfig": { "SecurityGroupIds": [ { - "Fn::GetAtt": ["WebServiceSecurityGroupA556AEB5", "GroupId"] + "Fn::GetAtt": [ + "WebServiceSecurityGroupA556AEB5", + "GroupId" + ] } ], "SubnetIds": [ @@ -4051,7 +4411,9 @@ ] } }, - "DependsOn": ["ServicePingerFunctionServiceRole3120191B"] + "DependsOn": [ + "ServicePingerFunctionServiceRole3120191B" + ] }, "ServicePingerProviderframeworkonEventServiceRole3DB083B7": { "Type": "AWS::IAM::Role", @@ -4093,7 +4455,10 @@ "Action": "lambda:InvokeFunction", "Effect": "Allow", "Resource": { - "Fn::GetAtt": ["ServicePingerFunctionADF51BAF", "Arn"] + "Fn::GetAtt": [ + "ServicePingerFunctionADF51BAF", + "Arn" + ] } } ], @@ -4158,12 +4523,15 @@ "Environment": { "Variables": { "USER_ON_EVENT_FUNCTION_ARN": { - "Fn::GetAtt": ["ServicePingerFunctionADF51BAF", "Arn"] + "Fn::GetAtt": [ + "ServicePingerFunctionADF51BAF", + "Arn" + ] } } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -4175,7 +4543,10 @@ "Type": "AWS::CloudFormation::CustomResource", "Properties": { "ServiceToken": { - "Fn::GetAtt": ["ServicePingerProviderframeworkonEventEC59DE20", "Arn"] + "Fn::GetAtt": [ + "ServicePingerProviderframeworkonEventEC59DE20", + "Arn" + ] }, "Url": { "Fn::Join": [ @@ -4209,7 +4580,10 @@ }, " --region test-region --role-arn ", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] } ] ] @@ -4226,7 +4600,10 @@ }, " --region test-region --role-arn ", { - "Fn::GetAtt": ["AdminRole38563C57", "Arn"] + "Fn::GetAtt": [ + "AdminRole38563C57", + "Arn" + ] } ] ] @@ -4234,32 +4611,50 @@ }, "Response": { "Value": { - "Fn::GetAtt": ["ServicePinger01F6DA06", "Value"] + "Fn::GetAtt": [ + "ServicePinger01F6DA06", + "Value" + ] } }, "ClusterEndpoint": { "Value": { - "Fn::GetAtt": ["Cluster9EE0221C", "Endpoint"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Endpoint" + ] } }, "ClusterArn": { "Value": { - "Fn::GetAtt": ["Cluster9EE0221C", "Arn"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "Arn" + ] } }, "ClusterCertificateAuthorityData": { "Value": { - "Fn::GetAtt": ["Cluster9EE0221C", "CertificateAuthorityData"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "CertificateAuthorityData" + ] } }, "ClusterSecurityGroupId": { "Value": { - "Fn::GetAtt": ["Cluster9EE0221C", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "ClusterSecurityGroupId" + ] } }, "ClusterEncryptionConfigKeyArn": { "Value": { - "Fn::GetAtt": ["Cluster9EE0221C", "EncryptionConfigKeyArn"] + "Fn::GetAtt": [ + "Cluster9EE0221C", + "EncryptionConfigKeyArn" + ] } }, "ClusterName": { @@ -4269,29 +4664,29 @@ } }, "Parameters": { - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3Bucket85C441D9": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C": { "Type": "String", - "Description": "S3 bucket for asset \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "S3 bucket for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcS3VersionKeyABBEC6F6": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9": { "Type": "String", - "Description": "S3 key for asset version \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "S3 key for asset version \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersf9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffcArtifactHashC6D6393C": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4ArtifactHash26192139": { "Type": "String", - "Description": "Artifact hash for asset \"f9e3ed49f5734f267f6dfffed3c6038e2d31d096ca7e70ce257b16aa613a3ffc\"" + "Description": "Artifact hash for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3Bucket208EDB42": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135": { "Type": "String", - "Description": "S3 bucket for asset \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "S3 bucket for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefS3VersionKey08C22772": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB": { "Type": "String", - "Description": "S3 key for asset version \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "S3 key for asset version \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParameters80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaefArtifactHash861FF133": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccArtifactHashCC7E7A09": { "Type": "String", - "Description": "Artifact hash for asset \"80bcd5b0641df4315e277c71a1069094a5d7c76f9e2565c46b68a990c522eaef\"" + "Description": "Artifact hash for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1": { "Type": "String", @@ -4377,29 +4772,29 @@ "Type": "String", "Description": "Artifact hash for asset \"5f49893093e1ad14831626016699156d48da5f0890f19eb930bc3c46cf5f636d\"" }, - "AssetParameters4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996S3BucketDEC09A4A": { + "AssetParameters814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8cS3Bucket43FFBFD7": { "Type": "String", - "Description": "S3 bucket for asset \"4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996\"" + "Description": "S3 bucket for asset \"814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8c\"" }, - "AssetParameters4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996S3VersionKey454B1BD5": { + "AssetParameters814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8cS3VersionKeyC7429316": { "Type": "String", - "Description": "S3 key for asset version \"4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996\"" + "Description": "S3 key for asset version \"814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8c\"" }, - "AssetParameters4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996ArtifactHashC56B9B67": { + "AssetParameters814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8cArtifactHash52827559": { "Type": "String", - "Description": "Artifact hash for asset \"4eac204c18d7034bdb83d685748ca8f285edfd054338f3a045a749dbbf285996\"" + "Description": "Artifact hash for asset \"814bd2987aca76da9dffdab2f4cd144ebec3a7f5c35d6cd55548442ec311be8c\"" }, - "AssetParameters0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52S3Bucket1BC62BBD": { + "AssetParameters8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22S3Bucket0782C98E": { "Type": "String", - "Description": "S3 bucket for asset \"0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52\"" + "Description": "S3 bucket for asset \"8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22\"" }, - "AssetParameters0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52S3VersionKey94294964": { + "AssetParameters8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22S3VersionKey5E9D14CC": { "Type": "String", - "Description": "S3 key for asset version \"0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52\"" + "Description": "S3 key for asset version \"8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22\"" }, - "AssetParameters0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52ArtifactHash179183BB": { + "AssetParameters8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22ArtifactHash75F0D468": { "Type": "String", - "Description": "Artifact hash for asset \"0504b861a4c2a9b4228d6d618fb8a60f19b1c36575b96db9f1716e0eb6a2ee52\"" + "Description": "Artifact hash for asset \"8a135d8a645edaff330758972da87b3dddc295ce07475e8d9ea8fad8c35dcb22\"" }, "SsmParameterValueawsserviceeksoptimizedami121amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", @@ -4418,4 +4813,4 @@ "Default": "/aws/service/eks/optimized-ami/1.21/amazon-linux-2-gpu/recommended/image_id" } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.expected.json index e6c0db319aae8..0f0a5c61cdf67 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.expected.json @@ -9,8 +9,12 @@ "Arn" ] }, - "ClientIDList": ["sts.amazonaws.com"], - "ThumbprintList": ["9e99a48a9960b14926bb7f3b02e22da2b0ab7280"], + "ClientIDList": [ + "sts.amazonaws.com" + ], + "ThumbprintList": [ + "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" + ], "Url": { "Fn::Join": [ "", @@ -141,4 +145,4 @@ "Description": "Artifact hash for asset \"b7d38dc0eeb2c5d024919020e09d2590b68559eab4a5264c3b1aa7a429d1edd4\"" } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.fargate-cluster.expected.json b/packages/@aws-cdk/aws-eks/test/integ.fargate-cluster.expected.json index 8b4f65a8578c6..72efc126137d7 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.fargate-cluster.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.fargate-cluster.expected.json @@ -84,7 +84,9 @@ "Ref": "FargateClusterDefaultVpcIGWFD9278DA" } }, - "DependsOn": ["FargateClusterDefaultVpcVPCGWA7F012E1"] + "DependsOn": [ + "FargateClusterDefaultVpcVPCGWA7F012E1" + ] }, "FargateClusterDefaultVpcPublicSubnet1EIP0093A4E0": { "Type": "AWS::EC2::EIP", @@ -195,7 +197,9 @@ "Ref": "FargateClusterDefaultVpcIGWFD9278DA" } }, - "DependsOn": ["FargateClusterDefaultVpcVPCGWA7F012E1"] + "DependsOn": [ + "FargateClusterDefaultVpcVPCGWA7F012E1" + ] }, "FargateClusterDefaultVpcPublicSubnet2EIPA4C07B68": { "Type": "AWS::EC2::EIP", @@ -306,7 +310,9 @@ "Ref": "FargateClusterDefaultVpcIGWFD9278DA" } }, - "DependsOn": ["FargateClusterDefaultVpcVPCGWA7F012E1"] + "DependsOn": [ + "FargateClusterDefaultVpcVPCGWA7F012E1" + ] }, "FargateClusterDefaultVpcPublicSubnet3EIP46E028EF": { "Type": "AWS::EC2::EIP", @@ -699,7 +705,10 @@ "Action": "iam:PassRole", "Effect": "Allow", "Resource": { - "Fn::GetAtt": ["FargateClusterRole8E36B33A", "Arn"] + "Fn::GetAtt": [ + "FargateClusterRole8E36B33A", + "Arn" + ] } }, { @@ -715,7 +724,9 @@ "eks:UntagResource" ], "Effect": "Allow", - "Resource": ["*"] + "Resource": [ + "*" + ] }, { "Action": [ @@ -726,7 +737,10 @@ "Resource": "*" }, { - "Action": ["iam:GetRole", "iam:listAttachedRolePolicies"], + "Action": [ + "iam:GetRole", + "iam:listAttachedRolePolicies" + ], "Effect": "Allow", "Resource": "*" }, @@ -816,7 +830,10 @@ "Config": { "version": "1.21", "roleArn": { - "Fn::GetAtt": ["FargateClusterRole8E36B33A", "Arn"] + "Fn::GetAtt": [ + "FargateClusterRole8E36B33A", + "Arn" + ] }, "resourcesVpcConfig": { "subnetIds": [ @@ -852,7 +869,10 @@ } }, "AssumeRoleArn": { - "Fn::GetAtt": ["FargateClusterCreationRole8C524AD8", "Arn"] + "Fn::GetAtt": [ + "FargateClusterCreationRole8C524AD8", + "Arn" + ] }, "AttributesRevision": 2 }, @@ -953,11 +973,17 @@ [ "[{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\",\"metadata\":{\"name\":\"aws-auth\",\"namespace\":\"kube-system\"},\"data\":{\"mapRoles\":\"[{\\\"rolearn\\\":\\\"", { - "Fn::GetAtt": ["FargateClusterMastersRole50BAF9FD", "Arn"] + "Fn::GetAtt": [ + "FargateClusterMastersRole50BAF9FD", + "Arn" + ] }, "\\\",\\\"username\\\":\\\"", { - "Fn::GetAtt": ["FargateClusterMastersRole50BAF9FD", "Arn"] + "Fn::GetAtt": [ + "FargateClusterMastersRole50BAF9FD", + "Arn" + ] }, "\\\",\\\"groups\\\":[\\\"system:masters\\\"]},{\\\"rolearn\\\":\\\"", { @@ -974,11 +1000,16 @@ "Ref": "FargateCluster019F03E8" }, "RoleArn": { - "Fn::GetAtt": ["FargateClusterCreationRole8C524AD8", "Arn"] + "Fn::GetAtt": [ + "FargateClusterCreationRole8C524AD8", + "Arn" + ] }, "Overwrite": true }, - "DependsOn": ["FargateClusterKubectlReadyBarrier93746934"], + "DependsOn": [ + "FargateClusterKubectlReadyBarrier93746934" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -999,11 +1030,16 @@ "Ref": "FargateCluster019F03E8" }, "RoleArn": { - "Fn::GetAtt": ["FargateClusterCreationRole8C524AD8", "Arn"] + "Fn::GetAtt": [ + "FargateClusterCreationRole8C524AD8", + "Arn" + ] }, "PatchType": "strategic" }, - "DependsOn": ["FargateClusterKubectlReadyBarrier93746934"], + "DependsOn": [ + "FargateClusterKubectlReadyBarrier93746934" + ], "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, @@ -1048,7 +1084,10 @@ ] }, "AssumeRoleArn": { - "Fn::GetAtt": ["FargateClusterCreationRole8C524AD8", "Arn"] + "Fn::GetAtt": [ + "FargateClusterCreationRole8C524AD8", + "Arn" + ] }, "Config": { "clusterName": { @@ -1086,7 +1125,7 @@ }, "/", { - "Ref": "AssetParameters4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1S3BucketDA43FC2B" + "Ref": "AssetParameters9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566S3BucketBE3E205B" }, "/", { @@ -1096,7 +1135,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1S3VersionKey8EEC8DF7" + "Ref": "AssetParameters9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566S3VersionKeyAEF361AA" } ] } @@ -1109,7 +1148,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1S3VersionKey8EEC8DF7" + "Ref": "AssetParameters9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566S3VersionKeyAEF361AA" } ] } @@ -1120,19 +1159,22 @@ }, "Parameters": { "referencetoawscdkeksfargateclustertestFargateClusterCreationRoleFB2229CFArn": { - "Fn::GetAtt": ["FargateClusterCreationRole8C524AD8", "Arn"] + "Fn::GetAtt": [ + "FargateClusterCreationRole8C524AD8", + "Arn" + ] }, - "referencetoawscdkeksfargateclustertestAssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eS3Bucket276E8116Ref": { - "Ref": "AssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eS3Bucket575E2F4C" + "referencetoawscdkeksfargateclustertestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5CC464F5Ref": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C" }, - "referencetoawscdkeksfargateclustertestAssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eS3VersionKey0311C20FRef": { - "Ref": "AssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eS3VersionKeyFB3EB544" + "referencetoawscdkeksfargateclustertestAssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey610B35BCRef": { + "Ref": "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9" }, - "referencetoawscdkeksfargateclustertestAssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6S3Bucket4227CCC8Ref": { - "Ref": "AssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6S3Bucket04F6B25B" + "referencetoawscdkeksfargateclustertestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket3165858DRef": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135" }, - "referencetoawscdkeksfargateclustertestAssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6S3VersionKeyD7B57F35Ref": { - "Ref": "AssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6S3VersionKey6A7508AF" + "referencetoawscdkeksfargateclustertestAssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey1A1207D1Ref": { + "Ref": "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB" }, "referencetoawscdkeksfargateclustertestAssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3Bucket8EEF0922Ref": { "Ref": "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1" @@ -1158,7 +1200,7 @@ }, "/", { - "Ref": "AssetParameters43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730S3Bucket9850F63C" + "Ref": "AssetParameters6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802dS3Bucket92B50C24" }, "/", { @@ -1168,7 +1210,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730S3VersionKey916810E5" + "Ref": "AssetParameters6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802dS3VersionKeyB7108D30" } ] } @@ -1181,7 +1223,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730S3VersionKey916810E5" + "Ref": "AssetParameters6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802dS3VersionKeyB7108D30" } ] } @@ -1192,10 +1234,16 @@ }, "Parameters": { "referencetoawscdkeksfargateclustertestFargateCluster8588769EArn": { - "Fn::GetAtt": ["FargateCluster019F03E8", "Arn"] + "Fn::GetAtt": [ + "FargateCluster019F03E8", + "Arn" + ] }, "referencetoawscdkeksfargateclustertestFargateClusterCreationRoleFB2229CFArn": { - "Fn::GetAtt": ["FargateClusterCreationRole8C524AD8", "Arn"] + "Fn::GetAtt": [ + "FargateClusterCreationRole8C524AD8", + "Arn" + ] }, "referencetoawscdkeksfargateclustertestAssetParameters4129bbca38164ecb28fee8e5b674f0d05e5957b4b8ed97d9c950527b5cc4ce10S3BucketC4DF4301Ref": { "Ref": "AssetParameters4129bbca38164ecb28fee8e5b674f0d05e5957b4b8ed97d9c950527b5cc4ce10S3BucketC6FAEEC9" @@ -1213,7 +1261,10 @@ "Ref": "FargateClusterDefaultVpcPrivateSubnet3Subnet1F8A52F1" }, "referencetoawscdkeksfargateclustertestFargateCluster8588769EClusterSecurityGroupId": { - "Fn::GetAtt": ["FargateCluster019F03E8", "ClusterSecurityGroupId"] + "Fn::GetAtt": [ + "FargateCluster019F03E8", + "ClusterSecurityGroupId" + ] }, "referencetoawscdkeksfargateclustertestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3Bucket4F20F642Ref": { "Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7" @@ -1251,7 +1302,10 @@ }, " --region test-region --role-arn ", { - "Fn::GetAtt": ["FargateClusterMastersRole50BAF9FD", "Arn"] + "Fn::GetAtt": [ + "FargateClusterMastersRole50BAF9FD", + "Arn" + ] } ] ] @@ -1268,7 +1322,10 @@ }, " --region test-region --role-arn ", { - "Fn::GetAtt": ["FargateClusterMastersRole50BAF9FD", "Arn"] + "Fn::GetAtt": [ + "FargateClusterMastersRole50BAF9FD", + "Arn" + ] } ] ] @@ -1276,29 +1333,29 @@ } }, "Parameters": { - "AssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eS3Bucket575E2F4C": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3Bucket5B1EB03C": { "Type": "String", - "Description": "S3 bucket for asset \"2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7e\"" + "Description": "S3 bucket for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eS3VersionKeyFB3EB544": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4S3VersionKey51E064E9": { "Type": "String", - "Description": "S3 key for asset version \"2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7e\"" + "Description": "S3 key for asset version \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParameters2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7eArtifactHashDB8E8B5A": { + "AssetParametersd78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4ArtifactHash26192139": { "Type": "String", - "Description": "Artifact hash for asset \"2fbc509041827d9042c1a07f5a1b3629c583224b5543800048ed8be264460e7e\"" + "Description": "Artifact hash for asset \"d78765b92df2a80d8f6054e616200f6099a238f29fe81a199c2c217ffe1a12b4\"" }, - "AssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6S3Bucket04F6B25B": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3Bucket40405135": { "Type": "String", - "Description": "S3 bucket for asset \"d1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6\"" + "Description": "S3 bucket for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6S3VersionKey6A7508AF": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccS3VersionKey50B477EB": { "Type": "String", - "Description": "S3 key for asset version \"d1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6\"" + "Description": "S3 key for asset version \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, - "AssetParametersd1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6ArtifactHashF7473C14": { + "AssetParametersca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864ccArtifactHashCC7E7A09": { "Type": "String", - "Description": "Artifact hash for asset \"d1380bb36e9a4e378cf1d8fe7779efa967f218e380fd40aad493f588a9872dd6\"" + "Description": "Artifact hash for asset \"ca2c913ffc0cd2016ee8bae9a571d12d6eca2284408cb99dd0ebff5b061864cc\"" }, "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1": { "Type": "String", @@ -1348,29 +1405,29 @@ "Type": "String", "Description": "Artifact hash for asset \"ea17febe6d04c66048f3e8e060c71685c0cb53122abceff44842d27bc0d4a03e\"" }, - "AssetParameters4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1S3BucketDA43FC2B": { + "AssetParameters9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566S3BucketBE3E205B": { "Type": "String", - "Description": "S3 bucket for asset \"4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1\"" + "Description": "S3 bucket for asset \"9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566\"" }, - "AssetParameters4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1S3VersionKey8EEC8DF7": { + "AssetParameters9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566S3VersionKeyAEF361AA": { "Type": "String", - "Description": "S3 key for asset version \"4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1\"" + "Description": "S3 key for asset version \"9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566\"" }, - "AssetParameters4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1ArtifactHashBE7188C3": { + "AssetParameters9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566ArtifactHashE4B867B7": { "Type": "String", - "Description": "Artifact hash for asset \"4c4969b4a5efb3bab0be954e7004f3c4f427bb7ebcf996b97782bff6d1c7c8c1\"" + "Description": "Artifact hash for asset \"9528c3c9068ee4a23508464ed79290c4fa16c4d17230421015fdc585ec202566\"" }, - "AssetParameters43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730S3Bucket9850F63C": { + "AssetParameters6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802dS3Bucket92B50C24": { "Type": "String", - "Description": "S3 bucket for asset \"43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730\"" + "Description": "S3 bucket for asset \"6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802d\"" }, - "AssetParameters43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730S3VersionKey916810E5": { + "AssetParameters6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802dS3VersionKeyB7108D30": { "Type": "String", - "Description": "S3 key for asset version \"43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730\"" + "Description": "S3 key for asset version \"6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802d\"" }, - "AssetParameters43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730ArtifactHash20D7E89E": { + "AssetParameters6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802dArtifactHashE3B502E1": { "Type": "String", - "Description": "Artifact hash for asset \"43ce4fd59055093cb506c39ae8eccdf3cdbe53b4d310ac381b3a9db3c523d730\"" + "Description": "Artifact hash for asset \"6b899044dd4c0806c8b311f44f756b062c8da54e6ff69ae3ed28d6dab912802d\"" } } -} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-redshift/lib/private/database-query.ts b/packages/@aws-cdk/aws-redshift/lib/private/database-query.ts index 2f724334b637a..7acb424a66594 100644 --- a/packages/@aws-cdk/aws-redshift/lib/private/database-query.ts +++ b/packages/@aws-cdk/aws-redshift/lib/private/database-query.ts @@ -36,7 +36,7 @@ export class DatabaseQuery extends CoreConstruct implements iam.IG const adminUser = this.getAdminUser(props); const handler = new lambda.SingletonFunction(this, 'Handler', { code: lambda.Code.fromAsset(path.join(__dirname, 'database-query-provider')), - runtime: lambda.Runtime.NODEJS_14_X, + runtime: lambda.Runtime.NODEJS_12_X, handler: 'index.handler', timeout: cdk.Duration.minutes(1), uuid: '3de5bea7-27da-4796-8662-5efb56431b5f', diff --git a/packages/@aws-cdk/aws-redshift/test/integ.database.expected.json b/packages/@aws-cdk/aws-redshift/test/integ.database.expected.json index b346d3e7abfb3..16d60bb08c0d0 100644 --- a/packages/@aws-cdk/aws-redshift/test/integ.database.expected.json +++ b/packages/@aws-cdk/aws-redshift/test/integ.database.expected.json @@ -841,7 +841,7 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -996,7 +996,7 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -1129,7 +1129,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49S3Bucket148631C8" + "Ref": "AssetParameters7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4fS3Bucket3B967306" }, "S3Key": { "Fn::Join": [ @@ -1142,7 +1142,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49S3VersionKey1A4E04E7" + "Ref": "AssetParameters7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4fS3VersionKeyC171429B" } ] } @@ -1155,7 +1155,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49S3VersionKey1A4E04E7" + "Ref": "AssetParameters7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4fS3VersionKeyC171429B" } ] } @@ -1172,7 +1172,7 @@ ] }, "Handler": "index.handler", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 60 }, "DependsOn": [ @@ -1302,7 +1302,7 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -1349,17 +1349,17 @@ } }, "Parameters": { - "AssetParameters483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49S3Bucket148631C8": { + "AssetParameters7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4fS3Bucket3B967306": { "Type": "String", - "Description": "S3 bucket for asset \"483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49\"" + "Description": "S3 bucket for asset \"7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4f\"" }, - "AssetParameters483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49S3VersionKey1A4E04E7": { + "AssetParameters7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4fS3VersionKeyC171429B": { "Type": "String", - "Description": "S3 key for asset version \"483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49\"" + "Description": "S3 key for asset version \"7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4f\"" }, - "AssetParameters483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49ArtifactHashEB952795": { + "AssetParameters7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4fArtifactHash0EE8CD3D": { "Type": "String", - "Description": "Artifact hash for asset \"483841e46ab98aa099d0371a7800e2ace3ddbbb12cb8efb3162ca172ebdafd49\"" + "Description": "Artifact hash for asset \"7eb6a250bd5ce32c07f08f536377d71e59ad43e16e25b9aa6e50f6fc20fdfc4f\"" }, "AssetParametersdaeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1S3BucketDC4B98B1": { "Type": "String", diff --git a/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json b/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json index 4379649e02d69..fbb346b959470 100644 --- a/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json +++ b/packages/@aws-cdk/aws-ses-actions/test/integ.actions.expected.json @@ -385,7 +385,7 @@ ] }, "Handler": "index.handler", - "Runtime": "nodejs14.x" + "Runtime": "nodejs12.x" }, "DependsOn": [ "SingletonLambda224e77f9a32e4b4dac32983477abba16ServiceRole3037F5B4" diff --git a/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts b/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts index 7f6f1fe914a6b..7d6a4bad92bb0 100644 --- a/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts +++ b/packages/@aws-cdk/aws-ses/lib/receipt-rule.ts @@ -176,7 +176,7 @@ export class DropSpamReceiptRule extends CoreConstruct { super(scope, id); const fn = new lambda.SingletonFunction(this, 'Function', { - runtime: lambda.Runtime.NODEJS_14_X, + runtime: lambda.Runtime.NODEJS_12_X, handler: 'index.handler', code: lambda.Code.fromAsset(path.join(__dirname, 'drop-spam-handler')), uuid: '224e77f9-a32e-4b4d-ac32-983477abba16', diff --git a/packages/@aws-cdk/aws-ses/test/integ.receipt.expected.json b/packages/@aws-cdk/aws-ses/test/integ.receipt.expected.json index 0a9442a97f6a0..f0a9a624f4f3f 100644 --- a/packages/@aws-cdk/aws-ses/test/integ.receipt.expected.json +++ b/packages/@aws-cdk/aws-ses/test/integ.receipt.expected.json @@ -141,7 +141,7 @@ ] }, "Handler": "index.handler", - "Runtime": "nodejs14.x" + "Runtime": "nodejs12.x" }, "DependsOn": [ "SingletonLambda224e77f9a32e4b4dac32983477abba16ServiceRole3037F5B4" diff --git a/packages/@aws-cdk/custom-resources/lib/provider-framework/provider.ts b/packages/@aws-cdk/custom-resources/lib/provider-framework/provider.ts index 8d99963627a4a..c2f7ef69c98bb 100644 --- a/packages/@aws-cdk/custom-resources/lib/provider-framework/provider.ts +++ b/packages/@aws-cdk/custom-resources/lib/provider-framework/provider.ts @@ -202,7 +202,7 @@ export class Provider extends CoreConstruct implements ICustomResourceProvider { const fn = new lambda.Function(this, `framework-${entrypoint}`, { code: lambda.Code.fromAsset(RUNTIME_HANDLER_PATH), description: `AWS CDK resource provider framework - ${entrypoint} (${this.node.path})`.slice(0, 256), - runtime: lambda.Runtime.NODEJS_14_X, + runtime: lambda.Runtime.NODEJS_12_X, handler: `framework.${entrypoint}`, timeout: FRAMEWORK_HANDLER_TIMEOUT, logRetention: this.logRetention, diff --git a/packages/@aws-cdk/custom-resources/test/provider-framework/integ.provider.expected.json b/packages/@aws-cdk/custom-resources/test/provider-framework/integ.provider.expected.json index b9a9edfe958cc..aa0407ca5b164 100644 --- a/packages/@aws-cdk/custom-resources/test/provider-framework/integ.provider.expected.json +++ b/packages/@aws-cdk/custom-resources/test/provider-framework/integ.provider.expected.json @@ -254,7 +254,7 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -643,7 +643,7 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -783,7 +783,7 @@ } }, "Handler": "framework.isComplete", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ @@ -923,7 +923,7 @@ } }, "Handler": "framework.onTimeout", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 900 }, "DependsOn": [ diff --git a/packages/@aws-cdk/pipelines/lib/private/application-security-check.ts b/packages/@aws-cdk/pipelines/lib/private/application-security-check.ts index b8d7a7fd0d2bb..ad4ddbd76fdde 100644 --- a/packages/@aws-cdk/pipelines/lib/private/application-security-check.ts +++ b/packages/@aws-cdk/pipelines/lib/private/application-security-check.ts @@ -62,7 +62,7 @@ export class ApplicationSecurityCheck extends CoreConstruct { this.preApproveLambda = new lambda.Function(this, 'CDKPipelinesAutoApprove', { handler: 'index.handler', - runtime: lambda.Runtime.NODEJS_14_X, + runtime: lambda.Runtime.NODEJS_12_X, code: lambda.Code.fromAsset(path.resolve(__dirname, 'approve-lambda')), timeout: Duration.minutes(5), }); @@ -180,4 +180,4 @@ const ifElse = ({ condition, thenStatements, elseStatements }: ifElseOptions): s } return `${statement} fi`; -}; \ No newline at end of file +}; diff --git a/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json b/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json index 82ad5c418fb70..b72a78754a1d2 100644 --- a/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json +++ b/packages/@aws-cdk/pipelines/test/integ.pipeline-security.expected.json @@ -1800,7 +1800,7 @@ ] }, "Handler": "index.handler", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 300 }, "DependsOn": [ @@ -2111,7 +2111,7 @@ ] }, "Handler": "index.handler", - "Runtime": "nodejs14.x", + "Runtime": "nodejs12.x", "Timeout": 300 }, "DependsOn": [