From e94cd5a0c41a0ac87945b24efbe76bc0e8c3bd9d Mon Sep 17 00:00:00 2001 From: biffgaut <78155736+biffgaut@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:20:09 -0400 Subject: [PATCH] chore(all): perform updates required to move to latest cdk version (#1019) * Fix stray version number * First round of updates * Lock in cdk-integ upgrade (avoid revert) * Update integration snapshots --- deployment/v2/align-version.js | 2 +- ...eg.all-existing-private-http.expected.json | 246 +++++------ .../integ.all-new-public-http.expected.json | 250 +++++------ .../integ.all-new-two-targets.expected.json | 254 +++++------ ....privateApiExistingResources.expected.json | 196 ++++----- ...integ.privateApiNewResources.expected.json | 88 ++-- ...g.publicApiExistingResources.expected.json | 196 ++++----- .../integ.publicApiNewResources.expected.json | 196 ++++----- .../test/integ.twoTargets.expected.json | 212 +++++----- ...ustomCloudfrontLoggingBucket.expected.json | 107 +---- .../test/integ.no-arguments.expected.json | 107 +---- .../integ.override-behavior.expected.json | 107 +---- ...ustomCloudfrontLoggingBucket.expected.json | 107 +---- .../test/integ.no-arguments.expected.json | 107 +---- ...ustomCloudFrontLoggingBucket.expected.json | 107 +---- .../test/integ.default.expected.json | 107 +---- .../integ.existingContainer.expected.json | 107 +---- .../integ.overrideProperties.expected.json | 107 +---- ...g.withoutHttpSecurityHeaders.expected.json | 107 +---- .../integ.custom-originPath.expected.json | 107 +---- ...nteg.custom-security-headers.expected.json | 107 +---- ...ustomCloudFrontLoggingBucket.expected.json | 107 +---- .../integ.customLoggingBucket.expected.json | 107 +---- .../test/integ.existing-bucket.expected.json | 107 +---- .../test/integ.no-arguments.expected.json | 107 +---- .../integ.no-security-headers.expected.json | 107 +---- .../test/integ.no-arguments.expected.json | 78 ++-- .../test/integ.deploy-with-vpc.expected.json | 116 ++--- .../test/integ.no-arguments.expected.json | 54 +-- .../integ.existingLoggingBucket.expected.json | 107 +---- ...ventbridge-existing-eventbus.expected.json | 14 +- .../integ.eventbridge-existing-eventbus.ts | 2 +- ...teg.eventbridge-new-eventbus.expected.json | 18 +- .../test/integ.eventbridge-new-eventbus.ts | 2 +- ...nteg.eventbridge-no-argument.expected.json | 12 +- ...pfunctions-existing-eventbus.expected.json | 46 +- ...tbridge-stepfunctions-existing-eventbus.ts | 2 +- ...e-stepfunctions-new-eventbus.expected.json | 50 ++- ....eventbridge-stepfunctions-new-eventbus.ts | 2 +- ...ge-stepfunctions-no-argument.expected.json | 30 +- ...ge-stepfunctions-with-lambda.expected.json | 44 +- .../integ.existing-resources.expected.json | 263 ++++++------ .../test/integ.new-resources.expected.json | 279 ++++++------ .../integ.existing-resources.expected.json | 247 +++++------ .../test/integ.new-resources.expected.json | 247 +++++------ ...integ.existingFargateService.expected.json | 390 +++++++---------- .../test/integ.existingVpc.expected.json | 398 +++++++----------- ...nteg.fargateServiceFromProps.expected.json | 398 +++++++----------- .../test/integ.noArguments.expected.json | 249 +++++------ .../test/integ.vpcFromprops.expected.json | 398 +++++++----------- ...integ.existingFargateService.expected.json | 285 +++++++------ .../test/integ.existingStream.expected.json | 295 ++++++------- .../test/integ.existingVpc.expected.json | 295 ++++++------- ...nteg.fargateServiceFromProps.expected.json | 295 ++++++------- .../test/integ.noArguments.expected.json | 295 ++++++------- .../test/integ.streamFromProps.expected.json | 295 ++++++------- .../test/integ.vpcFromProps.expected.json | 295 ++++++------- .../integ.existing-resources.expected.json | 258 ++++++------ .../test/integ.new-resources.expected.json | 258 ++++++------ .../integ.existing-resources.expected.json | 239 ++++++----- .../test/integ.new-resources.expected.json | 239 ++++++----- .../integ.existing-resources.expected.json | 247 +++++------ .../test/integ.new-resources.expected.json | 247 +++++------ .../integ.existing-resources.expected.json | 249 +++++------ .../test/integ.new-resources.expected.json | 247 +++++------ .../integ.existing-resources.expected.json | 247 +++++------ .../test/integ.new-resources.expected.json | 247 +++++------ .../integ.existing-resources.expected.json | 253 +++++------ .../test/integ.new-resources.expected.json | 251 +++++------ .../test/integ.new-resources.expected.json | 267 ++++++------ .../integ.no-cloudwatch-alarms.expected.json | 255 +++++------ .../integ.iot-lambda-dynamodb.expected.json | 22 +- .../test/integ.with-vpc.expected.json | 110 ++--- .../integ.iot-lambda-new-func.expected.json | 12 +- ...iot-lambda-use-existing-func.expected.json | 12 +- ...integ.iot-s3-existing-bucket.expected.json | 109 +---- ....iot-s3-new-encrypted-bucket.expected.json | 4 +- .../integ.pre-existing-bucket.expected.json | 109 +---- ....pre-existing-logging-bucket.expected.json | 109 +---- .../test/integ.code-asset-job.expected.json | 18 +- .../test/integ.existing-job.expected.json | 4 +- .../test/integ.no-arguments.expected.json | 18 +- .../integ.customLoggingBucket.expected.json | 4 +- .../test/integ.existing-bucket.expected.json | 113 +---- ...nteg.existing-logging-bucket.expected.json | 113 +---- .../integ.existingStreamObj.expected.json | 22 +- .../test/integ.no-arguments.expected.json | 4 +- .../test/integ.existing.expected.json | 12 +- .../test/integ.no-arguments.expected.json | 22 +- .../integ.add-secondary-index.expected.json | 24 +- ...eployFunctionWithExistingVpc.expected.json | 228 +++++----- .../integ.deployFunctionWithVpc.expected.json | 114 ++--- .../test/integ.no-arguments.expected.json | 22 +- .../test/integ.set-billing-mode.expected.json | 20 +- .../integ.use-existing-func.expected.json | 22 +- .../integ.existingResources.expected.json | 90 ++-- .../test/integ.newResources.expected.json | 90 ++-- .../test/integ.withClientProps.expected.json | 90 ++-- ...loyFunctionWithClusterConfig.expected.json | 84 ++-- ...eployFunctionWithExistingVpc.expected.json | 208 ++++----- ...g.deployFunctionWithVpcProps.expected.json | 100 ++--- .../integ.deployToFiveZones.expected.json | 100 ++--- .../integ.disabledZoneAwareness.expected.json | 68 +-- .../test/integ.domain-arguments.expected.json | 38 +- .../test/integ.deployFunction.expected.json | 12 +- ...eployFunctionWithNewEventBus.expected.json | 104 ++--- .../integ.deployFunctionWithVpc.expected.json | 104 ++--- .../test/integ.existingEventBus.expected.json | 12 +- .../test/integ.existingFunction.expected.json | 12 +- .../aws-lambda-kendra/package.json | 4 +- .../integ.minimal-arguments.expected.json | 139 +----- .../test/integ.multiple-sources.expected.json | 157 ++----- .../test/integ.with-vpc.expected.json | 227 +++------- .../integ.existing-function.expected.json | 121 +----- .../test/integ.existing-vpc.expected.json | 317 +++++--------- .../test/integ.new-vpc.expected.json | 209 +++------ .../test/integ.no-arguments.expected.json | 121 +----- .../test/integ.existingLambda.expected.json | 16 +- .../test/integ.existingStream.expected.json | 16 +- .../integ.existingStreamWithCmk.expected.json | 20 +- .../test/integ.existingVpc.expected.json | 212 +++++----- .../integ.newStreamFromProps.expected.json | 16 +- .../test/integ.newVpc.expected.json | 104 ++--- .../test/integ.newVpcFromProps.expected.json | 72 ++-- .../test/integ.noArguments.expected.json | 16 +- .../test/integ.cluster-config.expected.json | 84 ++-- ...nteg.disabled-zone-awareness.expected.json | 68 +-- .../test/integ.domain-arguments.expected.json | 38 +- .../test/integ.existing-vpc.expected.json | 208 ++++----- .../test/integ.no-arguments.expected.json | 38 +- .../test/integ.vpc-props.expected.json | 100 ++--- .../integ.customLoggingBucket.expected.json | 12 +- .../test/integ.deployFunction.expected.json | 12 +- .../integ.deployFunctionWithVpc.expected.json | 100 ++--- .../test/integ.existingFunction.expected.json | 12 +- .../integ.pre-existing-bucket.expected.json | 121 +----- .../test/integ.deployFunction.expected.json | 24 +- .../test/integ.existingFunction.expected.json | 24 +- ...eg.existingSageMakerEndpoint.expected.json | 24 +- .../test/integ.deployFunction.expected.json | 12 +- ...eployFunctionWithExistingVpc.expected.json | 212 +++++----- .../integ.deployFunctionWithVpc.expected.json | 104 ++--- .../test/integ.existingFunction.expected.json | 12 +- .../test/integ.deployFunction.expected.json | 12 +- .../integ.deployFunctionWithVpc.expected.json | 104 ++--- .../test/integ.existingFunction.expected.json | 12 +- .../integ.defaultDeployment.expected.json | 30 +- ...eployProducerFunctionWithVpc.expected.json | 122 +++--- ...teg.existingConsumerFunction.expected.json | 30 +- ...teg.existingProducerFunction.expected.json | 30 +- .../test/integ.existingQueue.expected.json | 30 +- .../test/integ.deployFunction.expected.json | 12 +- .../integ.deployFunctionWithVpc.expected.json | 104 ++--- .../test/integ.existingFunction.expected.json | 12 +- .../test/integ.deployFunction.expected.json | 12 +- ...eployFunctionWithExistingVpc.expected.json | 212 +++++----- .../integ.deployFunctionWithVpc.expected.json | 104 ++--- .../test/integ.existingFunction.expected.json | 12 +- ...nteg.existingStringParameter.expected.json | 12 +- .../test/integ.deploy-lambda.expected.json | 42 +- .../integ.deployFunctionWithVpc.expected.json | 130 +++--- .../integ.existing-function.expected.json | 42 +- ...AssetExistingLambdaFunctions.expected.json | 38 +- ...iFromAssetNewLambdaFunctions.expected.json | 36 +- ....apiFromAssetWithCognitoAuth.expected.json | 36 +- .../test/integ.deployPrivateApi.expected.json | 78 ++-- ...deployPrivateApiExistingZone.expected.json | 186 ++++---- ...g.deployPublicApiExistingAlb.expected.json | 180 ++++---- .../integ.deployPublicApiNewAlb.expected.json | 186 ++++---- .../integ.deployWithoutLogging.expected.json | 72 ++-- .../integ.existing-s3-bucket.expected.json | 121 +----- .../test/integ.no-arguments.expected.json | 12 +- .../integ.customLoggingBucket.expected.json | 4 +- .../test/integ.existingS3Bucket.expected.json | 113 +---- .../test/integ.existingSnsTopic.expected.json | 4 +- .../integ.newTopicFromProps.expected.json | 4 +- .../test/integ.noArguments.expected.json | 4 +- ...integ.s3EventTypesAndFilters.expected.json | 4 +- .../test/integ.creatingNewQueue.expected.json | 4 +- .../integ.customLoggingBucket.expected.json | 4 +- .../integ.existingLoggingBucket.expected.json | 113 +---- .../test/integ.existingQueue.expected.json | 4 +- .../test/integ.existingS3Bucket.expected.json | 113 +---- .../test/integ.noArguments.expected.json | 4 +- .../integ.customLoggingBucket.expected.json | 30 +- .../integ.pre-existing-bucket.expected.json | 137 +----- ...s3-stepfunctions-no-argument.expected.json | 30 +- .../test/integ.no-arguments.expected.json | 20 +- .../test/integ.deployFifoQueue.expected.json | 18 +- .../test/integ.deployFunction.expected.json | 18 +- .../test/integ.existingFunction.expected.json | 18 +- .../test/integ.no-arguments.expected.json | 188 ++++----- ...ing-waf-to-multiple-gateways.expected.json | 106 ++--- .../test/integ.no-arguments.expected.json | 60 +-- .../integ.partial-arguments.expected.json | 60 +-- .../test/integ.no-arguments.expected.json | 14 +- .../integ.partial-arguments.expected.json | 14 +- ...g-waf-to-multiple-cloudfront.expected.json | 14 +- .../test/integ.no-arguments.expected.json | 14 +- .../integ.partial-arguments.expected.json | 14 +- ...g.template-writer-from-asset.expected.json | 18 +- ...late-writer-from-large-asset.expected.json | 20 +- source/tools/cdk-integ-tools/package.json | 6 +- 203 files changed, 8603 insertions(+), 12375 deletions(-) diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js index 09d2f8e82..7650ba383 100755 --- a/deployment/v2/align-version.js +++ b/deployment/v2/align-version.js @@ -10,7 +10,7 @@ const findVersion = process.argv[2]; const replaceVersion = process.argv[3]; // these versions need to be sourced from a config file -const awsCdkLibVersion = '2.82.0'; +const awsCdkLibVersion = '2.99.1'; const constructsVersion = '10.0.0'; const MODULE_EXEMPTIONS = new Set([ '@aws-cdk/cloudformation-diff', diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json index f552779d8..db34b0132 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "all-existing-private-http/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-existing-private-http/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "all-existing-private-http/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-existing-private-http/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "all-existing-private-http/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-existing-private-http/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "all-existing-private-http/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-existing-private-http/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "all-existing-private-http/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-existing-private-http/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "all-existing-private-http/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-existing-private-http/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc" + "Value": "all-existing-private-http/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc" + "Value": "all-existing-private-http/Vpc/FlowLog" } ] }, @@ -647,10 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -661,10 +657,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc" + "Value": "all-existing-private-http/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,10 +673,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,7 +753,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "allexistingprivatehttpECRAPIsecuritygroupD77FBBD5": { @@ -972,7 +972,6 @@ "testsgfromallexistingprivatehttptestalbSecurityGroup4B36914B80803EB3A82F": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "Load balancer to target", "FromPort": 8080, "GroupId": { @@ -981,6 +980,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "testalbSecurityGroup0C84CDF9", @@ -997,6 +997,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1043,7 +1048,8 @@ } }, "DependsOn": [ - "testconstructtestconstructlistener484444F1" + "testconstructtestconstructlistener484444F1", + "testtaskdefTaskRoleB2DEF113" ] }, "testalb9AFCD824": { @@ -1135,13 +1141,6 @@ "testalbSecurityGrouptoallexistingprivatehttptestsgC280D41D8080C6A2C196": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { - "GroupId": { - "Fn::GetAtt": [ - "testalbSecurityGroup0C84CDF9", - "GroupId" - ] - }, - "IpProtocol": "tcp", "Description": "Load balancer to target", "DestinationSecurityGroupId": { "Fn::GetAtt": [ @@ -1150,6 +1149,13 @@ ] }, "FromPort": 8080, + "GroupId": { + "Fn::GetAtt": [ + "testalbSecurityGroup0C84CDF9", + "GroupId" + ] + }, + "IpProtocol": "tcp", "ToPort": 8080 } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json index 8140221e1..5f1ba0d9d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json @@ -50,9 +50,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -69,7 +66,10 @@ "Key": "Name", "Value": "all-new-public-http/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -85,15 +85,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-public-http/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -110,12 +110,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -137,15 +137,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -161,9 +161,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -180,7 +177,10 @@ "Key": "Name", "Value": "all-new-public-http/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -196,15 +196,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-public-http/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -221,12 +221,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -248,15 +248,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -272,9 +272,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -291,7 +288,10 @@ "Key": "Name", "Value": "all-new-public-http/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -307,15 +307,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-public-http/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -332,12 +332,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -359,15 +359,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -383,9 +383,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -402,21 +399,24 @@ "Key": "Name", "Value": "all-new-public-http/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-public-http/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -433,21 +433,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -464,21 +461,24 @@ "Key": "Name", "Value": "all-new-public-http/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-public-http/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -495,21 +495,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -526,21 +523,24 @@ "Key": "Name", "Value": "all-new-public-http/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-public-http/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -557,12 +557,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -580,11 +580,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -606,7 +606,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc" + "Value": "all-new-public-http/Vpc/FlowLog" } ] } @@ -658,7 +658,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc" + "Value": "all-new-public-http/Vpc/FlowLog" } ] }, @@ -678,10 +678,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -692,10 +688,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc" + "Value": "all-new-public-http/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -704,10 +704,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -717,6 +713,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -728,16 +725,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -747,6 +743,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -758,27 +755,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -799,7 +784,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testconstructlbalb33E0EB59": { @@ -903,13 +903,6 @@ "testconstructlbalbSecurityGrouptoallnewpublichttptestconstructsgEFBACDED8080226DB910": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { - "GroupId": { - "Fn::GetAtt": [ - "testconstructlbalbSecurityGroup5F187AF4", - "GroupId" - ] - }, - "IpProtocol": "tcp", "Description": "Load balancer to target", "DestinationSecurityGroupId": { "Fn::GetAtt": [ @@ -918,6 +911,13 @@ ] }, "FromPort": 8080, + "GroupId": { + "Fn::GetAtt": [ + "testconstructlbalbSecurityGroup5F187AF4", + "GroupId" + ] + }, + "IpProtocol": "tcp", "ToPort": 8080 }, "DependsOn": [ @@ -1179,18 +1179,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1427,7 +1427,6 @@ "testconstructsgfromallnewpublichttptestconstructlbalbSecurityGroupA1A7ABDB8080D3FFEE20": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "Load balancer to target", "FromPort": 8080, "GroupId": { @@ -1436,6 +1435,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "testconstructlbalbSecurityGroup5F187AF4", @@ -1452,6 +1452,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1498,6 +1503,7 @@ } }, "DependsOn": [ + "testconstructtaskdefTaskRoleC60414C4", "testconstructtestconstructlistener484444F1" ] }, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json index 49d5ae829..8a08f7628 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json @@ -53,10 +53,10 @@ } } ], - "Priority": 10, "ListenerArn": { "Ref": "testconstructtestconstructlistener484444F1" - } + }, + "Priority": 10 } }, "Vpc8378EB38": { @@ -77,9 +77,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -96,7 +93,10 @@ "Key": "Name", "Value": "all-new-two-targets/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -112,15 +112,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-two-targets/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -137,12 +137,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -164,15 +164,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -188,9 +188,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -207,7 +204,10 @@ "Key": "Name", "Value": "all-new-two-targets/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -223,15 +223,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-two-targets/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -248,12 +248,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -275,15 +275,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -299,9 +299,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -318,7 +315,10 @@ "Key": "Name", "Value": "all-new-two-targets/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -334,15 +334,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-two-targets/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -359,12 +359,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -386,15 +386,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -410,9 +410,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -429,21 +426,24 @@ "Key": "Name", "Value": "all-new-two-targets/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-two-targets/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -460,21 +460,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -491,21 +488,24 @@ "Key": "Name", "Value": "all-new-two-targets/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-two-targets/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -522,21 +522,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -553,21 +550,24 @@ "Key": "Name", "Value": "all-new-two-targets/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "all-new-two-targets/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -584,12 +584,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -607,11 +607,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -633,7 +633,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc" + "Value": "all-new-two-targets/Vpc/FlowLog" } ] } @@ -685,7 +685,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc" + "Value": "all-new-two-targets/Vpc/FlowLog" } ] }, @@ -705,10 +705,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -719,10 +715,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc" + "Value": "all-new-two-targets/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -731,10 +731,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -744,6 +740,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -755,16 +752,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -774,6 +770,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -785,27 +782,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -826,7 +811,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testconstructlbalb33E0EB59": { @@ -930,13 +930,6 @@ "testconstructlbalbSecurityGrouptoallnewtwotargetstestconstructsgCB4347D58080785349CD": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { - "GroupId": { - "Fn::GetAtt": [ - "testconstructlbalbSecurityGroup5F187AF4", - "GroupId" - ] - }, - "IpProtocol": "tcp", "Description": "Load balancer to target", "DestinationSecurityGroupId": { "Fn::GetAtt": [ @@ -945,6 +938,13 @@ ] }, "FromPort": 8080, + "GroupId": { + "Fn::GetAtt": [ + "testconstructlbalbSecurityGroup5F187AF4", + "GroupId" + ] + }, + "IpProtocol": "tcp", "ToPort": 8080 }, "DependsOn": [ @@ -1206,18 +1206,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1454,7 +1454,6 @@ "testconstructsgfromallnewtwotargetstestconstructlbalbSecurityGroup7AE13AD9808027E2CC4F": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "tcp", "Description": "Load balancer to target", "FromPort": 8080, "GroupId": { @@ -1463,6 +1462,7 @@ "GroupId" ] }, + "IpProtocol": "tcp", "SourceSecurityGroupId": { "Fn::GetAtt": [ "testconstructlbalbSecurityGroup5F187AF4", @@ -1479,6 +1479,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1532,6 +1537,7 @@ } }, "DependsOn": [ + "testconstructtaskdefTaskRoleC60414C4", "testconstructtestconstructlistenerallnewtwotargetstargetsRule897FD7B6", "testconstructtestconstructlistener484444F1" ] diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json index a464cff7e..ebe2a257f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "privateApiExistingResources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiExistingResources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "privateApiExistingResources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiExistingResources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "privateApiExistingResources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiExistingResources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "privateApiExistingResources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiExistingResources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "privateApiExistingResources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiExistingResources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "privateApiExistingResources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiExistingResources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc" + "Value": "privateApiExistingResources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc" + "Value": "privateApiExistingResources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,12 +657,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc" + "Value": "privateApiExistingResources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "lambdasg93781054": { @@ -807,18 +807,18 @@ }, "S3Key": "7caf594b8ad91abecca72f7f10a23a5cf446d05dc00d6194619935e7e3fd5a79.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -1249,18 +1249,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1330,6 +1330,7 @@ "testonetg2tg6459EC7C": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", "Properties": { + "TargetType": "lambda", "Targets": [ { "Id": { @@ -1339,8 +1340,7 @@ ] } } - ], - "TargetType": "lambda" + ] }, "DependsOn": [ "LambdaFunctionInvoke2UTWxhlfyqbT5FTn5jvgbLgjFfJwzswGk55DU1HYAD69E89D" diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json index 26e533c99..c24fba1c8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json @@ -465,18 +465,18 @@ }, "S3Key": "7caf594b8ad91abecca72f7f10a23a5cf446d05dc00d6194619935e7e3fd5a79.zip" }, - "Role": { - "Fn::GetAtt": [ - "testoneLambdaFunctionServiceRoleE92573D3", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testoneLambdaFunctionServiceRoleE92573D3", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -581,6 +581,7 @@ "testonetg2tg6459EC7C": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", "Properties": { + "TargetType": "lambda", "Targets": [ { "Id": { @@ -590,8 +591,7 @@ ] } } - ], - "TargetType": "lambda" + ] }, "DependsOn": [ "testoneLambdaFunctionInvoke2UTWxhlfyqbT5FTn5jvgbLgjFfJwzswGk55DU1HY508A8518" @@ -615,9 +615,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -634,21 +631,24 @@ "Key": "Name", "Value": "privateApiNewResources/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiNewResources/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -665,9 +665,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -684,21 +681,24 @@ "Key": "Name", "Value": "privateApiNewResources/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiNewResources/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -715,9 +715,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -734,21 +731,24 @@ "Key": "Name", "Value": "privateApiNewResources/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "privateApiNewResources/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -780,7 +780,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc" + "Value": "privateApiNewResources/Vpc/FlowLog" } ] } @@ -832,7 +832,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc" + "Value": "privateApiNewResources/Vpc/FlowLog" } ] }, @@ -852,11 +852,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -867,12 +862,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc" + "Value": "privateApiNewResources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { @@ -904,18 +904,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json index f8efc14d1..ef2fc7821 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "publicApiExistingResources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiExistingResources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "publicApiExistingResources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiExistingResources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "publicApiExistingResources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiExistingResources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "publicApiExistingResources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiExistingResources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "publicApiExistingResources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiExistingResources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "publicApiExistingResources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiExistingResources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc" + "Value": "publicApiExistingResources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc" + "Value": "publicApiExistingResources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,12 +657,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc" + "Value": "publicApiExistingResources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "lambdasg93781054": { @@ -807,18 +807,18 @@ }, "S3Key": "7caf594b8ad91abecca72f7f10a23a5cf446d05dc00d6194619935e7e3fd5a79.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -1249,18 +1249,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1330,6 +1330,7 @@ "testonetg2tg6459EC7C": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", "Properties": { + "TargetType": "lambda", "Targets": [ { "Id": { @@ -1339,8 +1340,7 @@ ] } } - ], - "TargetType": "lambda" + ] }, "DependsOn": [ "LambdaFunctionInvoke2UTWxhlfyqbT5FTn5jvgbLgjFfJwzswGk55DU1HYAD69E89D" diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json index c01076512..b6c7be27d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json @@ -471,18 +471,18 @@ }, "S3Key": "7caf594b8ad91abecca72f7f10a23a5cf446d05dc00d6194619935e7e3fd5a79.zip" }, - "Role": { - "Fn::GetAtt": [ - "testoneLambdaFunctionServiceRoleE92573D3", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testoneLambdaFunctionServiceRoleE92573D3", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -593,6 +593,7 @@ "testonetg2tg6459EC7C": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", "Properties": { + "TargetType": "lambda", "Targets": [ { "Id": { @@ -602,8 +603,7 @@ ] } } - ], - "TargetType": "lambda" + ] }, "DependsOn": [ "testoneLambdaFunctionInvoke2UTWxhlfyqbT5FTn5jvgbLgjFfJwzswGk55DU1HY508A8518" @@ -627,9 +627,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -646,7 +643,10 @@ "Key": "Name", "Value": "publicApiNewResources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -662,15 +662,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiNewResources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -687,12 +687,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -714,15 +714,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -738,9 +738,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -757,7 +754,10 @@ "Key": "Name", "Value": "publicApiNewResources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -773,15 +773,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiNewResources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -798,12 +798,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -825,15 +825,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -849,9 +849,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -868,7 +865,10 @@ "Key": "Name", "Value": "publicApiNewResources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -884,15 +884,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiNewResources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -909,12 +909,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -936,15 +936,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -960,9 +960,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -979,21 +976,24 @@ "Key": "Name", "Value": "publicApiNewResources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiNewResources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -1010,21 +1010,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -1041,21 +1038,24 @@ "Key": "Name", "Value": "publicApiNewResources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiNewResources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -1072,21 +1072,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -1103,21 +1100,24 @@ "Key": "Name", "Value": "publicApiNewResources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "publicApiNewResources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1134,12 +1134,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1157,11 +1157,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1183,7 +1183,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc" + "Value": "publicApiNewResources/Vpc/FlowLog" } ] } @@ -1235,7 +1235,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc" + "Value": "publicApiNewResources/Vpc/FlowLog" } ] }, @@ -1255,11 +1255,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1270,12 +1265,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc" + "Value": "publicApiNewResources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { @@ -1307,18 +1307,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json index fcf04b74a..447e2e805 100644 --- a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json @@ -471,18 +471,18 @@ }, "S3Key": "7caf594b8ad91abecca72f7f10a23a5cf446d05dc00d6194619935e7e3fd5a79.zip" }, - "Role": { - "Fn::GetAtt": [ - "testoneLambdaFunctionServiceRoleE92573D3", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testoneLambdaFunctionServiceRoleE92573D3", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -620,6 +620,7 @@ "testonetg2tg6459EC7C": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", "Properties": { + "TargetType": "lambda", "Targets": [ { "Id": { @@ -629,8 +630,7 @@ ] } } - ], - "TargetType": "lambda" + ] }, "DependsOn": [ "testoneLambdaFunctionInvoke2UTWxhlfyqbT5FTn5jvgbLgjFfJwzswGk55DU1HY508A8518" @@ -654,9 +654,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -673,7 +670,10 @@ "Key": "Name", "Value": "twoTargets/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -689,15 +689,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "twoTargets/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -714,12 +714,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -741,15 +741,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -765,9 +765,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -784,7 +781,10 @@ "Key": "Name", "Value": "twoTargets/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -800,15 +800,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "twoTargets/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -825,12 +825,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -852,15 +852,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -876,9 +876,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -895,7 +892,10 @@ "Key": "Name", "Value": "twoTargets/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -911,15 +911,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "twoTargets/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -936,12 +936,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -963,15 +963,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -987,9 +987,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -1006,21 +1003,24 @@ "Key": "Name", "Value": "twoTargets/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "twoTargets/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -1037,21 +1037,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -1068,21 +1065,24 @@ "Key": "Name", "Value": "twoTargets/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "twoTargets/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -1099,21 +1099,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -1130,21 +1127,24 @@ "Key": "Name", "Value": "twoTargets/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "twoTargets/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1161,12 +1161,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1184,11 +1184,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1210,7 +1210,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc" + "Value": "twoTargets/Vpc/FlowLog" } ] } @@ -1262,7 +1262,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc" + "Value": "twoTargets/Vpc/FlowLog" } ] }, @@ -1282,11 +1282,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1297,12 +1292,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc" + "Value": "twoTargets/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { @@ -1334,18 +1334,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1520,18 +1520,18 @@ }, "S3Key": "7caf594b8ad91abecca72f7f10a23a5cf446d05dc00d6194619935e7e3fd5a79.zip" }, - "Role": { - "Fn::GetAtt": [ - "testtwoLambdaFunctionServiceRoleD100E5F8", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testtwoLambdaFunctionServiceRoleD100E5F8", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -1611,6 +1611,7 @@ "testtwotg2tg35BE6697": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", "Properties": { + "TargetType": "lambda", "Targets": [ { "Id": { @@ -1620,8 +1621,7 @@ ] } } - ], - "TargetType": "lambda" + ] }, "DependsOn": [ "testtwoLambdaFunctionInvoke2UTWxhlfyqbT5FTn5jvgbLgjFfJwzswGk55DU1HY068D8D47" diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.expected.json index f84b58e71..159abab0a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.expected.json @@ -895,14 +895,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -967,109 +967,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json index c8bd96b1b..46696cee7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json @@ -895,14 +895,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -967,109 +967,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.expected.json index 1c1d7bca1..120092782 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.expected.json @@ -934,14 +934,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1006,109 +1006,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.expected.json index a16dfbfb0..954c1541e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.expected.json @@ -895,14 +895,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -967,109 +967,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json index 74bc80b11..ba44a3a00 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json @@ -895,14 +895,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -967,109 +967,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.expected.json index 76821d838..1dda93107 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.expected.json @@ -421,14 +421,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -465,109 +465,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json index ac97c2c9b..017e02b08 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json @@ -421,14 +421,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -465,109 +465,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.expected.json index e1188e25c..4685cedc1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.expected.json @@ -338,14 +338,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -382,109 +382,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.expected.json index 9765898cd..b7373e8e3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.expected.json @@ -380,14 +380,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -424,109 +424,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.expected.json index f78e1bcf4..f32082de5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.expected.json @@ -398,14 +398,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -442,109 +442,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.expected.json index d3ba2fc04..aa9a6f24b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.expected.json @@ -585,14 +585,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -629,109 +629,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.expected.json index f9563b6ca..266cdd2a2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.expected.json @@ -616,14 +616,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -660,109 +660,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.expected.json index f22102846..5b99a5606 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.expected.json @@ -584,14 +584,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -628,109 +628,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.expected.json index 3e433548d..1a5473490 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.expected.json @@ -647,14 +647,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -691,109 +691,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.expected.json index fad104cc0..6aaa2e8cf 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.expected.json @@ -208,14 +208,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -560,109 +560,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.expected.json index e5b92cc7a..6fdb685d1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.expected.json @@ -471,14 +471,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -515,109 +515,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.expected.json index aa73ded9b..495087c8b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.expected.json @@ -561,14 +561,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -605,109 +605,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json index 5796dedf8..d2b8fd4b5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testcognitoapigatewaylambdaLambdaFunctionServiceRole943D8510", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testcognitoapigatewaylambdaLambdaFunctionServiceRole943D8510", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -171,10 +171,10 @@ "testcognitoapigatewaylambdaLambdaRestApiDeployment96AFD8CA5d8e3257747e529ac6f9e48e8d20548e": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testcognitoapigatewaylambdaLambdaRestApiproxyANY18BA6246", @@ -195,9 +195,6 @@ "testcognitoapigatewaylambdaLambdaRestApiDeploymentStageprod850C17D1": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -218,6 +215,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" + }, "StageName": "prod", "TracingEnabled": true } @@ -318,17 +318,11 @@ "testcognitoapigatewaylambdaLambdaRestApiproxyANY18BA6246": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testcognitoapigatewaylambdaLambdaRestApiproxy23E1DA20" - }, - "RestApiId": { - "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" - }, "AuthorizationType": "COGNITO_USER_POOLS", "AuthorizerId": { "Ref": "testcognitoapigatewaylambdaCognitoAuthorizer170CACC9" }, + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -355,6 +349,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "testcognitoapigatewaylambdaLambdaRestApiproxy23E1DA20" + }, + "RestApiId": { + "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" } } }, @@ -439,20 +439,11 @@ "testcognitoapigatewaylambdaLambdaRestApiANY1BCFE40A": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testcognitoapigatewaylambdaLambdaRestApi2E272431", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" - }, "AuthorizationType": "COGNITO_USER_POOLS", "AuthorizerId": { "Ref": "testcognitoapigatewaylambdaCognitoAuthorizer170CACC9" }, + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -479,6 +470,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testcognitoapigatewaylambdaLambdaRestApi2E272431", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" } } }, @@ -608,9 +608,6 @@ "testcognitoapigatewaylambdaCognitoUserPoolClientDA118627": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testcognitoapigatewaylambdaCognitoUserPoolD5E74489" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -628,18 +625,17 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testcognitoapigatewaylambdaCognitoUserPoolD5E74489" + } } }, "testcognitoapigatewaylambdaCognitoAuthorizer170CACC9": { "Type": "AWS::ApiGateway::Authorizer", "Properties": { - "Name": "authorizer", - "RestApiId": { - "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" - }, - "Type": "COGNITO_USER_POOLS", "IdentitySource": "method.request.header.Authorization", + "Name": "authorizer", "ProviderARNs": [ { "Fn::GetAtt": [ @@ -647,7 +643,11 @@ "Arn" ] } - ] + ], + "RestApiId": { + "Ref": "testcognitoapigatewaylambdaLambdaRestApi2E272431" + }, + "Type": "COGNITO_USER_POOLS" } } }, @@ -713,4 +713,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.expected.json index 5eab067ed..ff8d022f8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.expected.json @@ -172,12 +172,6 @@ }, "S3Key": "92927de5fcc3aea277bddecb845bee318fb502f7375daedbdafb72c0400bc197.zip" }, - "Role": { - "Fn::GetAtt": [ - "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionServiceRoleEC11512B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -190,6 +184,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionServiceRoleEC11512B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -245,9 +245,6 @@ "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionDynamoDBEventSourcedeploywithvpctestddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTableB7F9F75CD09B2055": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionB70B7296" - }, "BatchSize": 100, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -266,6 +263,9 @@ "StreamArn" ] }, + "FunctionName": { + "Ref": "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionB70B7296" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 500, "StartingPosition": "TRIM_HORIZON" @@ -313,9 +313,6 @@ "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPoolClient25D50E3D": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPool97EA2952" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -333,7 +330,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPool97EA2952" + } } }, "testddbstreamslambdaeskLambdaToElasticSearchCognitoIdentityPoolFAA4D969": { @@ -692,9 +692,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchStatusRedAlarmAFFE3439": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -705,9 +705,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchStatusYellowAlarm44E1DC4E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -718,9 +718,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchFreeStorageSpaceTooLowAlarm65BF7F2F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -731,9 +731,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchIndexWritesBlockedTooHighAlarmCE3D0C51": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -744,9 +744,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchAutomatedSnapshotFailureTooHighAlarmFD8E066E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -757,9 +757,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchCPUUtilizationTooHighAlarm274094A6": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -770,9 +770,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchJVMMemoryPressureTooHighAlarm2E49D5CC": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -783,9 +783,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchMasterCPUUtilizationTooHighAlarm05E1EBEF": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -796,9 +796,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchMasterJVMMemoryPressureTooHighAlarm1090161B": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -824,9 +824,6 @@ "testddbstreamslambdaeskVpcisolatedSubnet1Subnet3A238B01": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -843,21 +840,24 @@ "Key": "Name", "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + } } }, "testddbstreamslambdaeskVpcisolatedSubnet1RouteTable27ABBE41": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, "Tags": [ { "Key": "Name", "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + } } }, "testddbstreamslambdaeskVpcisolatedSubnet1RouteTableAssociation2E533936": { @@ -874,9 +874,6 @@ "testddbstreamslambdaeskVpcisolatedSubnet2SubnetDE9E844E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -893,21 +890,24 @@ "Key": "Name", "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + } } }, "testddbstreamslambdaeskVpcisolatedSubnet2RouteTable358580C2": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, "Tags": [ { "Key": "Name", "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + } } }, "testddbstreamslambdaeskVpcisolatedSubnet2RouteTableAssociation77A663A5": { @@ -924,9 +924,6 @@ "testddbstreamslambdaeskVpcisolatedSubnet3Subnet3B5285ED": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -943,21 +940,24 @@ "Key": "Name", "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + } } }, "testddbstreamslambdaeskVpcisolatedSubnet3RouteTable7F8548D9": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, "Tags": [ { "Key": "Name", "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + } } }, "testddbstreamslambdaeskVpcisolatedSubnet3RouteTableAssociation77FF5F32": { @@ -989,7 +989,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc" + "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" } ] } @@ -1041,7 +1041,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc" + "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" } ] }, @@ -1061,10 +1061,6 @@ "testddbstreamslambdaeskVpcFlowLogD9278B4C": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "testddbstreamslambdaeskVpcB583E197" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "testddbstreamslambdaeskVpcFlowLogIAMRole8B3A466E", @@ -1075,10 +1071,14 @@ "LogGroupName": { "Ref": "testddbstreamslambdaeskVpcFlowLogLogGroup4DB5270C" }, + "ResourceId": { + "Ref": "testddbstreamslambdaeskVpcB583E197" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc" + "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1087,19 +1087,19 @@ "testddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTableDD18004A": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json index aee329669..e1a92f7b7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json @@ -131,12 +131,6 @@ }, "S3Key": "92927de5fcc3aea277bddecb845bee318fb502f7375daedbdafb72c0400bc197.zip" }, - "Role": { - "Fn::GetAtt": [ - "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionServiceRoleEC11512B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -149,6 +143,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionServiceRoleEC11512B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -180,9 +180,6 @@ "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionDynamoDBEventSourcenoargumentstestddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTable6C5773679DA39002": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionB70B7296" - }, "BatchSize": 100, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -201,6 +198,9 @@ "StreamArn" ] }, + "FunctionName": { + "Ref": "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionB70B7296" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 500, "StartingPosition": "TRIM_HORIZON" @@ -243,9 +243,6 @@ "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPoolClient25D50E3D": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPool97EA2952" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -263,7 +260,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPool97EA2952" + } } }, "testddbstreamslambdaeskLambdaToElasticSearchCognitoIdentityPoolFAA4D969": { @@ -601,9 +601,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchStatusRedAlarmAFFE3439": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -614,9 +614,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchStatusYellowAlarm44E1DC4E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -627,9 +627,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchFreeStorageSpaceTooLowAlarm65BF7F2F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -640,9 +640,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchIndexWritesBlockedTooHighAlarmCE3D0C51": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -653,9 +653,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchAutomatedSnapshotFailureTooHighAlarmFD8E066E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -666,9 +666,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchCPUUtilizationTooHighAlarm274094A6": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -679,9 +679,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchJVMMemoryPressureTooHighAlarm2E49D5CC": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -692,9 +692,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchMasterCPUUtilizationTooHighAlarm05E1EBEF": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -705,9 +705,9 @@ "testddbstreamslambdaeskLambdaToElasticSearchMasterJVMMemoryPressureTooHighAlarm1090161B": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -718,19 +718,19 @@ "testddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTableDD18004A": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.expected.json index 1112c6531..8a3494f26 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.expected.json @@ -182,14 +182,14 @@ }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -574,109 +574,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.expected.json index 4117f3456..a3ee4a61f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.expected.json @@ -3,7 +3,7 @@ "existingeventbusA5B80487": { "Type": "AWS::Events::EventBus", "Properties": { - "Name": "test" + "Name": "test-existing-lambda" } }, "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE": { @@ -104,18 +104,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.ts index 6289de86e..18126b108 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.ts @@ -21,7 +21,7 @@ import { generateIntegStackName } from '@aws-solutions-constructs/core'; const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename)); -const existingEventBus = new events.EventBus(stack, `existing-event-bus`, { eventBusName: 'test' }); +const existingEventBus = new events.EventBus(stack, `existing-event-bus`, { eventBusName: 'test-existing-lambda' }); const props: EventbridgeToLambdaProps = { lambdaFunctionProps: { diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.expected.json index bdf10e99d..0090e1e2d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -157,17 +157,17 @@ } } }, - "testeventbridgelambdatest2F604440": { + "testeventbridgelambdatestnewlambdaA726ECBB": { "Type": "AWS::Events::EventBus", "Properties": { - "Name": "test" + "Name": "test-new-lambda" } }, "testeventbridgelambdaEventsRule7DB0954D": { "Type": "AWS::Events::Rule", "Properties": { "EventBusName": { - "Ref": "testeventbridgelambdatest2F604440" + "Ref": "testeventbridgelambdatestnewlambdaA726ECBB" }, "EventPattern": { "source": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.ts index f1af26381..adf01d17c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.ts @@ -26,7 +26,7 @@ const props: EventbridgeToLambdaProps = { runtime: lambda.Runtime.NODEJS_16_X, handler: 'index.handler' }, - eventBusProps: { eventBusName: 'test' }, + eventBusProps: { eventBusName: 'test-new-lambda' }, eventRuleProps: { eventPattern: { source: ['solutionsconstructs'] diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.expected.json index 42bbbcb11..f5018b3b4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testeventbridgelambdaLambdaFunctionServiceRole6D02CEEE", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.expected.json index 6bcf0a409..dee9dbace 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -141,7 +141,7 @@ "existingeventbusA5B80487": { "Type": "AWS::Events::EventBus", "Properties": { - "Name": "test" + "Name": "test-existing" } }, "testeventbridgestepfunctionsneweventbusconstructStateMachineLogGroup6DC6AD59": { @@ -285,17 +285,11 @@ "testeventbridgestepfunctionsneweventbusconstructStateMachine5B0C5609": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testeventbridgestepfunctionsneweventbusconstructStateMachineRole88F30AE1", - "Arn" - ] - }, "DefinitionString": { "Fn::Join": [ "", [ - "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:", + "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ClientExecutionTimeoutException\",\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:", { "Ref": "AWS::Partition" }, @@ -324,6 +318,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testeventbridgestepfunctionsneweventbusconstructStateMachineRole88F30AE1", + "Arn" + ] } }, "DependsOn": [ @@ -404,9 +404,8 @@ "testeventbridgestepfunctionsneweventbusconstructExecutionFailedAlarmF5234856": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -415,6 +414,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -425,9 +425,8 @@ "testeventbridgestepfunctionsneweventbusconstructExecutionThrottledAlarm08AFD5C8": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -436,6 +435,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -446,9 +446,8 @@ "testeventbridgestepfunctionsneweventbusconstructExecutionAbortedAlarmAA68F975": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -457,6 +456,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -497,6 +497,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -530,6 +533,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.ts index b71b9f83a..d4f52042f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.ts @@ -37,7 +37,7 @@ const submitJob = new tasks.LambdaInvoke(stack, 'LambdaTask', { const startState = new stepfunctions.Pass(stack, 'StartState'); startState.next(submitJob); -const existingEventBus = new EventBus(stack, `existing-event-bus`, { eventBusName: 'test'}); +const existingEventBus = new EventBus(stack, `existing-event-bus`, { eventBusName: 'test-existing'}); const props: EventbridgeToStepfunctionsProps = { stateMachineProps: { definition: startState, diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.expected.json index f1e000cdf..82b3ca7cd 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -279,17 +279,11 @@ "testeventbridgestepfunctionsneweventbusconstructStateMachine5B0C5609": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testeventbridgestepfunctionsneweventbusconstructStateMachineRole88F30AE1", - "Arn" - ] - }, "DefinitionString": { "Fn::Join": [ "", [ - "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:", + "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ClientExecutionTimeoutException\",\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:", { "Ref": "AWS::Partition" }, @@ -318,6 +312,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testeventbridgestepfunctionsneweventbusconstructStateMachineRole88F30AE1", + "Arn" + ] } }, "DependsOn": [ @@ -367,17 +367,17 @@ ] } }, - "testeventbridgestepfunctionsneweventbusconstructtestE4F3554B": { + "testeventbridgestepfunctionsneweventbusconstructtestnewA01E6B5C": { "Type": "AWS::Events::EventBus", "Properties": { - "Name": "test" + "Name": "test-new" } }, "testeventbridgestepfunctionsneweventbusconstructEventsRule471B9F20": { "Type": "AWS::Events::Rule", "Properties": { "EventBusName": { - "Ref": "testeventbridgestepfunctionsneweventbusconstructtestE4F3554B" + "Ref": "testeventbridgestepfunctionsneweventbusconstructtestnewA01E6B5C" }, "EventPattern": { "source": [ @@ -404,9 +404,8 @@ "testeventbridgestepfunctionsneweventbusconstructExecutionFailedAlarmF5234856": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -415,6 +414,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -425,9 +425,8 @@ "testeventbridgestepfunctionsneweventbusconstructExecutionThrottledAlarm08AFD5C8": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -436,6 +435,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -446,9 +446,8 @@ "testeventbridgestepfunctionsneweventbusconstructExecutionAbortedAlarmAA68F975": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -457,6 +456,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -497,6 +497,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -530,6 +533,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.ts index 275fc178f..6a1b5614a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.ts @@ -46,7 +46,7 @@ const props: EventbridgeToStepfunctionsProps = { source: ['solutionsconstructs'] } }, - eventBusProps: { eventBusName: 'test' }, + eventBusProps: { eventBusName: 'test-new' }, logGroupProps: { removalPolicy: RemovalPolicy.DESTROY, logGroupName: "integ-test-new-eventbus" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json index bb8778950..2511b0adc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json @@ -135,12 +135,6 @@ "testeventbridgestepfunctionsconstructStateMachine08688697": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testeventbridgestepfunctionsconstructStateMachineRoleED595422", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -156,6 +150,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testeventbridgestepfunctionsconstructStateMachineRoleED595422", + "Arn" + ] } }, "DependsOn": [ @@ -229,9 +229,8 @@ "testeventbridgestepfunctionsconstructExecutionFailedAlarm57DF694C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -240,6 +239,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -250,9 +250,8 @@ "testeventbridgestepfunctionsconstructExecutionThrottledAlarmE43E1426": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -261,6 +260,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -271,9 +271,8 @@ "testeventbridgestepfunctionsconstructExecutionAbortedAlarmAACA66A8": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -282,6 +281,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -322,6 +322,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -355,6 +358,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json index b97edd5c9..21d73496a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -279,17 +279,11 @@ "testeventbridgestepfunctionsandlambdaconstructStateMachineACD2232F": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testeventbridgestepfunctionsandlambdaconstructStateMachineRoleD7589F39", - "Arn" - ] - }, "DefinitionString": { "Fn::Join": [ "", [ - "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:", + "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ClientExecutionTimeoutException\",\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:", { "Ref": "AWS::Partition" }, @@ -318,6 +312,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testeventbridgestepfunctionsandlambdaconstructStateMachineRoleD7589F39", + "Arn" + ] } }, "DependsOn": [ @@ -391,9 +391,8 @@ "testeventbridgestepfunctionsandlambdaconstructExecutionFailedAlarm61E476BC": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -402,6 +401,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -412,9 +412,8 @@ "testeventbridgestepfunctionsandlambdaconstructExecutionThrottledAlarm70141701": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -423,6 +422,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -433,9 +433,8 @@ "testeventbridgestepfunctionsandlambdaconstructExecutionAbortedAlarm8E79E87E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -444,6 +443,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -484,6 +484,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -517,6 +520,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json index 4b99550a6..d02e765af 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,21 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,12 +753,6 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" - } - }, - "VpcDDB49FBEC5F": { - "Type": "AWS::EC2::VPCEndpoint", - "Properties": { "ServiceName": { "Fn::Join": [ "", @@ -782,13 +761,19 @@ { "Ref": "AWS::Region" }, - ".dynamodb" + ".s3" ] ] }, + "VpcEndpointType": "Gateway", "VpcId": { "Ref": "Vpc8378EB38" - }, + } + } + }, + "VpcDDB49FBEC5F": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -809,25 +794,40 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".dynamodb" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "DynamoTableB2B22E15": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, @@ -1104,6 +1104,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1138,7 +1143,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.expected.json index d64258e2f..3b243e331 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.expected.json @@ -4,19 +4,19 @@ "testconstructDynamoTable67BDAFC5": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, @@ -45,9 +45,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -64,7 +61,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -80,15 +80,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -105,12 +105,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -132,15 +132,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -156,9 +156,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -175,7 +172,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -191,15 +191,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -216,12 +216,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -243,15 +243,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -267,9 +267,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -286,7 +283,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -302,15 +302,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -327,12 +327,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -354,15 +354,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -378,9 +378,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -397,21 +394,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -428,21 +428,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -459,21 +456,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -490,21 +490,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -521,21 +518,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -552,12 +552,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -575,11 +575,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -601,7 +601,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -653,7 +653,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -673,11 +673,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -688,32 +683,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcDDB49FBEC5F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".dynamodb" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -734,16 +719,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".dynamodb" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -753,6 +749,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -764,16 +761,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -783,6 +779,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -794,27 +791,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -835,7 +820,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesECRAPIsecuritygroupE52BAE3F": { @@ -1104,6 +1104,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1138,7 +1143,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json index 0183470bc..befd1b89b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,21 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcCLOUDWATCHEVENTS1A0DAFBF": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.events", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.events", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,7 +795,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "existingresourcesECRAPIsecuritygroup78294485": { @@ -1040,6 +1040,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1074,7 +1079,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "existingeventbusA5B80487": { "Type": "AWS::Events::EventBus", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.expected.json index b7f47b52e..15a6c4295 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.expected.json @@ -25,9 +25,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -44,7 +41,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -60,15 +60,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -85,12 +85,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -112,15 +112,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -136,9 +136,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -155,7 +152,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -171,15 +171,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -196,12 +196,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -223,15 +223,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -247,9 +247,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -266,7 +263,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -282,15 +282,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -307,12 +307,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -334,15 +334,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -358,9 +358,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -377,21 +374,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -408,21 +408,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -439,21 +436,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -470,21 +470,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -501,21 +498,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -532,12 +532,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -555,11 +555,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -581,7 +581,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -633,7 +633,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -653,11 +653,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -668,21 +663,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcCLOUDWATCHEVENTS1A0DAFBF": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.events", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -692,6 +688,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.events", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -703,16 +700,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -722,6 +718,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -733,16 +730,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -752,6 +748,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -763,27 +760,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -804,7 +789,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesCLOUDWATCHEVENTSsecuritygroupC0F12F92": { @@ -1104,6 +1104,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1138,7 +1143,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.expected.json index 08a24d410..5f1f86256 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "existingFargateService/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "existingFargateService/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "existingFargateService/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -672,6 +672,15 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingFargateServiceECRAPIsecuritygroup5EE2643E", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -684,18 +693,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingFargateServiceECRAPIsecuritygroup5EE2643E", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -707,12 +704,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingFargateServiceECRDKRsecuritygroup41F182BE", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -725,18 +734,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingFargateServiceECRDKRsecuritygroup41F182BE", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -748,27 +745,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -789,12 +774,6 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" - } - }, - "VpcKINESISFIREHOSE4115B5D1": { - "Type": "AWS::EC2::VPCEndpoint", - "Properties": { "ServiceName": { "Fn::Join": [ "", @@ -803,13 +782,19 @@ { "Ref": "AWS::Region" }, - ".kinesis-firehose" + ".s3" ] ] }, + "VpcEndpointType": "Gateway", "VpcId": { "Ref": "Vpc8378EB38" - }, + } + } + }, + "VpcKINESISFIREHOSE4115B5D1": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -819,6 +804,18 @@ ] } ], + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".kinesis-firehose" + ] + ] + }, "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -830,7 +827,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "destinationfirehoseS3LoggingBucket19A32AC0": { @@ -1383,18 +1383,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1672,6 +1672,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1706,7 +1711,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "existingFargateServiceKINESISFIREHOSEsecuritygroup9CDC51DB": { "Type": "AWS::EC2::SecurityGroup", @@ -1767,109 +1776,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.expected.json index 8289c2e55..dd8a62f26 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -672,6 +672,15 @@ "VpcKINESISFIREHOSE4115B5D1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcKINESISFIREHOSEsecuritygroupCC06079B", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -684,18 +693,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcKINESISFIREHOSEsecuritygroupCC06079B", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -707,12 +704,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcECRAPIsecuritygroupB3E4A376", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -725,18 +734,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcECRAPIsecuritygroupB3E4A376", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -748,12 +745,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcECRDKRsecuritygroup0500FAE6", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -766,18 +775,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcECRDKRsecuritygroup0500FAE6", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -789,27 +786,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -830,7 +815,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "destinationfirehoseS3LoggingBucket19A32AC0": { @@ -1383,18 +1383,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1730,6 +1730,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1764,110 +1769,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } - } - }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.expected.json index 1dcc7d488..45d796abc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.expected.json @@ -550,18 +550,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -615,9 +615,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -634,7 +631,10 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -650,15 +650,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -675,12 +675,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -702,15 +702,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -726,9 +726,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -745,7 +742,10 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -761,15 +761,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -786,12 +786,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -813,15 +813,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -837,9 +837,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -856,7 +853,10 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -872,15 +872,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -897,12 +897,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -924,15 +924,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -948,9 +948,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -967,21 +964,24 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -998,21 +998,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -1029,21 +1026,24 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -1060,21 +1060,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -1091,21 +1088,24 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1122,12 +1122,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1145,11 +1145,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1171,7 +1171,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "fargateServiceFromProps/Vpc/FlowLog" } ] } @@ -1223,7 +1223,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "fargateServiceFromProps/Vpc/FlowLog" } ] }, @@ -1243,10 +1243,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1257,10 +1253,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "fargateServiceFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1269,6 +1269,15 @@ "VpcKINESISFIREHOSE4115B5D1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "fargateServiceFromPropsKINESISFIREHOSEsecuritygroupC0011304", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1281,18 +1290,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "fargateServiceFromPropsKINESISFIREHOSEsecuritygroupC0011304", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1304,12 +1301,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "fargateServiceFromPropsECRAPIsecuritygroup5784F80B", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1322,18 +1331,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "fargateServiceFromPropsECRAPIsecuritygroup5784F80B", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1345,12 +1342,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1363,18 +1372,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1386,27 +1383,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -1427,7 +1412,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "fargateServiceFromPropsKINESISFIREHOSEsecuritygroupC0011304": { @@ -1730,6 +1730,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1765,110 +1770,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } - } - }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.expected.json index 9383c2a97..a9acca727 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.expected.json @@ -546,18 +546,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -611,9 +611,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -630,7 +627,10 @@ "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -646,15 +646,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -671,12 +671,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -698,15 +698,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -722,9 +722,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -741,7 +738,10 @@ "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -757,15 +757,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -782,12 +782,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -809,15 +809,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -833,9 +833,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -852,7 +849,10 @@ "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -868,15 +868,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -893,12 +893,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -920,15 +920,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -944,9 +944,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -963,21 +960,24 @@ "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -994,21 +994,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -1025,21 +1022,24 @@ "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -1056,21 +1056,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -1087,21 +1084,24 @@ "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1118,12 +1118,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1141,11 +1141,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1167,7 +1167,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "noArguments/Vpc/FlowLog" } ] } @@ -1219,7 +1219,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "noArguments/Vpc/FlowLog" } ] }, @@ -1239,10 +1239,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1253,10 +1249,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "noArguments/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1265,10 +1265,6 @@ "VpcKINESISFIREHOSE4115B5D1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.kinesis-firehose", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -1278,6 +1274,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.kinesis-firehose", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1289,16 +1286,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -1308,6 +1304,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1319,16 +1316,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -1338,6 +1334,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1349,27 +1346,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -1390,7 +1375,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "noArgumentsKINESISFIREHOSEsecuritygroupBE0C0999": { @@ -1693,6 +1693,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1727,7 +1732,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.expected.json index 9e9e1b4a9..1c7b97b8e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.expected.json @@ -550,18 +550,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -615,9 +615,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.100.0.0/19", "MapPublicIpOnLaunch": true, @@ -634,7 +631,10 @@ "Key": "Name", "Value": "vpcFromprops/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -650,15 +650,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromprops/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -675,12 +675,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -702,15 +702,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -726,9 +726,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.100.32.0/19", "MapPublicIpOnLaunch": true, @@ -745,7 +742,10 @@ "Key": "Name", "Value": "vpcFromprops/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -761,15 +761,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromprops/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -786,12 +786,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -813,15 +813,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -837,9 +837,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.100.64.0/19", "MapPublicIpOnLaunch": true, @@ -856,7 +853,10 @@ "Key": "Name", "Value": "vpcFromprops/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -872,15 +872,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromprops/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -897,12 +897,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -924,15 +924,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -948,9 +948,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.100.96.0/19", "MapPublicIpOnLaunch": false, @@ -967,21 +964,24 @@ "Key": "Name", "Value": "vpcFromprops/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromprops/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -998,21 +998,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.100.128.0/19", "MapPublicIpOnLaunch": false, @@ -1029,21 +1026,24 @@ "Key": "Name", "Value": "vpcFromprops/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromprops/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -1060,21 +1060,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.100.160.0/19", "MapPublicIpOnLaunch": false, @@ -1091,21 +1088,24 @@ "Key": "Name", "Value": "vpcFromprops/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromprops/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1122,12 +1122,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1145,11 +1145,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1171,7 +1171,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc" + "Value": "vpcFromprops/Vpc/FlowLog" } ] } @@ -1223,7 +1223,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc" + "Value": "vpcFromprops/Vpc/FlowLog" } ] }, @@ -1243,10 +1243,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1257,10 +1253,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc" + "Value": "vpcFromprops/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1269,6 +1269,15 @@ "VpcKINESISFIREHOSE4115B5D1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "vpcFrompropsKINESISFIREHOSEsecuritygroup537BDD19", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1281,18 +1290,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "vpcFrompropsKINESISFIREHOSEsecuritygroup537BDD19", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1304,12 +1301,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "vpcFrompropsECRAPIsecuritygroupB070D1AB", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1322,18 +1331,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "vpcFrompropsECRAPIsecuritygroupB070D1AB", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1345,12 +1342,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "vpcFrompropsECRDKRsecuritygroup4D8AFEF5", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1363,18 +1372,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "vpcFrompropsECRDKRsecuritygroup4D8AFEF5", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1386,27 +1383,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -1427,7 +1412,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "vpcFrompropsKINESISFIREHOSEsecuritygroup537BDD19": { @@ -1730,6 +1730,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1764,110 +1769,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } - } - }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json index 810cc8994..94ad4f26a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingFargateService/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "existingFargateService/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "existingFargateService/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "existingFargateService/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -672,6 +672,15 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingFargateServiceECRAPIsecuritygroup5EE2643E", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -684,18 +693,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingFargateServiceECRAPIsecuritygroup5EE2643E", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -707,12 +704,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingFargateServiceECRDKRsecuritygroup41F182BE", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -725,18 +734,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingFargateServiceECRDKRsecuritygroup41F182BE", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -748,27 +745,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -789,12 +774,6 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" - } - }, - "VpcKINESISSTREAMSC07D91B5": { - "Type": "AWS::EC2::VPCEndpoint", - "Properties": { "ServiceName": { "Fn::Join": [ "", @@ -803,13 +782,19 @@ { "Ref": "AWS::Region" }, - ".kinesis-streams" + ".s3" ] ] }, + "VpcEndpointType": "Gateway", "VpcId": { "Ref": "Vpc8378EB38" - }, + } + } + }, + "VpcKINESISSTREAMSC07D91B5": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -819,6 +804,18 @@ ] } ], + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".kinesis-streams" + ] + ] + }, "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -830,7 +827,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "existingFargateServiceECRAPIsecuritygroup5EE2643E": { @@ -1076,6 +1076,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1110,7 +1115,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "testfargatekinesisstreamsKinesisStreamD31BD614": { "Type": "AWS::Kinesis::Stream", @@ -1126,9 +1135,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -1139,9 +1148,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.expected.json index c11f84f5e..28cff9b56 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.expected.json @@ -16,9 +16,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -29,9 +29,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -57,9 +57,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -76,7 +73,10 @@ "Key": "Name", "Value": "existingStream/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -92,15 +92,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingStream/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -117,12 +117,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -144,15 +144,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -168,9 +168,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -187,7 +184,10 @@ "Key": "Name", "Value": "existingStream/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -203,15 +203,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingStream/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -228,12 +228,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -255,15 +255,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -279,9 +279,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -298,7 +295,10 @@ "Key": "Name", "Value": "existingStream/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -314,15 +314,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingStream/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -339,12 +339,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -366,15 +366,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -390,9 +390,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -409,21 +406,24 @@ "Key": "Name", "Value": "existingStream/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingStream/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -440,21 +440,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -471,21 +468,24 @@ "Key": "Name", "Value": "existingStream/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingStream/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -502,21 +502,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -533,21 +530,24 @@ "Key": "Name", "Value": "existingStream/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingStream/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -564,12 +564,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -587,11 +587,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -613,7 +613,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc" + "Value": "existingStream/Vpc/FlowLog" } ] } @@ -665,7 +665,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc" + "Value": "existingStream/Vpc/FlowLog" } ] }, @@ -685,10 +685,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -699,10 +695,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc" + "Value": "existingStream/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -711,6 +711,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingStreamKINESISSTREAMSsecuritygroup14C04A5F", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -723,18 +732,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingStreamKINESISSTREAMSsecuritygroup14C04A5F", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -746,12 +743,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingStreamECRAPIsecuritygroup4E9C019E", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -764,18 +773,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingStreamECRAPIsecuritygroup4E9C019E", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -787,12 +784,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingStreamECRDKRsecuritygroup5C8931AB", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -805,18 +814,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingStreamECRDKRsecuritygroup5C8931AB", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -828,27 +825,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -869,7 +854,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "existingStreamKINESISSTREAMSsecuritygroup14C04A5F": { @@ -1173,6 +1173,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1207,7 +1212,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } + }, + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json index bc14d2b5a..b5492ad94 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -672,6 +672,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -684,18 +693,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -707,12 +704,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcECRAPIsecuritygroupB3E4A376", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -725,18 +734,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcECRAPIsecuritygroupB3E4A376", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -748,12 +745,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcECRDKRsecuritygroup0500FAE6", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -766,18 +775,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcECRDKRsecuritygroup0500FAE6", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -789,27 +786,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -830,7 +815,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testfargatekinesisstreamsKinesisStreamD31BD614": { @@ -847,9 +847,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -860,9 +860,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -1171,6 +1171,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1205,7 +1210,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } + }, + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json index b24e7d147..c5d5c91b5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json @@ -14,9 +14,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -27,9 +27,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -55,9 +55,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -74,7 +71,10 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -90,15 +90,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -142,15 +142,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -166,9 +166,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -185,7 +182,10 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -201,15 +201,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -226,12 +226,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -253,15 +253,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -277,9 +277,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -296,7 +293,10 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -312,15 +312,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -337,12 +337,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -364,15 +364,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -388,9 +388,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -407,21 +404,24 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -438,21 +438,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -469,21 +466,24 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -500,21 +500,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -531,21 +528,24 @@ "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -562,12 +562,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -585,11 +585,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "fargateServiceFromProps/Vpc/FlowLog" } ] } @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "fargateServiceFromProps/Vpc/FlowLog" } ] }, @@ -683,10 +683,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -697,10 +693,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "fargateServiceFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -709,6 +709,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "fargateServiceFromPropsKINESISSTREAMSsecuritygroup6FD7F225", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -721,18 +730,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "fargateServiceFromPropsKINESISSTREAMSsecuritygroup6FD7F225", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -744,12 +741,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "fargateServiceFromPropsECRAPIsecuritygroup5784F80B", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -762,18 +771,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "fargateServiceFromPropsECRAPIsecuritygroup5784F80B", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -785,12 +782,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -803,18 +812,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -826,27 +823,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -867,7 +852,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "fargateServiceFromPropsKINESISSTREAMSsecuritygroup6FD7F225": { @@ -1171,6 +1171,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1206,7 +1211,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } + }, + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json index 62dd5c4b3..6b84aee7b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json @@ -14,9 +14,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -27,9 +27,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -55,9 +55,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -74,7 +71,10 @@ "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -90,15 +90,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -142,15 +142,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -166,9 +166,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -185,7 +182,10 @@ "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -201,15 +201,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -226,12 +226,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -253,15 +253,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -277,9 +277,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -296,7 +293,10 @@ "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -312,15 +312,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -337,12 +337,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -364,15 +364,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -388,9 +388,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -407,21 +404,24 @@ "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -438,21 +438,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -469,21 +466,24 @@ "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -500,21 +500,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -531,21 +528,24 @@ "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "noArguments/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -562,12 +562,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -585,11 +585,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "noArguments/Vpc/FlowLog" } ] } @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "noArguments/Vpc/FlowLog" } ] }, @@ -683,10 +683,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -697,10 +693,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "noArguments/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -709,6 +709,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "noArgumentsKINESISSTREAMSsecuritygroupA5FDBE79", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -721,18 +730,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "noArgumentsKINESISSTREAMSsecuritygroupA5FDBE79", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -744,12 +741,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "noArgumentsECRAPIsecuritygroup70B67825", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -762,18 +771,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "noArgumentsECRAPIsecuritygroup70B67825", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -785,12 +782,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "noArgumentsECRDKRsecuritygroup881C3744", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -803,18 +812,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "noArgumentsECRDKRsecuritygroup881C3744", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -826,27 +823,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -867,7 +852,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "noArgumentsKINESISSTREAMSsecuritygroupA5FDBE79": { @@ -1171,6 +1171,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1205,7 +1210,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } + }, + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.expected.json index 58bee13d3..1e6781fb8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.expected.json @@ -16,9 +16,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -29,9 +29,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -57,9 +57,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -76,7 +73,10 @@ "Key": "Name", "Value": "streamFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -92,15 +92,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "streamFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -117,12 +117,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -144,15 +144,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -168,9 +168,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -187,7 +184,10 @@ "Key": "Name", "Value": "streamFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -203,15 +203,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "streamFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -228,12 +228,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -255,15 +255,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -279,9 +279,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -298,7 +295,10 @@ "Key": "Name", "Value": "streamFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -314,15 +314,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "streamFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -339,12 +339,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -366,15 +366,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -390,9 +390,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -409,21 +406,24 @@ "Key": "Name", "Value": "streamFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "streamFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -440,21 +440,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -471,21 +468,24 @@ "Key": "Name", "Value": "streamFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "streamFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -502,21 +502,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -533,21 +530,24 @@ "Key": "Name", "Value": "streamFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "streamFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -564,12 +564,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -587,11 +587,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -613,7 +613,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc" + "Value": "streamFromProps/Vpc/FlowLog" } ] } @@ -665,7 +665,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc" + "Value": "streamFromProps/Vpc/FlowLog" } ] }, @@ -685,10 +685,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -699,10 +695,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc" + "Value": "streamFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -711,6 +711,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "streamFromPropsKINESISSTREAMSsecuritygroup68986EDF", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -723,18 +732,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "streamFromPropsKINESISSTREAMSsecuritygroup68986EDF", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -746,12 +743,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "streamFromPropsECRAPIsecuritygroupFDB580C0", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -764,18 +773,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "streamFromPropsECRAPIsecuritygroupFDB580C0", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -787,12 +784,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "streamFromPropsECRDKRsecuritygroupEB1BC2F0", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -805,18 +814,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "streamFromPropsECRDKRsecuritygroupEB1BC2F0", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -828,27 +825,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -869,7 +854,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "streamFromPropsKINESISSTREAMSsecuritygroup68986EDF": { @@ -1173,6 +1173,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1207,7 +1212,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } + }, + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json index d12c25b61..9532f7b9d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json @@ -14,9 +14,9 @@ "testfargatekinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarm60755E90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -27,9 +27,9 @@ "testfargatekinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarmDE16A9F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -55,9 +55,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.100.0.0/19", "MapPublicIpOnLaunch": true, @@ -74,7 +71,10 @@ "Key": "Name", "Value": "vpcFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -90,15 +90,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromProps/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -115,12 +115,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -142,15 +142,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -166,9 +166,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.100.32.0/19", "MapPublicIpOnLaunch": true, @@ -185,7 +182,10 @@ "Key": "Name", "Value": "vpcFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -201,15 +201,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromProps/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -226,12 +226,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -253,15 +253,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -277,9 +277,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.100.64.0/19", "MapPublicIpOnLaunch": true, @@ -296,7 +293,10 @@ "Key": "Name", "Value": "vpcFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -312,15 +312,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromProps/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -337,12 +337,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -364,15 +364,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -388,9 +388,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.100.96.0/19", "MapPublicIpOnLaunch": false, @@ -407,21 +404,24 @@ "Key": "Name", "Value": "vpcFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromProps/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -438,21 +438,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.100.128.0/19", "MapPublicIpOnLaunch": false, @@ -469,21 +466,24 @@ "Key": "Name", "Value": "vpcFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromProps/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -500,21 +500,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.100.160.0/19", "MapPublicIpOnLaunch": false, @@ -531,21 +528,24 @@ "Key": "Name", "Value": "vpcFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpcFromProps/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -562,12 +562,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -585,11 +585,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc" + "Value": "vpcFromProps/Vpc/FlowLog" } ] } @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc" + "Value": "vpcFromProps/Vpc/FlowLog" } ] }, @@ -683,10 +683,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -697,10 +693,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc" + "Value": "vpcFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -709,6 +709,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "vpcFromPropsKINESISSTREAMSsecuritygroupB4A9EE00", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -721,18 +730,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "vpcFromPropsKINESISSTREAMSsecuritygroupB4A9EE00", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -744,12 +741,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "vpcFromPropsECRAPIsecuritygroup5AF6C0C4", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -762,18 +771,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "vpcFromPropsECRAPIsecuritygroup5AF6C0C4", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -785,12 +782,24 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "vpcFromPropsECRDKRsecuritygroup822718EC", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -803,18 +812,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "vpcFromPropsECRDKRsecuritygroup822718EC", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -826,27 +823,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -867,7 +852,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "vpcFromPropsKINESISSTREAMSsecuritygroupB4A9EE00": { @@ -1171,6 +1171,11 @@ "Ref": "testfargatekinesisstreamsclusterEA5A2AD7" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1205,7 +1210,11 @@ "TaskDefinition": { "Ref": "testfargatekinesisstreamstaskdef402FE0B3" } - } + }, + "DependsOn": [ + "testfargatekinesisstreamstaskdefTaskRoleDefaultPolicyAE7EF3E4", + "testfargatekinesisstreamstaskdefTaskRole9811F3BE" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.expected.json index 7fcf875da..4e43f850b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,10 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -661,10 +657,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,10 +673,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,7 +753,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "existingresourcesECRAPIsecuritygroup78294485": { @@ -987,6 +987,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1021,7 +1026,10 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleB2DEF113" + ] }, "testconstructCognitoUserPoolA4991355": { "Type": "AWS::Cognito::UserPool", @@ -1060,9 +1068,6 @@ "testconstructCognitoUserPoolClient36ACF012": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testconstructCognitoUserPoolA4991355" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -1080,7 +1085,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testconstructCognitoUserPoolA4991355" + } } }, "testconstructCognitoIdentityPool51EFD08D": { @@ -1431,9 +1439,9 @@ "testconstructStatusRedAlarmFBEA96DF": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -1444,9 +1452,9 @@ "testconstructStatusYellowAlarm3B8C3640": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -1457,9 +1465,9 @@ "testconstructFreeStorageSpaceTooLowAlarm08294658": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -1470,9 +1478,9 @@ "testconstructIndexWritesBlockedTooHighAlarm06094A18": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -1483,9 +1491,9 @@ "testconstructAutomatedSnapshotFailureTooHighAlarm29E550A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -1496,9 +1504,9 @@ "testconstructCPUUtilizationTooHighAlarmD32179B7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -1509,9 +1517,9 @@ "testconstructJVMMemoryPressureTooHighAlarmFD4175A0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -1522,9 +1530,9 @@ "testconstructMasterCPUUtilizationTooHighAlarmAA50D0A7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -1535,9 +1543,9 @@ "testconstructMasterJVMMemoryPressureTooHighAlarm5AE37D64": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.expected.json index d29d2ac1d..1887e8c57 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.expected.json @@ -38,9 +38,6 @@ "testconstructCognitoUserPoolClient36ACF012": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testconstructCognitoUserPoolA4991355" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -58,7 +55,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testconstructCognitoUserPoolA4991355" + } } }, "testconstructCognitoIdentityPool51EFD08D": { @@ -409,9 +409,9 @@ "testconstructStatusRedAlarmFBEA96DF": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -422,9 +422,9 @@ "testconstructStatusYellowAlarm3B8C3640": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -435,9 +435,9 @@ "testconstructFreeStorageSpaceTooLowAlarm08294658": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -448,9 +448,9 @@ "testconstructIndexWritesBlockedTooHighAlarm06094A18": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -461,9 +461,9 @@ "testconstructAutomatedSnapshotFailureTooHighAlarm29E550A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -474,9 +474,9 @@ "testconstructCPUUtilizationTooHighAlarmD32179B7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -487,9 +487,9 @@ "testconstructJVMMemoryPressureTooHighAlarmFD4175A0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -500,9 +500,9 @@ "testconstructMasterCPUUtilizationTooHighAlarmAA50D0A7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -513,9 +513,9 @@ "testconstructMasterJVMMemoryPressureTooHighAlarm5AE37D64": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -541,9 +541,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -560,7 +557,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -576,15 +576,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -601,12 +601,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -628,15 +628,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -652,9 +652,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -671,7 +668,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -687,15 +687,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -712,12 +712,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -739,15 +739,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -763,9 +763,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -782,7 +779,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -798,15 +798,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -823,12 +823,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -850,15 +850,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -874,9 +874,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -893,21 +890,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -924,21 +924,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -955,21 +952,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -986,21 +986,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -1017,21 +1014,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1048,12 +1048,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1071,11 +1071,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1097,7 +1097,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -1149,7 +1149,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -1169,10 +1169,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1183,10 +1179,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1195,10 +1195,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -1208,6 +1204,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1219,16 +1216,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -1238,6 +1234,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1249,27 +1246,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -1290,7 +1275,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesECRAPIsecuritygroupE52BAE3F": { @@ -1509,6 +1509,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1543,7 +1548,10 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json index 9f38728ad..60e51ad86 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,10 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -661,10 +657,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,10 +673,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,7 +753,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "scrapBucketB11863B7": { @@ -913,18 +913,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -1276,6 +1276,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1310,7 +1315,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.expected.json index 33929811a..df29641ff 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.expected.json @@ -290,9 +290,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -309,7 +306,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -325,15 +325,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -350,12 +350,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -377,15 +377,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -401,9 +401,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -420,7 +417,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -436,15 +436,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -461,12 +461,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -488,15 +488,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -512,9 +512,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -531,7 +528,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -547,15 +547,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -572,12 +572,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -599,15 +599,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -623,9 +623,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -642,21 +639,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -673,21 +673,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -704,21 +701,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -735,21 +735,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -766,21 +763,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -797,12 +797,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -820,11 +820,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -846,7 +846,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -898,7 +898,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -918,10 +918,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -932,10 +928,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -944,21 +944,6 @@ "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -979,16 +964,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -998,6 +994,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1009,16 +1006,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -1028,6 +1024,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1039,7 +1036,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesECRAPIsecuritygroupE52BAE3F": { @@ -1313,6 +1313,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1347,7 +1352,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { "Type": "AWS::IAM::Role", @@ -1378,18 +1387,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json index e715fe90d..9355051e6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,21 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcSECRETSMANAGERF52907C2": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.secretsmanager", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.secretsmanager", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,7 +795,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "secret4DA88516": { @@ -1058,6 +1058,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1092,7 +1097,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "existingresourcesSECRETSMANAGERsecuritygroup8010FC5B": { "Type": "AWS::EC2::SecurityGroup", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.expected.json index a447faa0c..f893bb048 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.expected.json @@ -37,9 +37,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -56,7 +53,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -72,15 +72,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -97,12 +97,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -124,15 +124,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -148,9 +148,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -167,7 +164,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -183,15 +183,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -208,12 +208,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -235,15 +235,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -259,9 +259,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -278,7 +275,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -294,15 +294,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -319,12 +319,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -346,15 +346,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -370,9 +370,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -389,21 +386,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -420,21 +420,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -451,21 +448,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -482,21 +482,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -513,21 +510,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -544,12 +544,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -567,11 +567,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -593,7 +593,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -645,7 +645,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -665,11 +665,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -680,21 +675,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSECRETSMANAGERF52907C2": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.secretsmanager", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -704,6 +700,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.secretsmanager", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -715,16 +712,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -734,6 +730,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -745,16 +742,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -764,6 +760,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -775,27 +772,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -816,7 +801,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesSECRETSMANAGERsecuritygroupD22DA6BC": { @@ -1126,6 +1126,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1160,7 +1165,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json index 72900b528..1f5c9d097 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,21 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcSNS5B664381": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.sns", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.sns", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,7 +795,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testtopicB3D54793": { @@ -1059,6 +1059,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1093,7 +1098,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "existingresourcesSNSsecuritygroup2696BE98": { "Type": "AWS::EC2::SecurityGroup", @@ -1188,4 +1197,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.expected.json index bfc2f4231..ee0a2e6b2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.expected.json @@ -124,9 +124,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -143,7 +140,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -159,15 +159,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -184,12 +184,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -211,15 +211,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -235,9 +235,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -254,7 +251,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -270,15 +270,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -295,12 +295,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -322,15 +322,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -346,9 +346,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -365,7 +362,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -381,15 +381,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -406,12 +406,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -433,15 +433,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -457,9 +457,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -476,21 +473,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -507,21 +507,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -538,21 +535,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -569,21 +569,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -600,21 +597,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -631,12 +631,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -654,11 +654,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -680,7 +680,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -732,7 +732,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -752,11 +752,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -767,21 +762,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSNS5B664381": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.sns", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -791,6 +787,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.sns", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -802,16 +799,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -821,6 +817,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -832,16 +829,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -851,6 +847,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -862,27 +859,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -903,7 +888,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesSNSsecuritygroup4422F7B8": { @@ -1209,6 +1209,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1243,7 +1248,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json index 3983feb0d..3e6aae42c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,21 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcSQSDF166A88": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.sqs", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.sqs", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,7 +795,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testqueueA58C838B": { @@ -1078,6 +1078,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1112,7 +1117,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "existingresourcesSQSsecuritygroup0C9178B2": { "Type": "AWS::EC2::SecurityGroup", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.expected.json index d8a901ff8..b2fe8831d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.expected.json @@ -99,9 +99,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -118,7 +115,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -134,15 +134,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -159,12 +159,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -186,15 +186,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -210,9 +210,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -229,7 +226,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -245,15 +245,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -270,12 +270,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -297,15 +297,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -321,9 +321,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -340,7 +337,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -356,15 +356,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -381,12 +381,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -408,15 +408,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -432,9 +432,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -451,21 +448,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -482,21 +482,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -513,21 +510,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -544,21 +544,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -575,21 +572,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -606,12 +606,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -629,11 +629,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -655,7 +655,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -707,7 +707,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -727,11 +727,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -742,21 +737,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSQSDF166A88": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.sqs", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -766,6 +762,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.sqs", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -777,16 +774,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -796,6 +792,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -807,16 +804,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -826,6 +822,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -837,27 +834,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -878,7 +863,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesSQSsecuritygroup1D95FDB1": { @@ -1191,6 +1191,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1225,7 +1230,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json index dffa1b1c6..a02651ced 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,21 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "existing-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcSSM173B3B5B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ssm", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ssm", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,17 +795,20 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "Parameter9E1B4FBA": { "Type": "AWS::SSM::Parameter", "Properties": { - "Type": "String", - "Value": "Foo", "AllowedPattern": ".*", "Description": "The value Foo", - "Name": "FooParameter" + "Name": "FooParameter", + "Type": "String", + "Value": "Foo" } }, "existingresourcesECRAPIsecuritygroup78294485": { @@ -1091,6 +1091,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1125,7 +1130,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "existingresourcesSSMsecuritygroup5CE82B38": { "Type": "AWS::EC2::SecurityGroup", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.expected.json index 57b7aa520..8b5a629be 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.expected.json @@ -4,9 +4,9 @@ "testconstructstringParameter4A9E7765": { "Type": "AWS::SSM::Parameter", "Properties": { + "Name": "FooParameter", "Type": "String", - "Value": "Foo", - "Name": "FooParameter" + "Value": "Foo" } }, "Vpc8378EB38": { @@ -27,9 +27,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -46,7 +43,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -62,15 +62,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -87,12 +87,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -114,15 +114,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -138,9 +138,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -157,7 +154,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -173,15 +173,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -198,12 +198,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -225,15 +225,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -249,9 +249,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -268,7 +265,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -284,15 +284,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -309,12 +309,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -336,15 +336,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -360,9 +360,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -379,21 +376,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -410,21 +410,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -441,21 +438,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -472,21 +472,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -503,21 +500,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -534,12 +534,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -557,11 +557,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -583,7 +583,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -635,7 +635,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -655,11 +655,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -670,21 +665,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSSM173B3B5B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ssm", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -694,6 +690,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ssm", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -705,16 +702,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -724,6 +720,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -735,16 +732,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -754,6 +750,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -765,27 +762,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -806,7 +791,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesSSMsecuritygroupBA8A3B0D": { @@ -1124,6 +1124,11 @@ "Ref": "testconstructcluster7B6231C5" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1158,7 +1163,11 @@ "TaskDefinition": { "Ref": "testconstructtaskdef8BD1F9E4" } - } + }, + "DependsOn": [ + "testconstructtaskdefTaskRoleDefaultPolicyF34A1535", + "testconstructtaskdefTaskRoleC60414C4" + ] } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json index f8b2fa26e..b220c2404 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-resources/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ] }, @@ -647,10 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -661,10 +657,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,10 +673,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcSTEPFUNCTIONS550F8CB6": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.states", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.states", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,7 +795,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newresourcesECRAPIsecuritygroupE52BAE3F": { @@ -1037,6 +1037,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1071,7 +1076,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "testconstructStateMachineLogGroup2EB4F48B": { "Type": "AWS::Logs::LogGroup", @@ -1200,12 +1209,6 @@ "testconstructStateMachine3333AAA9": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testconstructStateMachineRoleA396E5D3", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -1221,6 +1224,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testconstructStateMachineRoleA396E5D3", + "Arn" + ] } }, "DependsOn": [ @@ -1233,9 +1242,8 @@ "testconstructExecutionFailedAlarmE9CEA29E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -1244,6 +1252,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -1254,9 +1263,8 @@ "testconstructExecutionThrottledAlarmEE993A2A": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -1265,6 +1273,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -1275,9 +1284,8 @@ "testconstructExecutionAbortedAlarm2BC3DDB8": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -1286,6 +1294,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json index 8da9fc9df..2d6f8627b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc" + "Value": "no-cloudwatch-alarms/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc" + "Value": "no-cloudwatch-alarms/Vpc/FlowLog" } ] }, @@ -647,10 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -661,10 +657,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc" + "Value": "no-cloudwatch-alarms/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,10 +673,6 @@ "VpcECRAPI9A3B6A2B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.api", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -686,6 +682,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.api", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -697,16 +694,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcECRDKR604E039F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -716,6 +712,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.ecr.dkr", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -727,27 +724,15 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".s3" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -768,16 +753,27 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".s3" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcSTEPFUNCTIONS550F8CB6": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": "com.amazonaws.us-east-1.states", - "VpcId": { - "Ref": "Vpc8378EB38" - }, "PrivateDnsEnabled": true, "SecurityGroupIds": [ { @@ -787,6 +783,7 @@ ] } ], + "ServiceName": "com.amazonaws.us-east-1.states", "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -798,7 +795,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "nocloudwatchalarmsECRAPIsecuritygroupA72029F8": { @@ -1037,6 +1037,11 @@ "Ref": "testclusterDF8B0D19" }, "DeploymentConfiguration": { + "Alarms": { + "AlarmNames": [], + "Enable": false, + "Rollback": false + }, "MaximumPercent": 150, "MinimumHealthyPercent": 75 }, @@ -1071,7 +1076,11 @@ "TaskDefinition": { "Ref": "testtaskdefF924AD58" } - } + }, + "DependsOn": [ + "testtaskdefTaskRoleDefaultPolicy5D591D1C", + "testtaskdefTaskRoleB2DEF113" + ] }, "testconstructStateMachineLogGroup2EB4F48B": { "Type": "AWS::Logs::LogGroup", @@ -1180,12 +1189,6 @@ "testconstructStateMachine3333AAA9": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testconstructStateMachineRoleA396E5D3", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -1201,6 +1204,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testconstructStateMachineRoleA396E5D3", + "Arn" + ] } }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.expected.json index c0e6aca1f..60fbe3fb2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.expected.json @@ -126,12 +126,6 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testiotlambdadynamodbstackLambdaToDynamoDBLambdaFunctionServiceRole31915E05", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -141,6 +135,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testiotlambdadynamodbstackLambdaToDynamoDBLambdaFunctionServiceRole31915E05", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -191,19 +191,19 @@ "testiotlambdadynamodbstackLambdaToDynamoDBDynamoTableE17E5733": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.expected.json index acab0fcdd..5b46748dc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.expected.json @@ -167,12 +167,6 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testiotlambdadynamodbstackLambdaToDynamoDBLambdaFunctionServiceRole31915E05", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -182,6 +176,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testiotlambdadynamodbstackLambdaToDynamoDBLambdaFunctionServiceRole31915E05", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -261,19 +261,19 @@ "testiotlambdadynamodbstackLambdaToDynamoDBDynamoTableE17E5733": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, @@ -302,9 +302,6 @@ "testiotlambdadynamodbstackVpcisolatedSubnet1Subnet3AB7ADA5": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -321,21 +318,24 @@ "Key": "Name", "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + } } }, "testiotlambdadynamodbstackVpcisolatedSubnet1RouteTableE28AAAB5": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, "Tags": [ { "Key": "Name", "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + } } }, "testiotlambdadynamodbstackVpcisolatedSubnet1RouteTableAssociationFAA18521": { @@ -352,9 +352,6 @@ "testiotlambdadynamodbstackVpcisolatedSubnet2SubnetBDEE1FAE": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + } } }, "testiotlambdadynamodbstackVpcisolatedSubnet2RouteTableAF607A65": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, "Tags": [ { "Key": "Name", "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + } } }, "testiotlambdadynamodbstackVpcisolatedSubnet2RouteTableAssociation80ECEB84": { @@ -402,9 +402,6 @@ "testiotlambdadynamodbstackVpcisolatedSubnet3Subnet5D41F483": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -421,21 +418,24 @@ "Key": "Name", "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + } } }, "testiotlambdadynamodbstackVpcisolatedSubnet3RouteTableE56B664A": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, "Tags": [ { "Key": "Name", "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + } } }, "testiotlambdadynamodbstackVpcisolatedSubnet3RouteTableAssociationF06E774F": { @@ -467,7 +467,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc" + "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" } ] } @@ -519,7 +519,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc" + "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" } ] }, @@ -539,10 +539,6 @@ "testiotlambdadynamodbstackVpcFlowLogC88B17DB": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "testiotlambdadynamodbstackVpcFlowLogIAMRole84CD262B", @@ -553,10 +549,14 @@ "LogGroupName": { "Ref": "testiotlambdadynamodbstackVpcFlowLogLogGroup0BA54CDB" }, + "ResourceId": { + "Ref": "testiotlambdadynamodbstackVpc1986A4BB" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc" + "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -565,6 +565,17 @@ "testiotlambdadynamodbstackVpcDDBD215AB1B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "RouteTableIds": [ + { + "Ref": "testiotlambdadynamodbstackVpcisolatedSubnet1RouteTableE28AAAB5" + }, + { + "Ref": "testiotlambdadynamodbstackVpcisolatedSubnet2RouteTableAF607A65" + }, + { + "Ref": "testiotlambdadynamodbstackVpcisolatedSubnet3RouteTableE56B664A" + } + ], "ServiceName": { "Fn::Join": [ "", @@ -577,21 +588,10 @@ ] ] }, + "VpcEndpointType": "Gateway", "VpcId": { "Ref": "testiotlambdadynamodbstackVpc1986A4BB" - }, - "RouteTableIds": [ - { - "Ref": "testiotlambdadynamodbstackVpcisolatedSubnet1RouteTableE28AAAB5" - }, - { - "Ref": "testiotlambdadynamodbstackVpcisolatedSubnet2RouteTableAF607A65" - }, - { - "Ref": "testiotlambdadynamodbstackVpcisolatedSubnet3RouteTableE56B664A" - } - ], - "VpcEndpointType": "Gateway" + } } }, "testiotlambdadynamodbstackIotToLambdaIotTopic74F5E3BB": { diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.expected.json index 42fd24970..1966d0657 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testiotlambdaintegrationLambdaFunctionServiceRole27C3EE41", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testiotlambdaintegrationLambdaFunctionServiceRole27C3EE41", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.expected.json index 9026e8587..ae6e70b8a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.expected.json index 8f8b07b38..423e55a0f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.expected.json @@ -142,18 +142,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -283,109 +283,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.expected.json index 95a67bf11..c447bea63 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.expected.json @@ -3,6 +3,7 @@ "existingKeyB52D6AF1": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -30,8 +31,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.expected.json index 293bda90e..ffb38796f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -398,109 +398,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.expected.json index 1d092a359..cd3ca176d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.expected.json @@ -179,18 +179,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -567,109 +567,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json index 2c7f16e68..81b1bf65b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json @@ -422,12 +422,6 @@ "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fbf0b12f00bc09401fb04a361c549193f18f6fa7df4d304c5bfab7ace478b340.py" } }, - "Role": { - "Fn::GetAtt": [ - "testkinesisstreamslambdaJobRole42199B9C", - "Arn" - ] - }, "DefaultArguments": { "--enable-metrics": true, "--enable-continuous-cloudwatch-log": true, @@ -452,6 +446,12 @@ }, "GlueVersion": "2.0", "NumberOfWorkers": 2, + "Role": { + "Fn::GetAtt": [ + "testkinesisstreamslambdaJobRole42199B9C", + "Arn" + ] + }, "SecurityConfiguration": "ETLJobSecurityConfig", "WorkerType": "G.1X" } @@ -459,9 +459,9 @@ "testkinesisstreamslambdaKinesisStreamGetRecordsIteratorAgeAlarmFB74C363": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -472,9 +472,9 @@ "testkinesisstreamslambdaKinesisStreamReadProvisionedThroughputExceededAlarm5ABF4346": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -764,4 +764,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json index 6910e303d..d49931286 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json @@ -95,9 +95,9 @@ "testkinesisstreamslambdaKinesisStreamGetRecordsIteratorAgeAlarmFB74C363": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -108,9 +108,9 @@ "testkinesisstreamslambdaKinesisStreamReadProvisionedThroughputExceededAlarm5ABF4346": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json index 815e7b32c..c3e70887b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json @@ -413,12 +413,6 @@ "PythonVersion": "3", "ScriptLocation": "s3://fakelocation/fakefile.py" }, - "Role": { - "Fn::GetAtt": [ - "testkinesisstreamslambdaJobRole42199B9C", - "Arn" - ] - }, "DefaultArguments": { "--enable-metrics": true, "--enable-continuous-cloudwatch-log": true, @@ -443,6 +437,12 @@ }, "GlueVersion": "2.0", "NumberOfWorkers": 2, + "Role": { + "Fn::GetAtt": [ + "testkinesisstreamslambdaJobRole42199B9C", + "Arn" + ] + }, "SecurityConfiguration": "ETLJobSecurityConfig", "WorkerType": "G.1X" } @@ -450,9 +450,9 @@ "testkinesisstreamslambdaKinesisStreamGetRecordsIteratorAgeAlarmFB74C363": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -463,9 +463,9 @@ "testkinesisstreamslambdaKinesisStreamReadProvisionedThroughputExceededAlarm5ABF4346": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -755,4 +755,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json index 17ba9aba0..5f138e5ae 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json @@ -422,9 +422,9 @@ "testkinesisfirehoses3KinesisStreamGetRecordsIteratorAgeAlarm52FF77D1": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -435,9 +435,9 @@ "testkinesisfirehoses3KinesisStreamReadProvisionedThroughputExceededAlarm4A9C6943": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json index 539088bd0..df0c49758 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -423,9 +423,9 @@ "testexistingbucketfirehoses3stackKinesisStreamGetRecordsIteratorAgeAlarmD41CBD58": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -436,9 +436,9 @@ "testexistingbucketfirehoses3stackKinesisStreamReadProvisionedThroughputExceededAlarmEC9D97D6": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -489,109 +489,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json index 3e67087bf..7a92b2333 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -493,9 +493,9 @@ "testexistingloggingbucketstreamsfirehoses3stackKinesisStreamGetRecordsIteratorAgeAlarmF190BB96": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -506,9 +506,9 @@ "testexistingloggingbucketstreamsfirehoses3stackKinesisStreamReadProvisionedThroughputExceededAlarmCF515815": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -559,109 +559,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json index 1fe2510bc..93eda755b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json @@ -153,18 +153,18 @@ }, "S3Key": "26cf7db64552331215006953bf73e5adfb49b5bf0eb2298bfe04547b76c08b88.zip" }, - "Role": { - "Fn::GetAtt": [ - "testkinesislambdaLambdaFunctionServiceRole965E2A08", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testkinesislambdaLambdaFunctionServiceRole965E2A08", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -196,9 +196,6 @@ "testkinesislambdaLambdaFunctionKinesisEventSourceexistingStreamObjtestkinesislambdaKinesisStreamA54D0C79BE6AA8BC": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testkinesislambdaLambdaFunction7F18F840" - }, "BatchSize": 100, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -217,6 +214,9 @@ "Arn" ] }, + "FunctionName": { + "Ref": "testkinesislambdaLambdaFunction7F18F840" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 500, "StartingPosition": "TRIM_HORIZON" @@ -304,9 +304,9 @@ "testkinesislambdaKinesisStreamGetRecordsIteratorAgeAlarm99DB34B3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -317,9 +317,9 @@ "testkinesislambdaKinesisStreamReadProvisionedThroughputExceededAlarmAE98686F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.expected.json index cc69403ef..97ed031e5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.expected.json @@ -422,9 +422,9 @@ "teststreamfirehoses3KinesisStreamGetRecordsIteratorAgeAlarm8C693DF4": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -435,9 +435,9 @@ "teststreamfirehoses3KinesisStreamReadProvisionedThroughputExceededAlarm7C631AC0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.expected.json index a3f9dfb48..674cf8651 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.expected.json @@ -124,13 +124,13 @@ }, "S3Key": "26cf7db64552331215006953bf73e5adfb49b5bf0eb2298bfe04547b76c08b88.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "testroleB50A37BE", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs16.x" }, "DependsOn": [ @@ -155,9 +155,6 @@ "testfnKinesisEventSourceexistingteststream96164F11F0EBC1A4": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testfn76BCC25C" - }, "BatchSize": 1, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -176,6 +173,9 @@ "Arn" ] }, + "FunctionName": { + "Ref": "testfn76BCC25C" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 500, "StartingPosition": "LATEST" @@ -274,9 +274,9 @@ "testkslambdaKinesisStreamGetRecordsIteratorAgeAlarmD5DC1A73": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -287,9 +287,9 @@ "testkslambdaKinesisStreamReadProvisionedThroughputExceededAlarmFAEF1236": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.expected.json index cf6bffe41..3988a597e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.expected.json @@ -153,18 +153,18 @@ }, "S3Key": "26cf7db64552331215006953bf73e5adfb49b5bf0eb2298bfe04547b76c08b88.zip" }, - "Role": { - "Fn::GetAtt": [ - "testkinesisstreamslambdaLambdaFunctionServiceRoleAD98836E", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testkinesisstreamslambdaLambdaFunctionServiceRoleAD98836E", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -196,9 +196,6 @@ "testkinesisstreamslambdaLambdaFunctionKinesisEventSourcenoargumentstestkinesisstreamslambdaKinesisStream697B4A2015E59078": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testkinesisstreamslambdaLambdaFunctionB9A91CA7" - }, "BatchSize": 100, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -217,6 +214,9 @@ "Arn" ] }, + "FunctionName": { + "Ref": "testkinesisstreamslambdaLambdaFunctionB9A91CA7" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 5, "StartingPosition": "TRIM_HORIZON" @@ -304,9 +304,9 @@ "testkinesisstreamslambdaKinesisStreamGetRecordsIteratorAgeAlarmFB74C363": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -317,9 +317,9 @@ "testkinesisstreamslambdaKinesisStreamReadProvisionedThroughputExceededAlarm5ABF4346": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.expected.json index 7c73a959d..314be3205 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.expected.json @@ -137,12 +137,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -152,6 +146,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -183,12 +183,6 @@ "testlambdadynamodbstackDynamoTable8138E93B": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ - { - "AttributeName": "id", - "KeyType": "HASH" - } - ], "AttributeDefinitions": [ { "AttributeName": "id", @@ -214,6 +208,12 @@ } } ], + "KeySchema": [ + { + "AttributeName": "id", + "KeyType": "HASH" + } + ], "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.expected.json index 53d92cbb8..f0a2aa527 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,32 +657,22 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcDDB49FBEC5F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { - "ServiceName": { - "Fn::Join": [ - "", - [ - "com.amazonaws.", - { - "Ref": "AWS::Region" - }, - ".dynamodb" - ] - ] - }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, "RouteTableIds": [ { "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" @@ -708,7 +693,22 @@ "Ref": "VpcPublicSubnet3RouteTable93458DBB" } ], - "VpcEndpointType": "Gateway" + "ServiceName": { + "Fn::Join": [ + "", + [ + "com.amazonaws.", + { + "Ref": "AWS::Region" + }, + ".dynamodb" + ] + ] + }, + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testlambdadynamodbstackLambdaFunctionServiceRole758347A1": { @@ -878,12 +878,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -893,6 +887,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -951,19 +951,19 @@ "testlambdadynamodbstackDynamoTable8138E93B": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.expected.json index 05c3865e6..17fcd590c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.expected.json @@ -168,12 +168,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -183,6 +177,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -238,19 +238,19 @@ "testlambdadynamodbstackDynamoTable8138E93B": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, @@ -279,9 +279,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -298,21 +295,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -329,9 +329,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -348,21 +345,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -379,9 +379,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -398,21 +395,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -444,7 +444,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -496,7 +496,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -516,11 +516,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -531,17 +526,33 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcDDB49FBEC5F": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "RouteTableIds": [ + { + "Ref": "VpcisolatedSubnet1RouteTableE442650B" + }, + { + "Ref": "VpcisolatedSubnet2RouteTable334F9764" + }, + { + "Ref": "VpcisolatedSubnet3RouteTableA2F6BBC0" + } + ], "ServiceName": { "Fn::Join": [ "", @@ -554,21 +565,10 @@ ] ] }, + "VpcEndpointType": "Gateway", "VpcId": { "Ref": "Vpc8378EB38" - }, - "RouteTableIds": [ - { - "Ref": "VpcisolatedSubnet1RouteTableE442650B" - }, - { - "Ref": "VpcisolatedSubnet2RouteTable334F9764" - }, - { - "Ref": "VpcisolatedSubnet3RouteTableA2F6BBC0" - } - ], - "VpcEndpointType": "Gateway" + } } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.expected.json index c65bb799c..0ca01d4fe 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.expected.json @@ -126,12 +126,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -141,6 +135,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -172,19 +172,19 @@ "testlambdadynamodbstackDynamoTable8138E93B": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.expected.json index a6ec259c1..62f5de7c5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.expected.json @@ -126,12 +126,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -141,6 +135,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdadynamodbstackLambdaFunctionServiceRole758347A1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -172,16 +172,16 @@ "testlambdadynamodbstackDynamoTable8138E93B": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], "PointInTimeRecoverySpecification": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.expected.json index fb888101b..4cfeed2f1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.expected.json @@ -126,12 +126,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -141,6 +135,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -172,19 +172,19 @@ "testlambdadynamodbstackDynamoTable8138E93B": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "id", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "id", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json index 27ca0eb36..4d18bbc39 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json @@ -19,9 +19,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/18", "MapPublicIpOnLaunch": false, @@ -38,21 +35,24 @@ "Key": "Name", "Value": "existingResources/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingResources/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -69,9 +69,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.64.0/18", "MapPublicIpOnLaunch": false, @@ -88,21 +85,24 @@ "Key": "Name", "Value": "existingResources/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingResources/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -119,9 +119,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.128.0/18", "MapPublicIpOnLaunch": false, @@ -138,21 +135,24 @@ "Key": "Name", "Value": "existingResources/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingResources/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -184,7 +184,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc" + "Value": "existingResources/Vpc/FlowLog" } ] } @@ -236,7 +236,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc" + "Value": "existingResources/Vpc/FlowLog" } ] }, @@ -256,11 +256,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -271,12 +266,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc" + "Value": "existingResources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "testsgsecuritygroup89DCF621": { @@ -366,12 +366,6 @@ }, "S3Key": "c1b23d6af38c04acb744bda25a3dc7f4394daea942c67eaff40911a707a3c37a.zip" }, - "Role": { - "Fn::GetAtt": [ - "testfunctionServiceRoleFB85AD63", - "Arn" - ] - }, "Environment": { "Variables": { "CACHE_ENDPOINT": { @@ -397,6 +391,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testfunctionServiceRoleFB85AD63", + "Arn" + ] + }, "Runtime": "nodejs16.x", "VpcConfig": { "SecurityGroupIds": [ @@ -450,6 +450,7 @@ "ecsubnetgrouptestcache": { "Type": "AWS::ElastiCache::SubnetGroup", "Properties": { + "CacheSubnetGroupName": "test-cache-subnet-group", "Description": "Solutions Constructs generated Cache Subnet Group", "SubnetIds": [ { @@ -461,8 +462,7 @@ { "Ref": "VpcisolatedSubnet3Subnet44F2537D" } - ], - "CacheSubnetGroupName": "test-cache-subnet-group" + ] } }, "testcachecachesg7265880E": { @@ -502,12 +502,12 @@ "testcachecluster": { "Type": "AWS::ElastiCache::CacheCluster", "Properties": { - "CacheNodeType": "cache.t3.medium", - "Engine": "memcached", - "NumCacheNodes": 2, "AZMode": "cross-az", + "CacheNodeType": "cache.t3.medium", "CacheSubnetGroupName": "test-cache-subnet-group", "ClusterName": "test-cache-cdk-cluster", + "Engine": "memcached", + "NumCacheNodes": 2, "Port": 11222, "VpcSecurityGroupIds": [ { @@ -561,7 +561,6 @@ "testtestingress291C0179": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "TCP", "Description": "Self referencing rule to control access to Elasticache memcached cluster", "FromPort": { "Fn::GetAtt": [ @@ -575,6 +574,7 @@ "GroupId" ] }, + "IpProtocol": "TCP", "SourceSecurityGroupId": { "Fn::GetAtt": [ "testtestcachesg9F6CF9E2", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.expected.json index d7efaa91f..6c53c8f4c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.expected.json @@ -34,7 +34,6 @@ "testtestingress291C0179": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "TCP", "Description": "Self referencing rule to control access to Elasticache memcached cluster", "FromPort": 11222, "GroupId": { @@ -43,6 +42,7 @@ "GroupId" ] }, + "IpProtocol": "TCP", "SourceSecurityGroupId": { "Fn::GetAtt": [ "testtestcachesg9F6CF9E2", @@ -58,6 +58,7 @@ "testecsubnetgrouptest868C53AE": { "Type": "AWS::ElastiCache::SubnetGroup", "Properties": { + "CacheSubnetGroupName": "test-subnet-group", "Description": "Solutions Constructs generated Cache Subnet Group", "SubnetIds": [ { @@ -69,19 +70,18 @@ { "Ref": "VpcisolatedSubnet3Subnet44F2537D" } - ], - "CacheSubnetGroupName": "test-subnet-group" + ] } }, "testtestcluster57FB8D14": { "Type": "AWS::ElastiCache::CacheCluster", "Properties": { - "CacheNodeType": "cache.t3.medium", - "Engine": "memcached", - "NumCacheNodes": 2, "AZMode": "cross-az", + "CacheNodeType": "cache.t3.medium", "CacheSubnetGroupName": "test-subnet-group", "ClusterName": "test-cdk-cluster", + "Engine": "memcached", + "NumCacheNodes": 2, "Port": 11222, "VpcSecurityGroupIds": [ { @@ -235,12 +235,6 @@ }, "S3Key": "c1b23d6af38c04acb744bda25a3dc7f4394daea942c67eaff40911a707a3c37a.zip" }, - "Role": { - "Fn::GetAtt": [ - "testLambdaFunctionServiceRoleA03EDA2B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -267,6 +261,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testLambdaFunctionServiceRoleA03EDA2B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -343,9 +343,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -362,21 +359,24 @@ "Key": "Name", "Value": "newResources/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newResources/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -393,9 +393,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -412,21 +409,24 @@ "Key": "Name", "Value": "newResources/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newResources/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -443,9 +443,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -462,21 +459,24 @@ "Key": "Name", "Value": "newResources/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newResources/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -508,7 +508,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc" + "Value": "newResources/Vpc/FlowLog" } ] } @@ -560,7 +560,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc" + "Value": "newResources/Vpc/FlowLog" } ] }, @@ -580,11 +580,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -595,12 +590,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc" + "Value": "newResources/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.expected.json index c0664ed15..cc0020c2e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.expected.json @@ -34,7 +34,6 @@ "testtestingress291C0179": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { - "IpProtocol": "TCP", "Description": "Self referencing rule to control access to Elasticache memcached cluster", "FromPort": 11222, "GroupId": { @@ -43,6 +42,7 @@ "GroupId" ] }, + "IpProtocol": "TCP", "SourceSecurityGroupId": { "Fn::GetAtt": [ "testtestcachesg9F6CF9E2", @@ -58,6 +58,7 @@ "testecsubnetgrouptest868C53AE": { "Type": "AWS::ElastiCache::SubnetGroup", "Properties": { + "CacheSubnetGroupName": "test-subnet-group", "Description": "Solutions Constructs generated Cache Subnet Group", "SubnetIds": [ { @@ -69,19 +70,18 @@ { "Ref": "VpcisolatedSubnet3Subnet44F2537D" } - ], - "CacheSubnetGroupName": "test-subnet-group" + ] } }, "testtestcluster57FB8D14": { "Type": "AWS::ElastiCache::CacheCluster", "Properties": { - "CacheNodeType": "cache.t3.medium", - "Engine": "memcached", - "NumCacheNodes": 2, "AZMode": "single-az", + "CacheNodeType": "cache.t3.medium", "CacheSubnetGroupName": "test-subnet-group", "ClusterName": "test-cdk-cluster", + "Engine": "memcached", + "NumCacheNodes": 2, "Port": 11222, "VpcSecurityGroupIds": [ { @@ -235,12 +235,6 @@ }, "S3Key": "c1b23d6af38c04acb744bda25a3dc7f4394daea942c67eaff40911a707a3c37a.zip" }, - "Role": { - "Fn::GetAtt": [ - "testLambdaFunctionServiceRoleA03EDA2B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -267,6 +261,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testLambdaFunctionServiceRoleA03EDA2B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -343,9 +343,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "192.68.0.0/18", "MapPublicIpOnLaunch": false, @@ -362,21 +359,24 @@ "Key": "Name", "Value": "withClientProps/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "withClientProps/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -393,9 +393,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "192.68.64.0/18", "MapPublicIpOnLaunch": false, @@ -412,21 +409,24 @@ "Key": "Name", "Value": "withClientProps/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "withClientProps/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -443,9 +443,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "192.68.128.0/18", "MapPublicIpOnLaunch": false, @@ -462,21 +459,24 @@ "Key": "Name", "Value": "withClientProps/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "withClientProps/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -508,7 +508,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc" + "Value": "withClientProps/Vpc/FlowLog" } ] } @@ -560,7 +560,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc" + "Value": "withClientProps/Vpc/FlowLog" } ] }, @@ -580,11 +580,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -595,12 +590,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc" + "Value": "withClientProps/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.expected.json index f2268c180..ea01e758f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.expected.json @@ -139,12 +139,6 @@ }, "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibana5LambdaFunctionServiceRole26E43B12", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -157,6 +151,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibana5LambdaFunctionServiceRole26E43B12", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -242,9 +242,6 @@ "testlambdaelasticsearchkibana5CognitoUserPoolClientB41FB91B": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibana5CognitoUserPool4E321CD0" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -262,7 +259,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibana5CognitoUserPool4E321CD0" + } } }, "testlambdaelasticsearchkibana5CognitoIdentityPool1B0A6046": { @@ -618,9 +618,9 @@ "testlambdaelasticsearchkibana5StatusRedAlarm916EC672": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -631,9 +631,9 @@ "testlambdaelasticsearchkibana5StatusYellowAlarm7DCAF60A": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -644,9 +644,9 @@ "testlambdaelasticsearchkibana5FreeStorageSpaceTooLowAlarmEC2C0D7B": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -657,9 +657,9 @@ "testlambdaelasticsearchkibana5IndexWritesBlockedTooHighAlarmD496CE3E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -670,9 +670,9 @@ "testlambdaelasticsearchkibana5AutomatedSnapshotFailureTooHighAlarm97129BC4": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -683,9 +683,9 @@ "testlambdaelasticsearchkibana5CPUUtilizationTooHighAlarm3BAAA397": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -696,9 +696,9 @@ "testlambdaelasticsearchkibana5JVMMemoryPressureTooHighAlarm251AD583": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -709,9 +709,9 @@ "testlambdaelasticsearchkibana5MasterCPUUtilizationTooHighAlarm97A330CC": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -722,9 +722,9 @@ "testlambdaelasticsearchkibana5MasterJVMMemoryPressureTooHighAlarm7DABB351": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -750,9 +750,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -769,21 +766,24 @@ "Key": "Name", "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -800,9 +800,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -819,21 +816,24 @@ "Key": "Name", "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -865,7 +865,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc" + "Value": "deployFunctionWithClusterConfig/Vpc/FlowLog" } ] } @@ -917,7 +917,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc" + "Value": "deployFunctionWithClusterConfig/Vpc/FlowLog" } ] }, @@ -937,10 +937,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -951,10 +947,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc" + "Value": "deployFunctionWithClusterConfig/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.expected.json index 419ab19d7..0e5f2100c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -806,12 +806,6 @@ "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibana4LambdaFunctionServiceRoleA52BB7F9", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -824,6 +818,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibana4LambdaFunctionServiceRoleA52BB7F9", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -916,9 +916,6 @@ "testlambdaelasticsearchkibana4CognitoUserPoolClientABBF34C4": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibana4CognitoUserPool37A5CDE1" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -936,7 +933,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibana4CognitoUserPool37A5CDE1" + } } }, "testlambdaelasticsearchkibana4CognitoIdentityPool76EE9793": { @@ -1295,9 +1295,9 @@ "testlambdaelasticsearchkibana4StatusRedAlarm56DEE5C7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -1308,9 +1308,9 @@ "testlambdaelasticsearchkibana4StatusYellowAlarm810B4F9E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -1321,9 +1321,9 @@ "testlambdaelasticsearchkibana4FreeStorageSpaceTooLowAlarmF3FB31EA": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -1334,9 +1334,9 @@ "testlambdaelasticsearchkibana4IndexWritesBlockedTooHighAlarmF2968C92": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -1347,9 +1347,9 @@ "testlambdaelasticsearchkibana4AutomatedSnapshotFailureTooHighAlarm53EB1ABB": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -1360,9 +1360,9 @@ "testlambdaelasticsearchkibana4CPUUtilizationTooHighAlarm29B67D10": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -1373,9 +1373,9 @@ "testlambdaelasticsearchkibana4JVMMemoryPressureTooHighAlarm9DDED711": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -1386,9 +1386,9 @@ "testlambdaelasticsearchkibana4MasterCPUUtilizationTooHighAlarmE66867F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -1399,9 +1399,9 @@ "testlambdaelasticsearchkibana4MasterJVMMemoryPressureTooHighAlarm83E1822E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.expected.json index de038946d..ca661cffd 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.expected.json @@ -137,12 +137,6 @@ "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibana3LambdaFunctionServiceRoleA3C1E07E", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -155,6 +149,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibana3LambdaFunctionServiceRoleA3C1E07E", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -244,9 +244,6 @@ "testlambdaelasticsearchkibana3CognitoUserPoolClient89D3C6A0": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibana3CognitoUserPoolEF0D5793" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -264,7 +261,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibana3CognitoUserPoolEF0D5793" + } } }, "testlambdaelasticsearchkibana3CognitoIdentityPool48956B3D": { @@ -623,9 +623,9 @@ "testlambdaelasticsearchkibana3StatusRedAlarmFECC950E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -636,9 +636,9 @@ "testlambdaelasticsearchkibana3StatusYellowAlarmC7FC4662": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -649,9 +649,9 @@ "testlambdaelasticsearchkibana3FreeStorageSpaceTooLowAlarmB9AD5427": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -662,9 +662,9 @@ "testlambdaelasticsearchkibana3IndexWritesBlockedTooHighAlarm36E1D418": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -675,9 +675,9 @@ "testlambdaelasticsearchkibana3AutomatedSnapshotFailureTooHighAlarmA83D4971": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -688,9 +688,9 @@ "testlambdaelasticsearchkibana3CPUUtilizationTooHighAlarmE77470C0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -701,9 +701,9 @@ "testlambdaelasticsearchkibana3JVMMemoryPressureTooHighAlarm084D2991": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -714,9 +714,9 @@ "testlambdaelasticsearchkibana3MasterCPUUtilizationTooHighAlarm3331F781": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -727,9 +727,9 @@ "testlambdaelasticsearchkibana3MasterJVMMemoryPressureTooHighAlarm149E8D14": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -755,9 +755,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/18", "MapPublicIpOnLaunch": false, @@ -774,21 +771,24 @@ "Key": "Name", "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -805,9 +805,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.64.0/18", "MapPublicIpOnLaunch": false, @@ -824,21 +821,24 @@ "Key": "Name", "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -855,9 +855,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.128.0/18", "MapPublicIpOnLaunch": false, @@ -874,21 +871,24 @@ "Key": "Name", "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -920,7 +920,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc" + "Value": "deployFunctionWithVpcProps/Vpc/FlowLog" } ] } @@ -972,7 +972,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc" + "Value": "deployFunctionWithVpcProps/Vpc/FlowLog" } ] }, @@ -992,10 +992,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1006,10 +1002,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc" + "Value": "deployFunctionWithVpcProps/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.expected.json index 87be3185f..17ec407e2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.expected.json @@ -139,12 +139,6 @@ }, "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibanaLambdaFunctionServiceRole3AFFEAA2", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -157,6 +151,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibanaLambdaFunctionServiceRole3AFFEAA2", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -246,9 +246,6 @@ "testlambdaelasticsearchkibanaCognitoUserPoolClient8F70A2AA": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -266,7 +263,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" + } } }, "testlambdaelasticsearchkibanaCognitoIdentityPoolC48068F0": { @@ -625,9 +625,9 @@ "testlambdaelasticsearchkibanaStatusRedAlarmCFCDB629": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -638,9 +638,9 @@ "testlambdaelasticsearchkibanaStatusYellowAlarm24B9D1CB": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -651,9 +651,9 @@ "testlambdaelasticsearchkibanaFreeStorageSpaceTooLowAlarm0B4D4E35": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -664,9 +664,9 @@ "testlambdaelasticsearchkibanaIndexWritesBlockedTooHighAlarmB8C0E99C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -677,9 +677,9 @@ "testlambdaelasticsearchkibanaAutomatedSnapshotFailureTooHighAlarm75F2676B": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -690,9 +690,9 @@ "testlambdaelasticsearchkibanaCPUUtilizationTooHighAlarmF16BA5D9": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -703,9 +703,9 @@ "testlambdaelasticsearchkibanaJVMMemoryPressureTooHighAlarm18224533": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -716,9 +716,9 @@ "testlambdaelasticsearchkibanaMasterCPUUtilizationTooHighAlarmE5E5999F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -729,9 +729,9 @@ "testlambdaelasticsearchkibanaMasterJVMMemoryPressureTooHighAlarm297FF1BE": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -757,9 +757,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -776,21 +773,24 @@ "Key": "Name", "Value": "deployToFiveZones/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployToFiveZones/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -807,9 +807,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -826,21 +823,24 @@ "Key": "Name", "Value": "deployToFiveZones/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployToFiveZones/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -857,9 +857,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -876,21 +873,24 @@ "Key": "Name", "Value": "deployToFiveZones/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployToFiveZones/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -922,7 +922,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc" + "Value": "deployToFiveZones/Vpc/FlowLog" } ] } @@ -974,7 +974,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc" + "Value": "deployToFiveZones/Vpc/FlowLog" } ] }, @@ -994,10 +994,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1008,10 +1004,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc" + "Value": "deployToFiveZones/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.expected.json index 9adfc0a56..cff23b60c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.expected.json @@ -139,12 +139,6 @@ }, "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibanaLambdaFunctionServiceRole3AFFEAA2", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -157,6 +151,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibanaLambdaFunctionServiceRole3AFFEAA2", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -238,9 +238,6 @@ "testlambdaelasticsearchkibanaCognitoUserPoolClient8F70A2AA": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -258,7 +255,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" + } } }, "testlambdaelasticsearchkibanaCognitoIdentityPoolC48068F0": { @@ -608,9 +608,9 @@ "testlambdaelasticsearchkibanaStatusRedAlarmCFCDB629": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -621,9 +621,9 @@ "testlambdaelasticsearchkibanaStatusYellowAlarm24B9D1CB": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -634,9 +634,9 @@ "testlambdaelasticsearchkibanaFreeStorageSpaceTooLowAlarm0B4D4E35": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -647,9 +647,9 @@ "testlambdaelasticsearchkibanaIndexWritesBlockedTooHighAlarmB8C0E99C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -660,9 +660,9 @@ "testlambdaelasticsearchkibanaAutomatedSnapshotFailureTooHighAlarm75F2676B": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -673,9 +673,9 @@ "testlambdaelasticsearchkibanaCPUUtilizationTooHighAlarmF16BA5D9": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -686,9 +686,9 @@ "testlambdaelasticsearchkibanaJVMMemoryPressureTooHighAlarm18224533": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -699,9 +699,9 @@ "testlambdaelasticsearchkibanaMasterCPUUtilizationTooHighAlarmE5E5999F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -712,9 +712,9 @@ "testlambdaelasticsearchkibanaMasterJVMMemoryPressureTooHighAlarm297FF1BE": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -740,9 +740,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -759,21 +756,24 @@ "Key": "Name", "Value": "disabledZoneAwareness/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "disabledZoneAwareness/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -805,7 +805,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc" + "Value": "disabledZoneAwareness/Vpc/FlowLog" } ] } @@ -857,7 +857,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc" + "Value": "disabledZoneAwareness/Vpc/FlowLog" } ] }, @@ -877,10 +877,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -891,10 +887,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc" + "Value": "disabledZoneAwareness/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.expected.json index a797b241a..f76540ca7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.expected.json @@ -98,12 +98,6 @@ }, "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibana2LambdaFunctionServiceRoleA59E9EBF", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -116,6 +110,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibana2LambdaFunctionServiceRoleA59E9EBF", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -181,9 +181,6 @@ "testlambdaelasticsearchkibana2CognitoUserPoolClientB0F3872A": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibana2CognitoUserPool9D73D9DA" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -201,7 +198,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibana2CognitoUserPool9D73D9DA" + } } }, "testlambdaelasticsearchkibana2CognitoIdentityPool0681F400": { @@ -539,9 +539,9 @@ "testlambdaelasticsearchkibana2StatusRedAlarm508A4D17": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -552,9 +552,9 @@ "testlambdaelasticsearchkibana2StatusYellowAlarmEF13F129": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -565,9 +565,9 @@ "testlambdaelasticsearchkibana2FreeStorageSpaceTooLowAlarm1ED7AA90": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -578,9 +578,9 @@ "testlambdaelasticsearchkibana2IndexWritesBlockedTooHighAlarmCE02A217": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -591,9 +591,9 @@ "testlambdaelasticsearchkibana2AutomatedSnapshotFailureTooHighAlarm75E8F988": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -604,9 +604,9 @@ "testlambdaelasticsearchkibana2CPUUtilizationTooHighAlarm7E4A7ADE": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -617,9 +617,9 @@ "testlambdaelasticsearchkibana2JVMMemoryPressureTooHighAlarm7CB5E1C7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -630,9 +630,9 @@ "testlambdaelasticsearchkibana2MasterCPUUtilizationTooHighAlarmE22B714C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -643,9 +643,9 @@ "testlambdaelasticsearchkibana2MasterJVMMemoryPressureTooHighAlarm37A392A6": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.expected.json index 5ab39a3c3..8489843f4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.expected.json @@ -123,12 +123,6 @@ }, "S3Key": "b5faf4ff1ebde477120133d1e645d20d7c3d4952b76c3b586100069b94b2f146.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaeventbridgeLambdaFunctionServiceRole0FD85077", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -136,6 +130,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaeventbridgeLambdaFunctionServiceRole0FD85077", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.expected.json index ce8b67b82..e44ac5c83 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.expected.json @@ -150,12 +150,6 @@ }, "S3Key": "b5faf4ff1ebde477120133d1e645d20d7c3d4952b76c3b586100069b94b2f146.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaeventbridgeLambdaFunctionServiceRole0FD85077", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -165,6 +159,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaeventbridgeLambdaFunctionServiceRole0FD85077", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -241,9 +241,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -260,21 +257,24 @@ "Key": "Name", "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -291,9 +291,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -310,21 +307,24 @@ "Key": "Name", "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -341,9 +341,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -360,21 +357,24 @@ "Key": "Name", "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -406,7 +406,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc" + "Value": "deployFunctionWithNewEventBus/Vpc/FlowLog" } ] } @@ -458,7 +458,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc" + "Value": "deployFunctionWithNewEventBus/Vpc/FlowLog" } ] }, @@ -478,11 +478,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -493,17 +488,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc" + "Value": "deployFunctionWithNewEventBus/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcCLOUDWATCHEVENTS1A0DAFBF": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroupD8A263BF", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -516,18 +525,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroupD8A263BF", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -539,7 +536,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroupD8A263BF": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.expected.json index 039171e95..916504c1e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.expected.json @@ -164,12 +164,6 @@ }, "S3Key": "b5faf4ff1ebde477120133d1e645d20d7c3d4952b76c3b586100069b94b2f146.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaeventbridgeLambdaFunctionServiceRole0FD85077", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -177,6 +171,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaeventbridgeLambdaFunctionServiceRole0FD85077", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -247,9 +247,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -266,21 +263,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -297,9 +297,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -316,21 +313,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -347,9 +347,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -366,21 +363,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -412,7 +412,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -464,7 +464,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -484,11 +484,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -499,17 +494,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcCLOUDWATCHEVENTS1A0DAFBF": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupB8797C76", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -522,18 +531,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupB8797C76", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -545,7 +542,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupB8797C76": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json index bf5172fd4..5f3d822d0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json @@ -109,12 +109,6 @@ }, "S3Key": "b5faf4ff1ebde477120133d1e645d20d7c3d4952b76c3b586100069b94b2f146.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -124,6 +118,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json index 39b2e657e..6756239b0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json @@ -123,12 +123,6 @@ }, "S3Key": "b5faf4ff1ebde477120133d1e645d20d7c3d4952b76c3b586100069b94b2f146.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -136,6 +130,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/package.json index a5d16ad28..6e8505403 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@types/jest": "^27.4.0", "@types/node": "^10.3.0", - "aws-cdk-lib": "2.82.0", + "aws-cdk-lib": "0.0.0", "@aws-solutions-constructs/core": "0.0.0", "constructs": "^10.0.0" }, @@ -74,7 +74,7 @@ }, "peerDependencies": { "@aws-solutions-constructs/core": "0.0.0", - "aws-cdk-lib": "^2.82.0", + "aws-cdk-lib": "^0.0.0", "constructs": "^10.0.0" }, "keywords": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.expected.json index d423282c9..95121ec2e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -315,12 +315,6 @@ }, "S3Key": "e0128dd6e376c58a74b37bd6178ded8a5909d414a6891c26547b9778ac25679b.zip" }, - "Role": { - "Fn::GetAtt": [ - "minimalargumentsLambdaFunctionServiceRole73B77FF7", - "Arn" - ] - }, "Environment": { "Variables": { "KENDRA_INDEX_ID": { @@ -332,6 +326,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "minimalargumentsLambdaFunctionServiceRole73B77FF7", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -598,6 +598,13 @@ "minimalargumentsdatasourceminimalarguments05A02FF3B": { "Type": "AWS::Kendra::DataSource", "Properties": { + "DataSourceConfiguration": { + "S3Configuration": { + "BucketName": { + "Ref": "scrapBucketB11863B7" + } + } + }, "IndexId": { "Ref": "minimalargumentskendraindexminimalarguments5CBDD236" }, @@ -622,123 +629,13 @@ ] ] }, - "Type": "S3", - "DataSourceConfiguration": { - "S3Configuration": { - "BucketName": { - "Ref": "scrapBucketB11863B7" - } - } - }, "RoleArn": { "Fn::GetAtt": [ "minimalargumentsdatasourceroleminimalarguments00EAC5006", "Arn" ] - } - } - } - }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" + }, + "Type": "S3" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.expected.json index 9e715550e..3850d7547 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -332,12 +332,6 @@ }, "S3Key": "e0128dd6e376c58a74b37bd6178ded8a5909d414a6891c26547b9778ac25679b.zip" }, - "Role": { - "Fn::GetAtt": [ - "minimalargumentsLambdaFunctionServiceRole73B77FF7", - "Arn" - ] - }, "Environment": { "Variables": { "KENDRA_INDEX_ID": { @@ -349,6 +343,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "minimalargumentsLambdaFunctionServiceRole73B77FF7", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -615,6 +615,13 @@ "minimalargumentsdatasourceminimalarguments05A02FF3B": { "Type": "AWS::Kendra::DataSource", "Properties": { + "DataSourceConfiguration": { + "S3Configuration": { + "BucketName": { + "Ref": "scrapBucketB11863B7" + } + } + }, "IndexId": { "Ref": "minimalargumentskendraindexminimalarguments5CBDD236" }, @@ -639,33 +646,18 @@ ] ] }, - "Type": "S3", - "DataSourceConfiguration": { - "S3Configuration": { - "BucketName": { - "Ref": "scrapBucketB11863B7" - } - } - }, "RoleArn": { "Fn::GetAtt": [ "minimalargumentsdatasourceroleminimalarguments00EAC5006", "Arn" ] - } + }, + "Type": "S3" } }, "minimalargumentskendradatasourceminimalarguments1DA6FACEE": { "Type": "AWS::Kendra::DataSource", "Properties": { - "IndexId": { - "Fn::GetAtt": [ - "minimalargumentskendraindexminimalarguments5CBDD236", - "Id" - ] - }, - "Name": "web-source", - "Type": "WEBCRAWLER", "DataSourceConfiguration": { "WebCrawlerConfiguration": { "CrawlDepth": 1, @@ -678,115 +670,20 @@ } } }, + "IndexId": { + "Fn::GetAtt": [ + "minimalargumentskendraindexminimalarguments5CBDD236", + "Id" + ] + }, + "Name": "web-source", "RoleArn": { "Fn::GetAtt": [ "existingRole3E995BBA", "Arn" ] - } - } - } - }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" + }, + "Type": "WEBCRAWLER" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.expected.json index 394098d54..0bc0c7c64 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -356,12 +356,6 @@ }, "S3Key": "e0128dd6e376c58a74b37bd6178ded8a5909d414a6891c26547b9778ac25679b.zip" }, - "Role": { - "Fn::GetAtt": [ - "minimalargumentsLambdaFunctionServiceRole73B77FF7", - "Arn" - ] - }, "Environment": { "Variables": { "KENDRA_INDEX_ID": { @@ -373,6 +367,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "minimalargumentsLambdaFunctionServiceRole73B77FF7", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -663,6 +663,13 @@ "minimalargumentsdatasourceminimalarguments05A02FF3B": { "Type": "AWS::Kendra::DataSource", "Properties": { + "DataSourceConfiguration": { + "S3Configuration": { + "BucketName": { + "Ref": "scrapBucketB11863B7" + } + } + }, "IndexId": { "Ref": "minimalargumentskendraindexminimalarguments5CBDD236" }, @@ -687,20 +694,13 @@ ] ] }, - "Type": "S3", - "DataSourceConfiguration": { - "S3Configuration": { - "BucketName": { - "Ref": "scrapBucketB11863B7" - } - } - }, "RoleArn": { "Fn::GetAtt": [ "minimalargumentsdatasourceroleminimalarguments00EAC5006", "Arn" ] - } + }, + "Type": "S3" } }, "Vpc8378EB38": { @@ -721,9 +721,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -740,21 +737,24 @@ "Key": "Name", "Value": "with-vpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "with-vpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -771,9 +771,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -790,21 +787,24 @@ "Key": "Name", "Value": "with-vpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "with-vpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -821,9 +821,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -840,21 +837,24 @@ "Key": "Name", "Value": "with-vpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "with-vpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -886,7 +886,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc" + "Value": "with-vpc/Vpc/FlowLog" } ] } @@ -938,7 +938,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc" + "Value": "with-vpc/Vpc/FlowLog" } ] }, @@ -958,10 +958,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -972,10 +968,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc" + "Value": "with-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -984,6 +984,15 @@ "VpcKENDRAD98378E1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "withvpcKENDRAsecuritygroup6E04E691", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -996,18 +1005,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "withvpcKENDRAsecuritygroup6E04E691", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -1019,7 +1016,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "withvpcKENDRAsecuritygroup6E04E691": { @@ -1081,109 +1081,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.expected.json index b2ff686f1..00be5feb3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.expected.json @@ -550,18 +550,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -668,18 +668,18 @@ }, "S3Key": "e223396f670e1c26b56c83fd2179ab8672928b9795821c6a437874a06625eb53.zip" }, - "Role": { - "Fn::GetAtt": [ - "existingfunctionServiceRole90E818C0", - "Arn" - ] - }, "Environment": { "Variables": { "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoseexistingfunctiondestinationfirehoseE53928C2" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "existingfunctionServiceRole90E818C0", + "Arn" + ] + }, "Runtime": "nodejs18.x" }, "DependsOn": [ @@ -706,109 +706,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.expected.json index 0c3273c35..624ba79bd 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.expected.json @@ -550,18 +550,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -615,9 +615,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -634,7 +631,10 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -650,15 +650,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -675,12 +675,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -702,15 +702,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -726,9 +726,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -745,7 +742,10 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -761,15 +761,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -786,12 +786,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -813,15 +813,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -837,9 +837,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -856,7 +853,10 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -872,15 +872,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -897,12 +897,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -924,15 +924,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -948,9 +948,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -967,21 +964,24 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -998,21 +998,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -1029,21 +1026,24 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -1060,21 +1060,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -1091,21 +1088,24 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -1122,12 +1122,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -1145,11 +1145,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -1171,7 +1171,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "existing-vpc/Vpc/FlowLog" } ] } @@ -1223,7 +1223,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "existing-vpc/Vpc/FlowLog" } ] }, @@ -1243,10 +1243,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1257,10 +1253,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "existing-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1269,6 +1269,15 @@ "VpcKINESISFIREHOSE4115B5D1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingvpcKINESISFIREHOSEsecuritygroupF123580F", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1281,18 +1290,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingvpcKINESISFIREHOSEsecuritygroupF123580F", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -1304,7 +1301,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testconstructLambdaFunctionServiceRole435FDF6F": { @@ -1461,18 +1461,18 @@ }, "S3Key": "e223396f670e1c26b56c83fd2179ab8672928b9795821c6a437874a06625eb53.zip" }, - "Role": { - "Fn::GetAtt": [ - "testconstructLambdaFunctionServiceRole435FDF6F", - "Arn" - ] - }, "Environment": { "Variables": { "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoseexistingvpcdestinationfirehoseFCC6BBF7" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testconstructLambdaFunctionServiceRole435FDF6F", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -1587,109 +1587,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.expected.json index ceb539324..77af4c7da 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.expected.json @@ -550,18 +550,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -751,18 +751,18 @@ }, "S3Key": "e223396f670e1c26b56c83fd2179ab8672928b9795821c6a437874a06625eb53.zip" }, - "Role": { - "Fn::GetAtt": [ - "testconstructLambdaFunctionServiceRole435FDF6F", - "Arn" - ] - }, "Environment": { "Variables": { "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehosenewvpcdestinationfirehoseEC1F5A2C" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testconstructLambdaFunctionServiceRole435FDF6F", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -833,9 +833,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.100.0.0/18", "MapPublicIpOnLaunch": false, @@ -852,21 +849,24 @@ "Key": "Name", "Value": "new-vpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-vpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -883,9 +883,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.100.64.0/18", "MapPublicIpOnLaunch": false, @@ -902,21 +899,24 @@ "Key": "Name", "Value": "new-vpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-vpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -933,9 +933,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.100.128.0/18", "MapPublicIpOnLaunch": false, @@ -952,21 +949,24 @@ "Key": "Name", "Value": "new-vpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "new-vpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -998,7 +998,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc" + "Value": "new-vpc/Vpc/FlowLog" } ] } @@ -1050,7 +1050,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc" + "Value": "new-vpc/Vpc/FlowLog" } ] }, @@ -1070,10 +1070,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1084,10 +1080,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc" + "Value": "new-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1096,6 +1096,15 @@ "VpcKINESISFIREHOSE4115B5D1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "newvpcKINESISFIREHOSEsecuritygroup3F345517", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -1108,18 +1117,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "newvpcKINESISFIREHOSEsecuritygroup3F345517", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -1131,7 +1128,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newvpcKINESISFIREHOSEsecuritygroup3F345517": { @@ -1193,109 +1193,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.expected.json index 0c347bb90..688ddcad6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.expected.json @@ -550,18 +550,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -710,18 +710,18 @@ }, "S3Key": "e223396f670e1c26b56c83fd2179ab8672928b9795821c6a437874a06625eb53.zip" }, - "Role": { - "Fn::GetAtt": [ - "testconstructLambdaFunctionServiceRole435FDF6F", - "Arn" - ] - }, "Environment": { "Variables": { "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehosenoargumentsdestinationfirehose5454CC08" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testconstructLambdaFunctionServiceRole435FDF6F", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -751,109 +751,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.expected.json index 7ebdbedd1..11993f843 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.expected.json @@ -112,12 +112,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -126,6 +120,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -168,9 +168,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -181,9 +181,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.expected.json index 5b7140b32..aec1e8427 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.expected.json @@ -125,12 +125,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -139,6 +133,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -170,9 +170,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -183,9 +183,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.expected.json index 9bb8057c1..7a8001b89 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.expected.json @@ -3,6 +3,7 @@ "testkey784D0285": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -30,8 +31,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -191,12 +191,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -205,6 +199,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -236,9 +236,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -249,9 +249,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.expected.json index cef2eab71..bba6b14da 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "existingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -672,6 +672,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -684,18 +693,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -707,7 +704,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3": { @@ -863,12 +863,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -877,6 +871,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -946,9 +946,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -959,9 +959,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.expected.json index 8733cc5eb..323c78280 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.expected.json @@ -112,12 +112,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -126,6 +120,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -170,9 +170,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -183,9 +183,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.expected.json index 7f798590d..1eddf3e1e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.expected.json @@ -153,12 +153,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -167,6 +161,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -233,9 +233,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -246,9 +246,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -274,9 +274,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -293,21 +290,24 @@ "Key": "Name", "Value": "newVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -324,9 +324,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -343,21 +340,24 @@ "Key": "Name", "Value": "newVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -374,9 +374,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -393,21 +390,24 @@ "Key": "Name", "Value": "newVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -439,7 +439,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc" + "Value": "newVpc/Vpc/FlowLog" } ] } @@ -491,7 +491,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc" + "Value": "newVpc/Vpc/FlowLog" } ] }, @@ -511,10 +511,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -525,10 +521,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc" + "Value": "newVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -537,6 +537,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "newVpcKINESISSTREAMSsecuritygroup88F75AD5", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -549,18 +558,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "newVpcKINESISSTREAMSsecuritygroup88F75AD5", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -572,7 +569,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newVpcKINESISSTREAMSsecuritygroup88F75AD5": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.expected.json index fd977a1d1..398bfd9be 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.expected.json @@ -153,12 +153,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -167,6 +161,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -225,9 +225,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -238,9 +238,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, @@ -266,9 +266,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -285,21 +282,24 @@ "Key": "Name", "Value": "newVpcFromProps/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "newVpcFromProps/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -331,7 +331,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc" + "Value": "newVpcFromProps/Vpc/FlowLog" } ] } @@ -383,7 +383,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc" + "Value": "newVpcFromProps/Vpc/FlowLog" } ] }, @@ -403,10 +403,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -417,10 +413,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc" + "Value": "newVpcFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -429,6 +429,15 @@ "VpcKINESISSTREAMSC07D91B5": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "newVpcFromPropsKINESISSTREAMSsecuritygroup9B3EE931", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -441,24 +450,15 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "newVpcFromPropsKINESISSTREAMSsecuritygroup9B3EE931", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "newVpcFromPropsKINESISSTREAMSsecuritygroup9B3EE931": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.expected.json index c79909567..8b55b1488 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.expected.json @@ -112,12 +112,6 @@ }, "S3Key": "c7dc0cc1b24bda1d2a5345f61897eee32184906649fdb1de93853c512e129dbf.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", - "Arn" - ] - }, "Environment": { "Variables": { "KINESIS_DATASTREAM_NAME": { @@ -126,6 +120,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdakinesisstreamsLambdaFunctionServiceRole95206CF3", + "Arn" + ] + }, "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -168,9 +168,9 @@ "testlambdakinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmC4A0FF00": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.", "MetricName": "GetRecords.IteratorAgeMilliseconds", "Namespace": "AWS/Kinesis", "Period": 300, @@ -181,9 +181,9 @@ "testlambdakinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm9732E188": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "ComparisonOperator": "GreaterThanThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.", "MetricName": "ReadProvisionedThroughputExceeded", "Namespace": "AWS/Kinesis", "Period": 300, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.expected.json index f301d04d5..451416bce 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.expected.json @@ -139,12 +139,6 @@ }, "S3Key": "abbc4eca9e7ddabc31da3ce83159e6eee8e72e2c358ab8af0711044514c41290.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -157,6 +151,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -242,9 +242,6 @@ "testlambdaopensearchCognitoUserPoolClient39C21D94": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -262,7 +259,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" + } } }, "testlambdaopensearchCognitoIdentityPool0B1FB311": { @@ -618,9 +618,9 @@ "testlambdaopensearchStatusRedAlarm1627144D": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -631,9 +631,9 @@ "testlambdaopensearchStatusYellowAlarm57139CF0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -644,9 +644,9 @@ "testlambdaopensearchFreeStorageSpaceTooLowAlarm6A5E1E96": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -657,9 +657,9 @@ "testlambdaopensearchIndexWritesBlockedTooHighAlarmD2E041A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -670,9 +670,9 @@ "testlambdaopensearchAutomatedSnapshotFailureTooHighAlarm9A4D0B1F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -683,9 +683,9 @@ "testlambdaopensearchCPUUtilizationTooHighAlarmC4850758": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -696,9 +696,9 @@ "testlambdaopensearchJVMMemoryPressureTooHighAlarmEFB09A7C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -709,9 +709,9 @@ "testlambdaopensearchMasterCPUUtilizationTooHighAlarm124D5748": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -722,9 +722,9 @@ "testlambdaopensearchMasterJVMMemoryPressureTooHighAlarmBC9524D3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -750,9 +750,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -769,21 +766,24 @@ "Key": "Name", "Value": "cluster-config/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "cluster-config/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -800,9 +800,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -819,21 +816,24 @@ "Key": "Name", "Value": "cluster-config/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "cluster-config/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -865,7 +865,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc" + "Value": "cluster-config/Vpc/FlowLog" } ] } @@ -917,7 +917,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc" + "Value": "cluster-config/Vpc/FlowLog" } ] }, @@ -937,10 +937,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -951,10 +947,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc" + "Value": "cluster-config/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.expected.json index 6e7f1368a..bacca0a29 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.expected.json @@ -139,12 +139,6 @@ }, "S3Key": "abbc4eca9e7ddabc31da3ce83159e6eee8e72e2c358ab8af0711044514c41290.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -157,6 +151,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -238,9 +238,6 @@ "testlambdaopensearchCognitoUserPoolClient39C21D94": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -258,7 +255,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" + } } }, "testlambdaopensearchCognitoIdentityPool0B1FB311": { @@ -608,9 +608,9 @@ "testlambdaopensearchStatusRedAlarm1627144D": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -621,9 +621,9 @@ "testlambdaopensearchStatusYellowAlarm57139CF0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -634,9 +634,9 @@ "testlambdaopensearchFreeStorageSpaceTooLowAlarm6A5E1E96": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -647,9 +647,9 @@ "testlambdaopensearchIndexWritesBlockedTooHighAlarmD2E041A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -660,9 +660,9 @@ "testlambdaopensearchAutomatedSnapshotFailureTooHighAlarm9A4D0B1F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -673,9 +673,9 @@ "testlambdaopensearchCPUUtilizationTooHighAlarmC4850758": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -686,9 +686,9 @@ "testlambdaopensearchJVMMemoryPressureTooHighAlarmEFB09A7C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -699,9 +699,9 @@ "testlambdaopensearchMasterCPUUtilizationTooHighAlarm124D5748": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -712,9 +712,9 @@ "testlambdaopensearchMasterJVMMemoryPressureTooHighAlarmBC9524D3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -740,9 +740,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -759,21 +756,24 @@ "Key": "Name", "Value": "disabled-zone-awareness/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "disabled-zone-awareness/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -805,7 +805,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc" + "Value": "disabled-zone-awareness/Vpc/FlowLog" } ] } @@ -857,7 +857,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc" + "Value": "disabled-zone-awareness/Vpc/FlowLog" } ] }, @@ -877,10 +877,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -891,10 +887,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc" + "Value": "disabled-zone-awareness/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.expected.json index a62047ffa..997380f00 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.expected.json @@ -98,12 +98,6 @@ }, "S3Key": "abbc4eca9e7ddabc31da3ce83159e6eee8e72e2c358ab8af0711044514c41290.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -116,6 +110,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -181,9 +181,6 @@ "testlambdaopensearchCognitoUserPoolClient39C21D94": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -201,7 +198,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" + } } }, "testlambdaopensearchCognitoIdentityPool0B1FB311": { @@ -539,9 +539,9 @@ "testlambdaopensearchStatusRedAlarm1627144D": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -552,9 +552,9 @@ "testlambdaopensearchStatusYellowAlarm57139CF0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -565,9 +565,9 @@ "testlambdaopensearchFreeStorageSpaceTooLowAlarm6A5E1E96": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -578,9 +578,9 @@ "testlambdaopensearchIndexWritesBlockedTooHighAlarmD2E041A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -591,9 +591,9 @@ "testlambdaopensearchAutomatedSnapshotFailureTooHighAlarm9A4D0B1F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -604,9 +604,9 @@ "testlambdaopensearchCPUUtilizationTooHighAlarmC4850758": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -617,9 +617,9 @@ "testlambdaopensearchJVMMemoryPressureTooHighAlarmEFB09A7C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -630,9 +630,9 @@ "testlambdaopensearchMasterCPUUtilizationTooHighAlarm124D5748": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -643,9 +643,9 @@ "testlambdaopensearchMasterJVMMemoryPressureTooHighAlarmBC9524D3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.expected.json index d15057b56..3115d78a4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "existing-vpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "existing-vpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "existing-vpc/Vpc/FlowLog" } ] }, @@ -646,10 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -660,10 +656,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "existing-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -806,12 +806,6 @@ "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "S3Key": "abbc4eca9e7ddabc31da3ce83159e6eee8e72e2c358ab8af0711044514c41290.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibana4LambdaFunctionServiceRoleA52BB7F9", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -824,6 +818,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibana4LambdaFunctionServiceRoleA52BB7F9", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -916,9 +916,6 @@ "testlambdaelasticsearchkibana4CognitoUserPoolClientABBF34C4": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibana4CognitoUserPool37A5CDE1" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -936,7 +933,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibana4CognitoUserPool37A5CDE1" + } } }, "testlambdaelasticsearchkibana4CognitoIdentityPool76EE9793": { @@ -1295,9 +1295,9 @@ "testlambdaelasticsearchkibana4StatusRedAlarm56DEE5C7": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -1308,9 +1308,9 @@ "testlambdaelasticsearchkibana4StatusYellowAlarm810B4F9E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -1321,9 +1321,9 @@ "testlambdaelasticsearchkibana4FreeStorageSpaceTooLowAlarmF3FB31EA": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -1334,9 +1334,9 @@ "testlambdaelasticsearchkibana4IndexWritesBlockedTooHighAlarmF2968C92": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -1347,9 +1347,9 @@ "testlambdaelasticsearchkibana4AutomatedSnapshotFailureTooHighAlarm53EB1ABB": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -1360,9 +1360,9 @@ "testlambdaelasticsearchkibana4CPUUtilizationTooHighAlarm29B67D10": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -1373,9 +1373,9 @@ "testlambdaelasticsearchkibana4JVMMemoryPressureTooHighAlarm9DDED711": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -1386,9 +1386,9 @@ "testlambdaelasticsearchkibana4MasterCPUUtilizationTooHighAlarmE66867F2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -1399,9 +1399,9 @@ "testlambdaelasticsearchkibana4MasterJVMMemoryPressureTooHighAlarm83E1822E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.expected.json index 92867fabe..bb4aceef8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.expected.json @@ -98,12 +98,6 @@ }, "S3Key": "abbc4eca9e7ddabc31da3ce83159e6eee8e72e2c358ab8af0711044514c41290.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -116,6 +110,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -181,9 +181,6 @@ "testlambdaopensearchCognitoUserPoolClient39C21D94": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -201,7 +198,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" + } } }, "testlambdaopensearchCognitoIdentityPool0B1FB311": { @@ -539,9 +539,9 @@ "testlambdaopensearchStatusRedAlarm1627144D": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -552,9 +552,9 @@ "testlambdaopensearchStatusYellowAlarm57139CF0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -565,9 +565,9 @@ "testlambdaopensearchFreeStorageSpaceTooLowAlarm6A5E1E96": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -578,9 +578,9 @@ "testlambdaopensearchIndexWritesBlockedTooHighAlarmD2E041A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -591,9 +591,9 @@ "testlambdaopensearchAutomatedSnapshotFailureTooHighAlarm9A4D0B1F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -604,9 +604,9 @@ "testlambdaopensearchCPUUtilizationTooHighAlarmC4850758": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -617,9 +617,9 @@ "testlambdaopensearchJVMMemoryPressureTooHighAlarmEFB09A7C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -630,9 +630,9 @@ "testlambdaopensearchMasterCPUUtilizationTooHighAlarm124D5748": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -643,9 +643,9 @@ "testlambdaopensearchMasterJVMMemoryPressureTooHighAlarmBC9524D3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.expected.json index d19b26bde..21ebb11c4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.expected.json @@ -137,12 +137,6 @@ "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", "S3Key": "abbc4eca9e7ddabc31da3ce83159e6eee8e72e2c358ab8af0711044514c41290.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -155,6 +149,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaopensearchLambdaFunctionServiceRole4722AB8A", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -244,9 +244,6 @@ "testlambdaopensearchCognitoUserPoolClient39C21D94": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -264,7 +261,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" + } } }, "testlambdaopensearchCognitoIdentityPool0B1FB311": { @@ -623,9 +623,9 @@ "testlambdaopensearchStatusRedAlarm1627144D": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one primary shard and its replicas are not allocated to a node. ", "MetricName": "ClusterStatus.red", "Namespace": "AWS/ES", "Period": 60, @@ -636,9 +636,9 @@ "testlambdaopensearchStatusYellowAlarm57139CF0": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "At least one replica shard is not allocated to a node.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "At least one replica shard is not allocated to a node.", "MetricName": "ClusterStatus.yellow", "Namespace": "AWS/ES", "Period": 60, @@ -649,9 +649,9 @@ "testlambdaopensearchFreeStorageSpaceTooLowAlarm6A5E1E96": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "ComparisonOperator": "LessThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "A node in your cluster is down to 20 GiB of free storage space.", "MetricName": "FreeStorageSpace", "Namespace": "AWS/ES", "Period": 60, @@ -662,9 +662,9 @@ "testlambdaopensearchIndexWritesBlockedTooHighAlarmD2E041A3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Your cluster is blocking write requests.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Your cluster is blocking write requests.", "MetricName": "ClusterIndexWritesBlocked", "Namespace": "AWS/ES", "Period": 300, @@ -675,9 +675,9 @@ "testlambdaopensearchAutomatedSnapshotFailureTooHighAlarm9A4D0B1F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "An automated snapshot failed. This failure is often the result of a red cluster health status.", "MetricName": "AutomatedSnapshotFailure", "Namespace": "AWS/ES", "Period": 60, @@ -688,9 +688,9 @@ "testlambdaopensearchCPUUtilizationTooHighAlarmC4850758": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.", "MetricName": "CPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -701,9 +701,9 @@ "testlambdaopensearchJVMMemoryPressureTooHighAlarmEFB09A7C": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "JVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -714,9 +714,9 @@ "testlambdaopensearchMasterCPUUtilizationTooHighAlarm124D5748": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 3, - "AlarmDescription": "Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.", "MetricName": "MasterCPUUtilization", "Namespace": "AWS/ES", "Period": 900, @@ -727,9 +727,9 @@ "testlambdaopensearchMasterJVMMemoryPressureTooHighAlarmBC9524D3": { "Type": "AWS::CloudWatch::Alarm", "Properties": { + "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "ComparisonOperator": "GreaterThanOrEqualToThreshold", "EvaluationPeriods": 1, - "AlarmDescription": "Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.", "MetricName": "MasterJVMMemoryPressure", "Namespace": "AWS/ES", "Period": 900, @@ -755,9 +755,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/18", "MapPublicIpOnLaunch": false, @@ -774,21 +771,24 @@ "Key": "Name", "Value": "vpc-props/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpc-props/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -805,9 +805,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.64.0/18", "MapPublicIpOnLaunch": false, @@ -824,21 +821,24 @@ "Key": "Name", "Value": "vpc-props/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpc-props/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -855,9 +855,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.128.0/18", "MapPublicIpOnLaunch": false, @@ -874,21 +871,24 @@ "Key": "Name", "Value": "vpc-props/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "vpc-props/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -920,7 +920,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc" + "Value": "vpc-props/Vpc/FlowLog" } ] } @@ -972,7 +972,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc" + "Value": "vpc-props/Vpc/FlowLog" } ] }, @@ -992,10 +992,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1006,10 +1002,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc" + "Value": "vpc-props/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.expected.json index 37e83bd90..486e68be1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.expected.json @@ -135,12 +135,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdas3LambdaFunctionServiceRole72E20379", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -150,6 +144,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdas3LambdaFunctionServiceRole72E20379", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.expected.json index b9545b2ce..c0a10dbae 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.expected.json @@ -136,12 +136,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdas3LambdaFunctionServiceRole72E20379", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -151,6 +145,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdas3LambdaFunctionServiceRole72E20379", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.expected.json index 058678598..299acbe25 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.expected.json @@ -177,12 +177,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdas3LambdaFunctionServiceRole72E20379", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -192,6 +186,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdas3LambdaFunctionServiceRole72E20379", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -357,9 +357,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -376,21 +373,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -407,9 +407,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -426,21 +423,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -457,9 +457,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -476,21 +473,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -522,7 +522,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -594,10 +594,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -608,10 +604,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -620,6 +620,17 @@ "VpcS3A5408339": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "RouteTableIds": [ + { + "Ref": "VpcisolatedSubnet1RouteTableE442650B" + }, + { + "Ref": "VpcisolatedSubnet2RouteTable334F9764" + }, + { + "Ref": "VpcisolatedSubnet3RouteTableA2F6BBC0" + } + ], "ServiceName": { "Fn::Join": [ "", @@ -632,21 +643,10 @@ ] ] }, + "VpcEndpointType": "Gateway", "VpcId": { "Ref": "Vpc8378EB38" - }, - "RouteTableIds": [ - { - "Ref": "VpcisolatedSubnet1RouteTableE442650B" - }, - { - "Ref": "VpcisolatedSubnet2RouteTable334F9764" - }, - { - "Ref": "VpcisolatedSubnet3RouteTableA2F6BBC0" - } - ], - "VpcEndpointType": "Gateway" + } } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.expected.json index 36099ea36..fa52e013d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.expected.json @@ -136,12 +136,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -151,6 +145,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.expected.json index 141f895da..03aafe278 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.expected.json @@ -143,18 +143,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -336,12 +336,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdas3preexistingbucketLambdaFunctionServiceRole9AC7CED0", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -351,6 +345,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdas3preexistingbucketLambdaFunctionServiceRole9AC7CED0", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -380,109 +380,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json index eb40642ed..30b692a1f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json @@ -336,6 +336,7 @@ "testlambdasagemakerEncryptionKey2AACF9E0": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -363,8 +364,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -372,6 +372,9 @@ "testlambdasagemakerSagemakerEndpointConfig6BABA334": { "Type": "AWS::SageMaker::EndpointConfig", "Properties": { + "KmsKeyId": { + "Ref": "testlambdasagemakerEncryptionKey2AACF9E0" + }, "ProductionVariants": [ { "InitialInstanceCount": 1, @@ -385,10 +388,7 @@ }, "VariantName": "AllTraffic" } - ], - "KmsKeyId": { - "Ref": "testlambdasagemakerEncryptionKey2AACF9E0" - } + ] }, "DependsOn": [ "testlambdasagemakerSagemakerModelEC3E4E39" @@ -513,12 +513,6 @@ }, "S3Key": "d894a15aa0242919d44274cbb8ddd33f39cce242789e85e67e642da0a2926e15.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasagemakerLambdaFunctionServiceRole4BA038CB", - "Arn" - ] - }, "Environment": { "Variables": { "SAGEMAKER_ENDPOINT_NAME": { @@ -531,6 +525,12 @@ }, "Handler": "index.handler", "MemorySize": 128, + "Role": { + "Fn::GetAtt": [ + "testlambdasagemakerLambdaFunctionServiceRole4BA038CB", + "Arn" + ] + }, "Runtime": "python3.8", "Timeout": 300, "TracingConfig": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json index e0e998e75..f47a7676d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json @@ -106,12 +106,6 @@ }, "S3Key": "d894a15aa0242919d44274cbb8ddd33f39cce242789e85e67e642da0a2926e15.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "SAGEMAKER_ENDPOINT_NAME": { @@ -124,6 +118,12 @@ }, "Handler": "index.handler", "MemorySize": 128, + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "python3.8", "Timeout": 300, "TracingConfig": { @@ -421,6 +421,7 @@ "testlambdasagemakerEncryptionKey2AACF9E0": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -448,8 +449,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -457,6 +457,9 @@ "testlambdasagemakerSagemakerEndpointConfig6BABA334": { "Type": "AWS::SageMaker::EndpointConfig", "Properties": { + "KmsKeyId": { + "Ref": "testlambdasagemakerEncryptionKey2AACF9E0" + }, "ProductionVariants": [ { "InitialInstanceCount": 1, @@ -470,10 +473,7 @@ }, "VariantName": "AllTraffic" } - ], - "KmsKeyId": { - "Ref": "testlambdasagemakerEncryptionKey2AACF9E0" - } + ] }, "DependsOn": [ "testlambdasagemakerSagemakerModelEC3E4E39" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json index 78d3e1f8f..4625b41a5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json @@ -336,6 +336,7 @@ "EncryptionKey1B843E66": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -363,8 +364,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -372,6 +372,9 @@ "SagemakerEndpointConfig": { "Type": "AWS::SageMaker::EndpointConfig", "Properties": { + "KmsKeyId": { + "Ref": "EncryptionKey1B843E66" + }, "ProductionVariants": [ { "InitialInstanceCount": 1, @@ -385,10 +388,7 @@ }, "VariantName": "AllTraffic" } - ], - "KmsKeyId": { - "Ref": "EncryptionKey1B843E66" - } + ] }, "DependsOn": [ "SagemakerModel" @@ -513,12 +513,6 @@ }, "S3Key": "d894a15aa0242919d44274cbb8ddd33f39cce242789e85e67e642da0a2926e15.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasagemakerLambdaFunctionServiceRole4BA038CB", - "Arn" - ] - }, "Environment": { "Variables": { "SAGEMAKER_ENDPOINT_NAME": { @@ -531,6 +525,12 @@ }, "Handler": "index.handler", "MemorySize": 128, + "Role": { + "Fn::GetAtt": [ + "testlambdasagemakerLambdaFunctionServiceRole4BA038CB", + "Arn" + ] + }, "Runtime": "python3.8", "Timeout": 300, "TracingConfig": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.expected.json index abd995aa7..856fc754b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.expected.json @@ -109,12 +109,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasecretsmanagerLambdaFunctionServiceRole92CE007F", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -124,6 +118,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasecretsmanagerLambdaFunctionServiceRole92CE007F", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.expected.json index 8d0505d94..00399cbea 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,17 +657,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSECRETSMANAGERF52907C2": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithExistingVpcSECRETSMANAGERsecuritygroupB20BA3EB", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -685,18 +694,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithExistingVpcSECRETSMANAGERsecuritygroupB20BA3EB", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -708,7 +705,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testlambdasecretsmanagerstackLambdaFunctionServiceRole4FE7A9C6": { @@ -860,12 +860,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasecretsmanagerstackLambdaFunctionServiceRole4FE7A9C6", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -875,6 +869,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasecretsmanagerstackLambdaFunctionServiceRole4FE7A9C6", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.expected.json index b613ac9e0..14093b327 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.expected.json @@ -150,12 +150,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasecretsmanagerLambdaFunctionServiceRole92CE007F", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -165,6 +159,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasecretsmanagerLambdaFunctionServiceRole92CE007F", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -253,9 +253,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -272,21 +269,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -303,9 +303,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -322,21 +319,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -353,9 +353,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -372,21 +369,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -418,7 +418,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -470,7 +470,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -490,11 +490,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -505,17 +500,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSECRETSMANAGERF52907C2": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithVpcSECRETSMANAGERsecuritygroup140A8C59", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -528,18 +537,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithVpcSECRETSMANAGERsecuritygroup140A8C59", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -551,7 +548,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithVpcSECRETSMANAGERsecuritygroup140A8C59": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.expected.json index 377c92c56..b8a7d80e2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.expected.json @@ -109,12 +109,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -124,6 +118,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.expected.json index 5b7927327..a9056a16a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.expected.json @@ -106,12 +106,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasnsLambdaFunctionServiceRole9C412F74", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -127,6 +121,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasnsLambdaFunctionServiceRole9C412F74", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.expected.json index c9e10345b..fac38e6c5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.expected.json @@ -147,12 +147,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasnsLambdaFunctionServiceRole9C412F74", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -168,6 +162,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasnsLambdaFunctionServiceRole9C412F74", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -347,9 +347,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -366,21 +363,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -397,9 +397,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -416,21 +413,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -447,9 +447,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -466,21 +463,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -512,7 +512,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -564,7 +564,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -584,11 +584,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -599,17 +594,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSNS5B664381": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithVpcSNSsecuritygroup5E54C413", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -622,18 +631,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithVpcSNSsecuritygroup5E54C413", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -645,7 +642,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithVpcSNSsecuritygroup5E54C413": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.expected.json index 26ac8d886..a543e3041 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.expected.json @@ -106,12 +106,6 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -127,6 +121,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json index ebdcef715..d1e2e4d6e 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json @@ -113,12 +113,6 @@ }, "S3Key": "075b2d402078d97c329028d1af17df69ef86062dc7ace374b10a10022db6fb8d.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdalambdatosqsLambdaFunctionServiceRoleAE4A8DCD", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -128,6 +122,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdalambdatosqsLambdaFunctionServiceRoleAE4A8DCD", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -437,18 +437,18 @@ }, "S3Key": "d685d4fad1e8a913557eb007ae16e135281d3f192a6b557c471e160e3cc557a6.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdasqstolambdaLambdaFunctionServiceRole785979D2", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdasqstolambdaLambdaFunctionServiceRole785979D2", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -480,14 +480,14 @@ "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourcedefaultDeploymenttestlambdasqslambdalambdatosqsqueue5E928C6A3AD18AD6": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testlambdasqslambdasqstolambdaLambdaFunction81308327" - }, "EventSourceArn": { "Fn::GetAtt": [ "testlambdasqslambdalambdatosqsqueueF2ED40D2", "Arn" ] + }, + "FunctionName": { + "Ref": "testlambdasqslambdasqstolambdaLambdaFunction81308327" } } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.expected.json index 40b1ad280..0118c94c6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.expected.json @@ -154,12 +154,6 @@ }, "S3Key": "075b2d402078d97c329028d1af17df69ef86062dc7ace374b10a10022db6fb8d.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdatosqsLambdaFunctionServiceRole9A15D8F5", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -169,6 +163,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdatosqsLambdaFunctionServiceRole9A15D8F5", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -406,9 +406,6 @@ "testlambdasqsVpcisolatedSubnet1Subnet75F315F8": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -425,21 +422,24 @@ "Key": "Name", "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqsVpcisolatedSubnet1RouteTable9070A207": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, "Tags": [ { "Key": "Name", "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqsVpcisolatedSubnet1RouteTableAssociation270A37E8": { @@ -456,9 +456,6 @@ "testlambdasqsVpcisolatedSubnet2Subnet320D7431": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -475,21 +472,24 @@ "Key": "Name", "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqsVpcisolatedSubnet2RouteTable1C5B9E86": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, "Tags": [ { "Key": "Name", "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqsVpcisolatedSubnet2RouteTableAssociation723A8A06": { @@ -506,9 +506,6 @@ "testlambdasqsVpcisolatedSubnet3Subnet34633573": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -525,21 +522,24 @@ "Key": "Name", "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqsVpcisolatedSubnet3RouteTable7AB1A8FF": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, "Tags": [ { "Key": "Name", "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqsVpcisolatedSubnet3RouteTableAssociation41766676": { @@ -571,7 +571,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc" + "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" } ] } @@ -623,7 +623,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc" + "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" } ] }, @@ -643,11 +643,6 @@ "testlambdasqsVpcFlowLogEECF2763": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "testlambdasqsVpc85322AF3" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "testlambdasqsVpcFlowLogIAMRole79FE4957", @@ -658,17 +653,31 @@ "LogGroupName": { "Ref": "testlambdasqsVpcFlowLogLogGroup5E27ADE6" }, + "ResourceId": { + "Ref": "testlambdasqsVpc85322AF3" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc" + "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "testlambdasqsVpcSQS13B88BE1": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "testlambdasqstestlambdasqsSQSsecuritygroupBDBA458D", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -681,18 +690,6 @@ ] ] }, - "VpcId": { - "Ref": "testlambdasqsVpc85322AF3" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "testlambdasqstestlambdasqsSQSsecuritygroupBDBA458D", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "testlambdasqsVpcisolatedSubnet1Subnet75F315F8" @@ -704,7 +701,10 @@ "Ref": "testlambdasqsVpcisolatedSubnet3Subnet34633573" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "testlambdasqsVpc85322AF3" + } } }, "testlambdasqstestlambdasqsSQSsecuritygroupBDBA458D": { @@ -879,18 +879,18 @@ }, "S3Key": "d685d4fad1e8a913557eb007ae16e135281d3f192a6b557c471e160e3cc557a6.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqssqstolambdaLambdaFunctionServiceRoleB914400A", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqssqstolambdaLambdaFunctionServiceRoleB914400A", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -922,14 +922,14 @@ "testlambdasqssqstolambdaLambdaFunctionSqsEventSourcedeployProducerFunctionWithVpctestlambdasqslambdatosqsqueueA1382C56CEF2BFAB": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testlambdasqssqstolambdaLambdaFunctionDE6481E6" - }, "EventSourceArn": { "Fn::GetAtt": [ "testlambdasqslambdatosqsqueue5A401298", "Arn" ] + }, + "FunctionName": { + "Ref": "testlambdasqssqstolambdaLambdaFunctionDE6481E6" } } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json index ce8eeeb53..f3c39b316 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json @@ -115,18 +115,18 @@ }, "S3Key": "d685d4fad1e8a913557eb007ae16e135281d3f192a6b557c471e160e3cc557a6.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -158,14 +158,14 @@ "LambdaFunctionSqsEventSourceexistingConsumerFunctiontestlambdasqslambdalambdatosqsqueue06632F2BBBBAB968": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "LambdaFunctionBF21E41F" - }, "EventSourceArn": { "Fn::GetAtt": [ "testlambdasqslambdalambdatosqsqueueF2ED40D2", "Arn" ] + }, + "FunctionName": { + "Ref": "LambdaFunctionBF21E41F" } } }, @@ -281,12 +281,6 @@ }, "S3Key": "075b2d402078d97c329028d1af17df69ef86062dc7ace374b10a10022db6fb8d.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdalambdatosqsLambdaFunctionServiceRoleAE4A8DCD", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -296,6 +290,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdalambdatosqsLambdaFunctionServiceRoleAE4A8DCD", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json index 8c957b531..db615ee83 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json @@ -113,12 +113,6 @@ }, "S3Key": "075b2d402078d97c329028d1af17df69ef86062dc7ace374b10a10022db6fb8d.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -128,6 +122,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -437,18 +437,18 @@ }, "S3Key": "d685d4fad1e8a913557eb007ae16e135281d3f192a6b557c471e160e3cc557a6.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdasqstolambdaLambdaFunctionServiceRole785979D2", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdasqstolambdaLambdaFunctionServiceRole785979D2", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -480,14 +480,14 @@ "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourceexistingProducerFunctiontestlambdasqslambdalambdatosqsqueue9043AC9D03EA33DA": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testlambdasqslambdasqstolambdaLambdaFunction81308327" - }, "EventSourceArn": { "Fn::GetAtt": [ "testlambdasqslambdalambdatosqsqueueF2ED40D2", "Arn" ] + }, + "FunctionName": { + "Ref": "testlambdasqslambdasqstolambdaLambdaFunction81308327" } } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json index f8cfe92f8..0adc3d1f2 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json @@ -192,12 +192,6 @@ }, "S3Key": "075b2d402078d97c329028d1af17df69ef86062dc7ace374b10a10022db6fb8d.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdalambdatosqsLambdaFunctionServiceRoleAE4A8DCD", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -207,6 +201,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdalambdatosqsLambdaFunctionServiceRoleAE4A8DCD", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -349,18 +349,18 @@ }, "S3Key": "d685d4fad1e8a913557eb007ae16e135281d3f192a6b557c471e160e3cc557a6.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqslambdasqstolambdaLambdaFunctionServiceRole785979D2", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqslambdasqstolambdaLambdaFunctionServiceRole785979D2", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -392,14 +392,14 @@ "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourceexistingQueueexistingsqsqueue05DEA3674B910AAB": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testlambdasqslambdasqstolambdaLambdaFunction81308327" - }, "EventSourceArn": { "Fn::GetAtt": [ "existingsqsqueue6AE880F4", "Arn" ] + }, + "FunctionName": { + "Ref": "testlambdasqslambdasqstolambdaLambdaFunction81308327" } } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json index 966e2d9e8..511e39032 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json @@ -113,12 +113,6 @@ }, "S3Key": "42887c62b1163d790cdb42902037c9f639feb35681616a16826e400c8d1a4435.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqsLambdaFunctionServiceRoleC0430CA8", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -128,6 +122,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqsLambdaFunctionServiceRoleC0430CA8", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.expected.json index d54428b69..3aea6b351 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.expected.json @@ -154,12 +154,6 @@ }, "S3Key": "42887c62b1163d790cdb42902037c9f639feb35681616a16826e400c8d1a4435.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdasqsLambdaFunctionServiceRoleC0430CA8", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -169,6 +163,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdasqsLambdaFunctionServiceRoleC0430CA8", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -406,9 +406,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -425,21 +422,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -456,9 +456,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -475,21 +472,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -506,9 +506,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -525,21 +522,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -571,7 +571,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -623,7 +623,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -643,11 +643,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -658,17 +653,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSQSDF166A88": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithVpcSQSsecuritygroup2E4E2685", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -681,18 +690,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithVpcSQSsecuritygroup2E4E2685", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -704,7 +701,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithVpcSQSsecuritygroup2E4E2685": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json index 9944b622e..c566207bc 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json @@ -113,12 +113,6 @@ }, "S3Key": "42887c62b1163d790cdb42902037c9f639feb35681616a16826e400c8d1a4435.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -128,6 +122,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.expected.json index d891590f7..882f39597 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.expected.json @@ -131,12 +131,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -146,6 +140,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.expected.json index cb2ca1af1..47c986943 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,17 +657,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSSM173B3B5B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithExistingVpcSSMsecuritygroupC287F479", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -685,18 +694,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithExistingVpcSSMsecuritygroupC287F479", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcPrivateSubnet1Subnet536B997A" @@ -708,7 +705,10 @@ "Ref": "VpcPrivateSubnet3SubnetF258B56E" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916": { @@ -882,12 +882,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -897,6 +891,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.expected.json index ac2fa43fa..785fe73e6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.expected.json @@ -172,12 +172,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -187,6 +181,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -264,9 +264,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -283,21 +280,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -314,9 +314,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -333,21 +330,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -364,9 +364,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -383,21 +380,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -429,7 +429,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -481,7 +481,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -501,11 +501,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -516,17 +511,31 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "VpcSSM173B3B5B": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithVpcSSMsecuritygroup918CB15C", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -539,18 +548,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithVpcSSMsecuritygroup918CB15C", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -562,7 +559,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithVpcSSMsecuritygroup918CB15C": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.expected.json index c8bcfc575..0d209b92d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.expected.json @@ -131,12 +131,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -146,6 +140,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.expected.json index 6e184391f..56d6d5a33 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.expected.json @@ -138,12 +138,6 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -153,6 +147,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdassmstringparameterLambdaFunctionServiceRole0E6B5916", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.expected.json index 5d32965b4..251c1aca8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.expected.json @@ -135,12 +135,6 @@ "testlambdastepfunctionsconstructStateMachineE1526513": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testlambdastepfunctionsconstructStateMachineRoleD2891199", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -156,6 +150,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testlambdastepfunctionsconstructStateMachineRoleD2891199", + "Arn" + ] } }, "DependsOn": [ @@ -270,12 +270,6 @@ }, "S3Key": "fd7a741674eeef7951675d2a57f0459376e046d88e5bee9aab601d8f5a704c93.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdastepfunctionsconstructLambdaFunctionServiceRole2D3C3FD0", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -285,6 +279,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdastepfunctionsconstructLambdaFunctionServiceRole2D3C3FD0", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -316,9 +316,8 @@ "testlambdastepfunctionsconstructExecutionFailedAlarm47C759E2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -327,6 +326,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -337,9 +337,8 @@ "testlambdastepfunctionsconstructExecutionThrottledAlarm23275AB5": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -348,6 +347,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -358,9 +358,8 @@ "testlambdastepfunctionsconstructExecutionAbortedAlarm6DBA2A2E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -369,6 +368,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -409,6 +409,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -442,6 +445,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.expected.json index 818d0a749..4f7f845e8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.expected.json @@ -116,12 +116,6 @@ "testlambdastepfunctionsStateMachine807F0A77": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testlambdastepfunctionsStateMachineRoleAC728CE7", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -137,6 +131,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testlambdastepfunctionsStateMachineRoleAC728CE7", + "Arn" + ] } }, "DependsOn": [ @@ -292,12 +292,6 @@ }, "S3Key": "fd7a741674eeef7951675d2a57f0459376e046d88e5bee9aab601d8f5a704c93.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdastepfunctionsLambdaFunctionServiceRoleA33E2E9C", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -307,6 +301,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdastepfunctionsLambdaFunctionServiceRoleA33E2E9C", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -362,9 +362,8 @@ "testlambdastepfunctionsExecutionFailedAlarm41073C3F": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -373,6 +372,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -383,9 +383,8 @@ "testlambdastepfunctionsExecutionThrottledAlarm62EABDFD": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -394,6 +393,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -404,9 +404,8 @@ "testlambdastepfunctionsExecutionAbortedAlarmC9CB5C2D": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -415,6 +414,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -440,9 +440,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -459,21 +456,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -490,9 +490,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -509,21 +506,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -540,9 +540,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -559,21 +556,24 @@ "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -605,7 +605,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -657,7 +657,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -677,10 +677,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -691,10 +687,14 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -703,6 +703,15 @@ "VpcSTEPFUNCTIONS550F8CB6": { "Type": "AWS::EC2::VPCEndpoint", "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "deployFunctionWithVpcSTEPFUNCTIONSsecuritygroupA9CFA360", + "GroupId" + ] + } + ], "ServiceName": { "Fn::Join": [ "", @@ -715,18 +724,6 @@ ] ] }, - "VpcId": { - "Ref": "Vpc8378EB38" - }, - "PrivateDnsEnabled": true, - "SecurityGroupIds": [ - { - "Fn::GetAtt": [ - "deployFunctionWithVpcSTEPFUNCTIONSsecuritygroupA9CFA360", - "GroupId" - ] - } - ], "SubnetIds": [ { "Ref": "VpcisolatedSubnet1SubnetE62B1B9B" @@ -738,7 +735,10 @@ "Ref": "VpcisolatedSubnet3Subnet44F2537D" } ], - "VpcEndpointType": "Interface" + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "deployFunctionWithVpcSTEPFUNCTIONSsecuritygroupA9CFA360": { @@ -832,6 +832,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -865,6 +868,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.expected.json index 1d02f85e7..76331499d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.expected.json @@ -105,12 +105,6 @@ }, "S3Key": "fd7a741674eeef7951675d2a57f0459376e046d88e5bee9aab601d8f5a704c93.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -120,6 +114,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -263,12 +263,6 @@ "testlambdastepfunctionsconstructStateMachineE1526513": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "testlambdastepfunctionsconstructStateMachineRoleD2891199", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -284,6 +278,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "testlambdastepfunctionsconstructStateMachineRoleD2891199", + "Arn" + ] } }, "DependsOn": [ @@ -296,9 +296,8 @@ "testlambdastepfunctionsconstructExecutionFailedAlarm47C759E2": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -307,6 +306,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -317,9 +317,8 @@ "testlambdastepfunctionsconstructExecutionThrottledAlarm23275AB5": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -328,6 +327,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -338,9 +338,8 @@ "testlambdastepfunctionsconstructExecutionAbortedAlarm6DBA2A2E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -349,6 +348,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -389,6 +389,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -422,6 +425,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.expected.json b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.expected.json index ca1dc60f2..90ce56cf6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.expected.json @@ -99,13 +99,13 @@ }, "S3Key": "8ce85d10dcd7b8e6d43ffd909827afc76802ad40fcd7908886ff825cbe8e15df.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "LambdaFunctionServiceRole0C4CDE0B", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -269,14 +269,14 @@ }, "S3Key": "654d49d4ea47a6be417d57b94dc0310933d0e971a3e48a3080c3e48487af3e50.zip" }, + "FunctionName": "PhotosLambdaTestFromAsset", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "PhotosLambdaTestFromAssetServiceRoleE0B4776B", "Arn" ] }, - "FunctionName": "PhotosLambdaTestFromAsset", - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -552,14 +552,14 @@ }, "S3Key": "96f7d2d4f45b57a586d030966d31e06bc622b5f20258ca38d605fef38e6b9a17.zip" }, + "Handler": "index.handler", + "MemorySize": 1024, "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaApiTemplateWriterLambdaRoleCBDA4014", "Arn" ] }, - "Handler": "index.handler", - "MemorySize": 1024, "Runtime": "nodejs18.x", "Timeout": 60, "TracingConfig": { @@ -669,13 +669,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip" - }, - "Role": { - "Fn::GetAtt": [ - "OpenApiGatewayToLambdaApiTemplateWriterProviderframeworkonEventServiceRoleFEE201A1", - "Arn" - ] + "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, "Description": "AWS CDK resource provider framework - onEvent (apiFromAssetExistingLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", "Environment": { @@ -689,7 +683,13 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Role": { + "Fn::GetAtt": [ + "OpenApiGatewayToLambdaApiTemplateWriterProviderframeworkonEventServiceRoleFEE201A1", + "Arn" + ] + }, + "Runtime": "nodejs18.x", "Timeout": 900 }, "DependsOn": [ @@ -832,10 +832,10 @@ "OpenApiGatewayToLambdaSpecRestApiDeploymentC8BD0775114a8d1d0c9bf9b9d904a22f099d1d64": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" - }, - "Description": "Automatically created by the RestApi construct" + } }, "Metadata": { "cfn_nag": { @@ -851,9 +851,6 @@ "OpenApiGatewayToLambdaSpecRestApiDeploymentStageprodB962CBBB": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -874,6 +871,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" + }, "StageName": "prod", "TracingEnabled": true } @@ -1030,4 +1030,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.expected.json b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.expected.json index 9061a24b2..22cc311a0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.expected.json @@ -99,13 +99,13 @@ }, "S3Key": "8ce85d10dcd7b8e6d43ffd909827afc76802ad40fcd7908886ff825cbe8e15df.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaMessagesHandlerApiFunction0ServiceRoleB5DC63A9", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -269,13 +269,13 @@ }, "S3Key": "654d49d4ea47a6be417d57b94dc0310933d0e971a3e48a3080c3e48487af3e50.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaPhotosHandlerApiFunction1ServiceRoleA572C749", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -551,14 +551,14 @@ }, "S3Key": "96f7d2d4f45b57a586d030966d31e06bc622b5f20258ca38d605fef38e6b9a17.zip" }, + "Handler": "index.handler", + "MemorySize": 1024, "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaApiTemplateWriterLambdaRoleCBDA4014", "Arn" ] }, - "Handler": "index.handler", - "MemorySize": 1024, "Runtime": "nodejs18.x", "Timeout": 60, "TracingConfig": { @@ -668,13 +668,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip" - }, - "Role": { - "Fn::GetAtt": [ - "OpenApiGatewayToLambdaApiTemplateWriterProviderframeworkonEventServiceRoleFEE201A1", - "Arn" - ] + "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, "Description": "AWS CDK resource provider framework - onEvent (apiFromAssetNewLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", "Environment": { @@ -688,7 +682,13 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Role": { + "Fn::GetAtt": [ + "OpenApiGatewayToLambdaApiTemplateWriterProviderframeworkonEventServiceRoleFEE201A1", + "Arn" + ] + }, + "Runtime": "nodejs18.x", "Timeout": 900 }, "DependsOn": [ @@ -831,10 +831,10 @@ "OpenApiGatewayToLambdaSpecRestApiDeploymentC8BD0775c586d865ce613dde0b09710274a96485": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" - }, - "Description": "Automatically created by the RestApi construct" + } }, "Metadata": { "cfn_nag": { @@ -850,9 +850,6 @@ "OpenApiGatewayToLambdaSpecRestApiDeploymentStageprodB962CBBB": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -873,6 +870,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" + }, "StageName": "prod", "TracingEnabled": true } @@ -1029,4 +1029,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.expected.json b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.expected.json index 183f298d9..c888345b9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.expected.json @@ -99,13 +99,13 @@ }, "S3Key": "8ce85d10dcd7b8e6d43ffd909827afc76802ad40fcd7908886ff825cbe8e15df.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaMessagesHandlerApiFunction0ServiceRoleB5DC63A9", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -269,13 +269,13 @@ }, "S3Key": "654d49d4ea47a6be417d57b94dc0310933d0e971a3e48a3080c3e48487af3e50.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaPhotosHandlerApiFunction1ServiceRoleA572C749", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -551,14 +551,14 @@ }, "S3Key": "96f7d2d4f45b57a586d030966d31e06bc622b5f20258ca38d605fef38e6b9a17.zip" }, + "Handler": "index.handler", + "MemorySize": 1024, "Role": { "Fn::GetAtt": [ "OpenApiGatewayToLambdaApiTemplateWriterLambdaRoleCBDA4014", "Arn" ] }, - "Handler": "index.handler", - "MemorySize": 1024, "Runtime": "nodejs18.x", "Timeout": 60, "TracingConfig": { @@ -668,13 +668,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip" - }, - "Role": { - "Fn::GetAtt": [ - "OpenApiGatewayToLambdaApiTemplateWriterProviderframeworkonEventServiceRoleFEE201A1", - "Arn" - ] + "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, "Description": "AWS CDK resource provider framework - onEvent (apiFromAssetWithCognitoAuth/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", "Environment": { @@ -688,7 +682,13 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Role": { + "Fn::GetAtt": [ + "OpenApiGatewayToLambdaApiTemplateWriterProviderframeworkonEventServiceRoleFEE201A1", + "Arn" + ] + }, + "Runtime": "nodejs18.x", "Timeout": 900 }, "DependsOn": [ @@ -831,10 +831,10 @@ "OpenApiGatewayToLambdaSpecRestApiDeploymentC8BD0775d25e717744ab7d508aee3a1c3b7aa9b2": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" - }, - "Description": "Automatically created by the RestApi construct" + } }, "Metadata": { "cfn_nag": { @@ -850,9 +850,6 @@ "OpenApiGatewayToLambdaSpecRestApiDeploymentStageprodB962CBBB": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -873,6 +870,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "OpenApiGatewayToLambdaSpecRestApi27C18064" + }, "StageName": "prod", "TracingEnabled": true } @@ -1029,4 +1029,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json index 7cc0131dc..5d0d3bb46 100644 --- a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json @@ -326,8 +326,6 @@ "privateapistackprivateapistackalias54E3713F": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "www.example.com.", - "Type": "A", "AliasTarget": { "DNSName": { "Fn::Join": [ @@ -352,7 +350,9 @@ }, "HostedZoneId": { "Ref": "privateapistackprivateapistackzone3E5194E7" - } + }, + "Name": "www.example.com.", + "Type": "A" } }, "Vpc8378EB38": { @@ -373,9 +373,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -392,21 +389,24 @@ "Key": "Name", "Value": "deployPrivateApi/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApi/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -423,9 +423,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -442,21 +439,24 @@ "Key": "Name", "Value": "deployPrivateApi/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApi/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -473,9 +473,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -492,21 +489,24 @@ "Key": "Name", "Value": "deployPrivateApi/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApi/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -538,7 +538,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc" + "Value": "deployPrivateApi/Vpc/FlowLog" } ] } @@ -590,7 +590,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc" + "Value": "deployPrivateApi/Vpc/FlowLog" } ] }, @@ -610,11 +610,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -625,12 +620,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc" + "Value": "deployPrivateApi/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { @@ -662,18 +662,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json index 2d1df8163..3a56327aa 100644 --- a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc" + "Value": "deployPrivateApiExistingZone/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc" + "Value": "deployPrivateApiExistingZone/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,12 +657,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc" + "Value": "deployPrivateApiExistingZone/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "newzone1D011936": { @@ -995,8 +995,6 @@ "existingzonestackexistingzonestackalias77D2E65D": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "www.test-example.com.", - "Type": "A", "AliasTarget": { "DNSName": { "Fn::Join": [ @@ -1021,7 +1019,9 @@ }, "HostedZoneId": { "Ref": "newzone1D011936" - } + }, + "Name": "www.test-example.com.", + "Type": "A" } }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { @@ -1053,18 +1053,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.expected.json b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.expected.json index 6bc4a720c..b9cf81aa1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.expected.json @@ -19,9 +19,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -38,7 +35,10 @@ "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -54,15 +54,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -79,12 +79,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -106,15 +106,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -130,9 +130,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -149,7 +146,10 @@ "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -165,15 +165,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -190,12 +190,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -217,15 +217,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -241,9 +241,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -260,7 +257,10 @@ "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -276,15 +276,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -301,12 +301,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -328,15 +328,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -352,9 +352,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -371,21 +368,24 @@ "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -402,21 +402,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -433,21 +430,24 @@ "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -464,21 +464,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -495,21 +492,24 @@ "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -526,12 +526,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -549,11 +549,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc" + "Value": "deployPublicApiExistingAlb/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc" + "Value": "deployPublicApiExistingAlb/Vpc/FlowLog" } ] }, @@ -647,11 +647,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -662,12 +657,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc" + "Value": "deployPublicApiExistingAlb/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "newzone1D011936": { @@ -749,8 +749,6 @@ "publicapistackpublicapistackalias4096038C": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "www.test-example.com.", - "Type": "A", "AliasTarget": { "DNSName": { "Fn::Join": [ @@ -775,7 +773,9 @@ }, "HostedZoneId": { "Ref": "newzone1D011936" - } + }, + "Name": "www.test-example.com.", + "Type": "A" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json index 9e5b5818b..609c4a6d2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json @@ -324,8 +324,6 @@ "newalbstacknewalbstackalias05E0DF53": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "www.test-example.com.", - "Type": "A", "AliasTarget": { "DNSName": { "Fn::Join": [ @@ -350,7 +348,9 @@ }, "HostedZoneId": { "Ref": "newzone1D011936" - } + }, + "Name": "www.test-example.com.", + "Type": "A" } }, "Vpc8378EB38": { @@ -371,9 +371,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/19", "MapPublicIpOnLaunch": true, @@ -390,7 +387,10 @@ "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -406,15 +406,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -431,12 +431,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -458,15 +458,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -482,9 +482,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.32.0/19", "MapPublicIpOnLaunch": true, @@ -501,7 +498,10 @@ "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -517,15 +517,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -542,12 +542,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -569,15 +569,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -593,9 +593,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.64.0/19", "MapPublicIpOnLaunch": true, @@ -612,7 +609,10 @@ "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -628,15 +628,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -653,12 +653,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -680,15 +680,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -704,9 +704,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.96.0/19", "MapPublicIpOnLaunch": false, @@ -723,21 +720,24 @@ "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -754,21 +754,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.128.0/19", "MapPublicIpOnLaunch": false, @@ -785,21 +782,24 @@ "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -816,21 +816,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.160.0/19", "MapPublicIpOnLaunch": false, @@ -847,21 +844,24 @@ "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -878,12 +878,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -901,11 +901,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -927,7 +927,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc" + "Value": "deployPublicApiNewAlb/Vpc/FlowLog" } ] } @@ -979,7 +979,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc" + "Value": "deployPublicApiNewAlb/Vpc/FlowLog" } ] }, @@ -999,11 +999,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -1014,12 +1009,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc" + "Value": "deployPublicApiNewAlb/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { @@ -1051,18 +1051,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.expected.json b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.expected.json index 2c42249ee..47d84e1f8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.expected.json @@ -88,8 +88,6 @@ "nologgingstacknologgingstackalias0D6EE5FC": { "Type": "AWS::Route53::RecordSet", "Properties": { - "Name": "www.example.com.", - "Type": "A", "AliasTarget": { "DNSName": { "Fn::Join": [ @@ -114,7 +112,9 @@ }, "HostedZoneId": { "Ref": "nologgingstacknologgingstackzoneE11B9175" - } + }, + "Name": "www.example.com.", + "Type": "A" } }, "Vpc8378EB38": { @@ -135,9 +135,6 @@ "VpcisolatedSubnet1SubnetE62B1B9B": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "10.0.0.0/18", "MapPublicIpOnLaunch": false, @@ -154,21 +151,24 @@ "Key": "Name", "Value": "deployWithoutLogging/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableE442650B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployWithoutLogging/Vpc/isolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet1RouteTableAssociationD259E31A": { @@ -185,9 +185,6 @@ "VpcisolatedSubnet2Subnet39217055": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "10.0.64.0/18", "MapPublicIpOnLaunch": false, @@ -204,21 +201,24 @@ "Key": "Name", "Value": "deployWithoutLogging/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTable334F9764": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployWithoutLogging/Vpc/isolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet2RouteTableAssociation25A4716F": { @@ -235,9 +235,6 @@ "VpcisolatedSubnet3Subnet44F2537D": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "10.0.128.0/18", "MapPublicIpOnLaunch": false, @@ -254,21 +251,24 @@ "Key": "Name", "Value": "deployWithoutLogging/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableA2F6BBC0": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "deployWithoutLogging/Vpc/isolatedSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcisolatedSubnet3RouteTableAssociationDC010BEB": { @@ -300,7 +300,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc" + "Value": "deployWithoutLogging/Vpc/FlowLog" } ] } @@ -352,7 +352,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc" + "Value": "deployWithoutLogging/Vpc/FlowLog" } ] }, @@ -372,11 +372,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -387,12 +382,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc" + "Value": "deployWithoutLogging/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json index 78f15a1ef..dfad072b0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json @@ -197,18 +197,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -342,18 +342,18 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "tests3lambdaLambdaFunctionServiceRoleA74F4427", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "tests3lambdaLambdaFunctionServiceRoleA74F4427", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -485,109 +485,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.expected.json index c60da90fa..400d8c050 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.expected.json @@ -98,18 +98,18 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "tests3lambdaLambdaFunctionServiceRoleA74F4427", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "tests3lambdaLambdaFunctionServiceRoleA74F4427", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.expected.json index a47e32a2a..678527ff8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.expected.json @@ -242,6 +242,7 @@ "tests3snsEncryptionKey6C553584": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -280,8 +281,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.expected.json index ff8376880..a21e54624 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.expected.json @@ -173,18 +173,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -223,6 +223,7 @@ "tests3snsEncryptionKey6C553584": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -261,8 +262,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -486,109 +486,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.expected.json index 2182fa528..354335412 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.expected.json @@ -3,6 +3,7 @@ "EncryptionKey1B843E66": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -41,8 +42,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.expected.json index fe7840adc..da9251c4a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.expected.json @@ -242,6 +242,7 @@ "tests3snsEncryptionKey6C553584": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -280,8 +281,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.expected.json index a47e32a2a..678527ff8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.expected.json @@ -242,6 +242,7 @@ "tests3snsEncryptionKey6C553584": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -280,8 +281,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.expected.json index 1608bdc30..618503467 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.expected.json @@ -256,6 +256,7 @@ "tests3snsEncryptionKey6C553584": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -294,8 +295,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.expected.json index c839ae628..34cf2729f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.expected.json @@ -4,6 +4,7 @@ "ImportedEncryptionKeyBE10B2FC": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -65,8 +66,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.expected.json index 2406f51ef..a6927de0a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.expected.json @@ -325,6 +325,7 @@ "tests3sqsEncryptionKeyFD4D5946": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -386,8 +387,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.expected.json index 87a76dc7c..3e9c4bdc5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.expected.json @@ -178,18 +178,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -494,6 +494,7 @@ "tests3sqstempEncryptionKey57CC85E2": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -555,8 +556,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -784,109 +784,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.expected.json index 80b3fd0ad..cd1ee5d07 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.expected.json @@ -3,6 +3,7 @@ "EncryptionKey1B843E66": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -64,8 +65,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.expected.json index 8cf18e55b..c6b3e9b5b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.expected.json @@ -176,18 +176,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -305,6 +305,7 @@ "tests3sqsEncryptionKeyFD4D5946": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -366,8 +367,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -595,109 +595,6 @@ } } }, - "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.expected.json index 4df7ea0f0..1fe822f96 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.expected.json @@ -324,6 +324,7 @@ "tests3sqsEncryptionKeyFD4D5946": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -385,8 +386,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.expected.json index 11241541f..39116fa34 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.expected.json @@ -342,12 +342,6 @@ "tests3stepfunctionstests3stepfunctionseventrulestepfunctionconstructStateMachine67197269": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "tests3stepfunctionstests3stepfunctionseventrulestepfunctionconstructStateMachineRoleEAF485A9", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -363,6 +357,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "tests3stepfunctionstests3stepfunctionseventrulestepfunctionconstructStateMachineRoleEAF485A9", + "Arn" + ] } }, "DependsOn": [ @@ -452,9 +452,8 @@ "tests3stepfunctionstests3stepfunctionseventrulestepfunctionconstructExecutionFailedAlarm9C7AF57A": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -463,6 +462,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -473,9 +473,8 @@ "tests3stepfunctionstests3stepfunctionseventrulestepfunctionconstructExecutionThrottledAlarm99D8FF54": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -484,6 +483,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -494,9 +494,8 @@ "tests3stepfunctionstests3stepfunctionseventrulestepfunctionconstructExecutionAbortedAlarm1689CFA6": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -505,6 +504,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -647,6 +647,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -680,6 +683,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.expected.json index 75e7f4052..d6d2e344a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.expected.json @@ -160,18 +160,18 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" }, "Timeout": 900, "MemorySize": 128, - "Handler": "__entrypoint__.handler", + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", "Arn" ] }, - "Runtime": "nodejs16.x", + "Runtime": "nodejs18.x", "Description": { "Fn::Join": [ "", @@ -424,12 +424,6 @@ "tests3stepfunctionspreexistingbucketconstructtests3stepfunctionspreexistingbucketconstructeventrulestepfunctionconstructStateMachine326BB1C1": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "tests3stepfunctionspreexistingbucketconstructtests3stepfunctionspreexistingbucketconstructeventrulestepfunctionconstructStateMachineRoleE56A7030", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -445,6 +439,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "tests3stepfunctionspreexistingbucketconstructtests3stepfunctionspreexistingbucketconstructeventrulestepfunctionconstructStateMachineRoleE56A7030", + "Arn" + ] } }, "DependsOn": [ @@ -534,9 +534,8 @@ "tests3stepfunctionspreexistingbucketconstructtests3stepfunctionspreexistingbucketconstructeventrulestepfunctionconstructExecutionFailedAlarmAC11687E": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -545,6 +544,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -555,9 +555,8 @@ "tests3stepfunctionspreexistingbucketconstructtests3stepfunctionspreexistingbucketconstructeventrulestepfunctionconstructExecutionThrottledAlarm630846CA": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -566,6 +565,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -576,9 +576,8 @@ "tests3stepfunctionspreexistingbucketconstructtests3stepfunctionspreexistingbucketconstructeventrulestepfunctionconstructExecutionAbortedAlarmB47B3FC8": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -587,6 +586,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -596,107 +596,6 @@ } }, "Mappings": { - "DefaultCrNodeVersionMap": { - "af-south-1": { - "value": "nodejs16.x" - }, - "ap-east-1": { - "value": "nodejs16.x" - }, - "ap-northeast-1": { - "value": "nodejs16.x" - }, - "ap-northeast-2": { - "value": "nodejs16.x" - }, - "ap-northeast-3": { - "value": "nodejs16.x" - }, - "ap-south-1": { - "value": "nodejs16.x" - }, - "ap-south-2": { - "value": "nodejs16.x" - }, - "ap-southeast-1": { - "value": "nodejs16.x" - }, - "ap-southeast-2": { - "value": "nodejs16.x" - }, - "ap-southeast-3": { - "value": "nodejs16.x" - }, - "ca-central-1": { - "value": "nodejs16.x" - }, - "cn-north-1": { - "value": "nodejs16.x" - }, - "cn-northwest-1": { - "value": "nodejs16.x" - }, - "eu-central-1": { - "value": "nodejs16.x" - }, - "eu-central-2": { - "value": "nodejs16.x" - }, - "eu-north-1": { - "value": "nodejs16.x" - }, - "eu-south-1": { - "value": "nodejs16.x" - }, - "eu-south-2": { - "value": "nodejs16.x" - }, - "eu-west-1": { - "value": "nodejs16.x" - }, - "eu-west-2": { - "value": "nodejs16.x" - }, - "eu-west-3": { - "value": "nodejs16.x" - }, - "me-central-1": { - "value": "nodejs16.x" - }, - "me-south-1": { - "value": "nodejs16.x" - }, - "sa-east-1": { - "value": "nodejs16.x" - }, - "us-east-1": { - "value": "nodejs16.x" - }, - "us-east-2": { - "value": "nodejs16.x" - }, - "us-gov-east-1": { - "value": "nodejs16.x" - }, - "us-gov-west-1": { - "value": "nodejs16.x" - }, - "us-iso-east-1": { - "value": "nodejs14.x" - }, - "us-iso-west-1": { - "value": "nodejs14.x" - }, - "us-isob-east-1": { - "value": "nodejs14.x" - }, - "us-west-1": { - "value": "nodejs16.x" - }, - "us-west-2": { - "value": "nodejs16.x" - } - }, "ServiceprincipalMap": { "af-south-1": { "states": "states.af-south-1.amazonaws.com" @@ -728,6 +627,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -761,6 +663,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.expected.json index c2d6d28e0..a0a1c4e60 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.expected.json @@ -248,12 +248,6 @@ "tests3stepfunctionsconstructtests3stepfunctionsconstructeventrulestepfunctionconstructStateMachineCC5D0DD7": { "Type": "AWS::StepFunctions::StateMachine", "Properties": { - "RoleArn": { - "Fn::GetAtt": [ - "tests3stepfunctionsconstructtests3stepfunctionsconstructeventrulestepfunctionconstructStateMachineRole29FAFE92", - "Arn" - ] - }, "DefinitionString": "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"End\":true}}}", "LoggingConfiguration": { "Destinations": [ @@ -269,6 +263,12 @@ } ], "Level": "ERROR" + }, + "RoleArn": { + "Fn::GetAtt": [ + "tests3stepfunctionsconstructtests3stepfunctionsconstructeventrulestepfunctionconstructStateMachineRole29FAFE92", + "Arn" + ] } }, "DependsOn": [ @@ -358,9 +358,8 @@ "tests3stepfunctionsconstructtests3stepfunctionsconstructeventrulestepfunctionconstructExecutionFailedAlarm511B7A93": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that failed exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -369,6 +368,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsFailed", "Namespace": "AWS/States", "Period": 300, @@ -379,9 +379,8 @@ "tests3stepfunctionsconstructtests3stepfunctionsconstructeventrulestepfunctionconstructExecutionThrottledAlarmF97ADDFF": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that throttled exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -390,6 +389,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionThrottled", "Namespace": "AWS/States", "Period": 300, @@ -400,9 +400,8 @@ "tests3stepfunctionsconstructtests3stepfunctionsconstructeventrulestepfunctionconstructExecutionAbortedAlarm8B04A073": { "Type": "AWS::CloudWatch::Alarm", "Properties": { - "ComparisonOperator": "GreaterThanOrEqualToThreshold", - "EvaluationPeriods": 1, "AlarmDescription": "Alarm for the number of executions that aborted exceeded the threshold of 1. ", + "ComparisonOperator": "GreaterThanOrEqualToThreshold", "Dimensions": [ { "Name": "StateMachineArn", @@ -411,6 +410,7 @@ } } ], + "EvaluationPeriods": 1, "MetricName": "ExecutionsAborted", "Namespace": "AWS/States", "Period": 300, @@ -553,6 +553,9 @@ "ap-southeast-3": { "states": "states.ap-southeast-3.amazonaws.com" }, + "ap-southeast-4": { + "states": "states.ap-southeast-4.amazonaws.com" + }, "ca-central-1": { "states": "states.ca-central-1.amazonaws.com" }, @@ -586,6 +589,9 @@ "eu-west-3": { "states": "states.eu-west-3.amazonaws.com" }, + "il-central-1": { + "states": "states.il-central-1.amazonaws.com" + }, "me-central-1": { "states": "states.me-central-1.amazonaws.com" }, diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.expected.json index d96ac9479..0eea518ec 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.expected.json @@ -99,18 +99,18 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testsnslambdaLambdaFunctionServiceRole23794781", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testsnslambdaLambdaFunctionServiceRole23794781", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -158,15 +158,15 @@ "testsnslambdaLambdaFunctionSnsTopic9C14F333": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "lambda", - "TopicArn": { - "Ref": "testsnslambdaSnsTopic52CA159E" - }, "Endpoint": { "Fn::GetAtt": [ "testsnslambdaLambdaFunctionEE9A249B", "Arn" ] + }, + "Protocol": "lambda", + "TopicArn": { + "Ref": "testsnslambdaSnsTopic52CA159E" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.expected.json index b74d97aac..ffc3c0676 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.expected.json @@ -115,18 +115,18 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testsqslambdafifoLambdaFunctionServiceRole74463822", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testsqslambdafifoLambdaFunctionServiceRole74463822", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -158,14 +158,14 @@ "testsqslambdafifoLambdaFunctionSqsEventSourcedeployFifoQueuetestsqslambdafifoqueue90CAB7D6AF891A0A": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testsqslambdafifoLambdaFunction0F3AE705" - }, "EventSourceArn": { "Fn::GetAtt": [ "testsqslambdafifoqueue45DD24D7", "Arn" ] + }, + "FunctionName": { + "Ref": "testsqslambdafifoLambdaFunction0F3AE705" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.expected.json index 76909919a..dcc3a8016 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.expected.json @@ -115,18 +115,18 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testsqslambdaLambdaFunctionServiceRoleF623B438", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testsqslambdaLambdaFunctionServiceRoleF623B438", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -158,14 +158,14 @@ "testsqslambdaLambdaFunctionSqsEventSourcedeployFunctiontestsqslambdaqueueC37BE757C660F26A": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testsqslambdaLambdaFunction58720146" - }, "EventSourceArn": { "Fn::GetAtt": [ "testsqslambdaqueue601203B8", "Arn" ] + }, + "FunctionName": { + "Ref": "testsqslambdaLambdaFunction58720146" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.expected.json index b573f41ee..8f53e1154 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.expected.json @@ -115,18 +115,18 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "LambdaFunctionServiceRole0C4CDE0B", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "LambdaFunctionServiceRole0C4CDE0B", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -158,14 +158,14 @@ "LambdaFunctionSqsEventSourceexistingFunctiontestsqslambdaqueue15248716FB07DA49": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "LambdaFunctionBF21E41F" - }, "EventSourceArn": { "Fn::GetAtt": [ "testsqslambdaqueue601203B8", "Arn" ] + }, + "FunctionName": { + "Ref": "LambdaFunctionBF21E41F" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.expected.json index 2271e0bbb..575dddfb3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.expected.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.0.0/19", "MapPublicIpOnLaunch": true, @@ -37,7 +34,10 @@ "Key": "Name", "Value": "no-arguments/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -53,15 +53,15 @@ "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-arguments/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -78,12 +78,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -105,15 +105,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -129,9 +129,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.32.0/19", "MapPublicIpOnLaunch": true, @@ -148,7 +145,10 @@ "Key": "Name", "Value": "no-arguments/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -164,15 +164,15 @@ "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-arguments/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -189,12 +189,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -216,15 +216,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -240,9 +240,6 @@ "VpcPublicSubnet3SubnetBE12F0B6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.64.0/19", "MapPublicIpOnLaunch": true, @@ -259,7 +256,10 @@ "Key": "Name", "Value": "no-arguments/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } }, "Metadata": { "cfn_nag": { @@ -275,15 +275,15 @@ "VpcPublicSubnet3RouteTable93458DBB": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-arguments/Vpc/PublicSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet3RouteTableAssociation1F1EDF02": { @@ -300,12 +300,12 @@ "VpcPublicSubnet3DefaultRoute4697774F": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet3RouteTable93458DBB" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet3RouteTable93458DBB" } }, "DependsOn": [ @@ -327,15 +327,15 @@ "VpcPublicSubnet3NATGateway7640CD1D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet3SubnetBE12F0B6" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet3EIP3A666A23", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet3SubnetBE12F0B6" + }, "Tags": [ { "Key": "Name", @@ -351,9 +351,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1a", "CidrBlock": "172.168.96.0/19", "MapPublicIpOnLaunch": false, @@ -370,21 +367,24 @@ "Key": "Name", "Value": "no-arguments/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-arguments/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -401,21 +401,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1b", "CidrBlock": "172.168.128.0/19", "MapPublicIpOnLaunch": false, @@ -432,21 +429,24 @@ "Key": "Name", "Value": "no-arguments/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-arguments/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -463,21 +463,18 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "VpcPrivateSubnet3SubnetF258B56E": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": "test-region-1c", "CidrBlock": "172.168.160.0/19", "MapPublicIpOnLaunch": false, @@ -494,21 +491,24 @@ "Key": "Name", "Value": "no-arguments/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableD98824C7": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "no-arguments/Vpc/PrivateSubnet3" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet3RouteTableAssociation16BDDC43": { @@ -525,12 +525,12 @@ "VpcPrivateSubnet3DefaultRoute94B74F0D": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet3RouteTableD98824C7" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet3NATGateway7640CD1D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet3RouteTableD98824C7" } } }, @@ -548,11 +548,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc" + "Value": "no-arguments/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc" + "Value": "no-arguments/Vpc/FlowLog" } ] }, @@ -646,11 +646,6 @@ "VpcFlowLog8FF33A73": { "Type": "AWS::EC2::FlowLog", "Properties": { - "ResourceId": { - "Ref": "Vpc8378EB38" - }, - "ResourceType": "VPC", - "TrafficType": "ALL", "DeliverLogsPermissionArn": { "Fn::GetAtt": [ "VpcFlowLogIAMRole6A475D41", @@ -661,12 +656,17 @@ "LogGroupName": { "Ref": "VpcFlowLogLogGroup7B5C56B9" }, + "ResourceId": { + "Ref": "Vpc8378EB38" + }, + "ResourceType": "VPC", "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc" + "Value": "no-arguments/Vpc/FlowLog" } - ] + ], + "TrafficType": "ALL" } }, "newlbF396DAF2": { @@ -745,12 +745,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "REGIONAL", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Rules": [ { "Name": "AWS-AWSManagedRulesBotControlRuleSet", @@ -878,7 +872,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "REGIONAL", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } }, "testwafwebaclalbWebACLAssociation": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json index a8c3a785d..f2926a264 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json @@ -40,13 +40,13 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, + "Handler": ".handler", "Role": { "Fn::GetAtt": [ "testOneFunctionServiceRole3F9CD9E7", "Arn" ] }, - "Handler": ".handler", "Runtime": "nodejs16.x" }, "DependsOn": [ @@ -129,10 +129,10 @@ "testOneApiDeploymentEF63BD86e15daf42da17689cb6d56b07d074b512": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testOneApi71064556" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testOneApiproxyANY7F46A6A5", @@ -153,12 +153,12 @@ "testOneApiDeploymentStageprod5B67F2DF": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testOneApi71064556" - }, "DeploymentId": { "Ref": "testOneApiDeploymentEF63BD86e15daf42da17689cb6d56b07d074b512" }, + "RestApiId": { + "Ref": "testOneApi71064556" + }, "StageName": "prod" }, "DependsOn": [ @@ -275,14 +275,8 @@ "testOneApiproxyANY7F46A6A5": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testOneApiproxyC9BD4274" - }, - "RestApiId": { - "Ref": "testOneApi71064556" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -309,6 +303,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "testOneApiproxyC9BD4274" + }, + "RestApiId": { + "Ref": "testOneApi71064556" } }, "Metadata": { @@ -403,17 +403,8 @@ "testOneApiANY899DD2DA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testOneApi71064556", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testOneApi71064556" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -440,6 +431,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testOneApi71064556", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testOneApi71064556" } }, "Metadata": { @@ -493,13 +493,13 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, + "Handler": ".handler", "Role": { "Fn::GetAtt": [ "testTwoFunctionServiceRoleF678C905", "Arn" ] }, - "Handler": ".handler", "Runtime": "nodejs16.x" }, "DependsOn": [ @@ -582,10 +582,10 @@ "testTwoApiDeployment4EDBF4DF26b103f50979cda2b3c8314c6d694485": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testTwoApi17A08EF5" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testTwoApiproxyANY63FFF74A", @@ -606,12 +606,12 @@ "testTwoApiDeploymentStageprod8DB1EDB4": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testTwoApi17A08EF5" - }, "DeploymentId": { "Ref": "testTwoApiDeployment4EDBF4DF26b103f50979cda2b3c8314c6d694485" }, + "RestApiId": { + "Ref": "testTwoApi17A08EF5" + }, "StageName": "prod" }, "DependsOn": [ @@ -728,14 +728,8 @@ "testTwoApiproxyANY63FFF74A": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testTwoApiproxy2575DCE3" - }, - "RestApiId": { - "Ref": "testTwoApi17A08EF5" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -762,6 +756,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "testTwoApiproxy2575DCE3" + }, + "RestApiId": { + "Ref": "testTwoApi17A08EF5" } }, "Metadata": { @@ -856,17 +856,8 @@ "testTwoApiANY91121C6F": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testTwoApi17A08EF5", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testTwoApi17A08EF5" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -893,6 +884,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testTwoApi17A08EF5", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testTwoApi17A08EF5" } }, "Metadata": { @@ -912,12 +912,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "REGIONAL", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Rules": [ { "Name": "AWS-AWSManagedRulesBotControlRuleSet", @@ -1045,7 +1039,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "REGIONAL", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } }, "firstconstructWebACLAssociation": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json index 0f7c7a7ec..7828ece80 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json @@ -40,13 +40,13 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, + "Handler": ".handler", "Role": { "Fn::GetAtt": [ "testFunctionServiceRoleFEC29B6F", "Arn" ] }, - "Handler": ".handler", "Runtime": "nodejs16.x" }, "DependsOn": [ @@ -129,10 +129,10 @@ "testApiDeployment3727A0B98616f677c89f00f84016798f65d107c0": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testApiD6ECAB50" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testApiproxyANYC53F2608", @@ -153,12 +153,12 @@ "testApiDeploymentStageprodCE051BE8": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testApiD6ECAB50" - }, "DeploymentId": { "Ref": "testApiDeployment3727A0B98616f677c89f00f84016798f65d107c0" }, + "RestApiId": { + "Ref": "testApiD6ECAB50" + }, "StageName": "prod" }, "DependsOn": [ @@ -275,14 +275,8 @@ "testApiproxyANYC53F2608": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testApiproxyA0E5503A" - }, - "RestApiId": { - "Ref": "testApiD6ECAB50" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -309,6 +303,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "testApiproxyA0E5503A" + }, + "RestApiId": { + "Ref": "testApiD6ECAB50" } }, "Metadata": { @@ -403,17 +403,8 @@ "testApiANYDC600770": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testApiD6ECAB50", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testApiD6ECAB50" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -440,6 +431,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testApiD6ECAB50", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testApiD6ECAB50" } }, "Metadata": { @@ -459,12 +459,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "REGIONAL", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Rules": [ { "Name": "AWS-AWSManagedRulesBotControlRuleSet", @@ -592,7 +586,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "REGIONAL", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } }, "testwafwebaclapigatewaylambdaWebACLAssociation": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.expected.json index b48ef6055..2bb675390 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.expected.json @@ -40,13 +40,13 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, + "Handler": ".handler", "Role": { "Fn::GetAtt": [ "testFunctionServiceRoleFEC29B6F", "Arn" ] }, - "Handler": ".handler", "Runtime": "nodejs16.x" }, "DependsOn": [ @@ -129,10 +129,10 @@ "testApiDeployment3727A0B98616f677c89f00f84016798f65d107c0": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testApiD6ECAB50" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testApiproxyANYC53F2608", @@ -153,12 +153,12 @@ "testApiDeploymentStageprodCE051BE8": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testApiD6ECAB50" - }, "DeploymentId": { "Ref": "testApiDeployment3727A0B98616f677c89f00f84016798f65d107c0" }, + "RestApiId": { + "Ref": "testApiD6ECAB50" + }, "StageName": "prod" }, "DependsOn": [ @@ -275,14 +275,8 @@ "testApiproxyANYC53F2608": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testApiproxyA0E5503A" - }, - "RestApiId": { - "Ref": "testApiD6ECAB50" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -309,6 +303,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "testApiproxyA0E5503A" + }, + "RestApiId": { + "Ref": "testApiD6ECAB50" } }, "Metadata": { @@ -403,17 +403,8 @@ "testApiANYDC600770": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testApiD6ECAB50", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testApiD6ECAB50" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -440,6 +431,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testApiD6ECAB50", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testApiD6ECAB50" } }, "Metadata": { @@ -459,12 +459,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "REGIONAL", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Name": "test-name-apigateway", "Rules": [ { @@ -593,7 +587,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "REGIONAL", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } }, "testwafwebaclapigatewaylambdaWebACLAssociation": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.expected.json index d8a6edb1b..7e29e1c88 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.expected.json @@ -13,12 +13,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "REGIONAL", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Rules": [ { "Name": "AWS-AWSManagedRulesBotControlRuleSet", @@ -146,7 +140,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "REGIONAL", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } }, "testwafwebaclappsyncWebACLAssociation": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.expected.json index c7f333c0c..8a2b6cbf4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.expected.json @@ -13,12 +13,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "REGIONAL", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Name": "test-name-appsync", "Rules": [ { @@ -147,7 +141,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "REGIONAL", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } }, "testwafwebaclappsyncWebACLAssociation": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.expected.json index 5b1394173..1dd044136 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.expected.json @@ -176,12 +176,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "CLOUDFRONT", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Rules": [ { "Name": "AWS-AWSManagedRulesBotControlRuleSet", @@ -309,7 +303,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "CLOUDFRONT", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.expected.json index f50031c7d..65721a0dd 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.expected.json @@ -91,12 +91,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "CLOUDFRONT", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Rules": [ { "Name": "AWS-AWSManagedRulesBotControlRuleSet", @@ -224,7 +218,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "CLOUDFRONT", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.expected.json index d90fd31af..dce1c2672 100644 --- a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.expected.json @@ -91,12 +91,6 @@ "DefaultAction": { "Allow": {} }, - "Scope": "CLOUDFRONT", - "VisibilityConfig": { - "CloudWatchMetricsEnabled": true, - "MetricName": "webACL", - "SampledRequestsEnabled": true - }, "Name": "test-name-cloudfront", "Rules": [ { @@ -225,7 +219,13 @@ "SampledRequestsEnabled": true } } - ] + ], + "Scope": "CLOUDFRONT", + "VisibilityConfig": { + "CloudWatchMetricsEnabled": true, + "MetricName": "webACL", + "SampledRequestsEnabled": true + } } } }, diff --git a/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-asset.expected.json b/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-asset.expected.json index 2d452a073..7e40d2de2 100644 --- a/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-asset.expected.json +++ b/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-asset.expected.json @@ -211,13 +211,13 @@ }, "S3Key": "96f7d2d4f45b57a586d030966d31e06bc622b5f20258ca38d605fef38e6b9a17.zip" }, + "Handler": "index.handler", "Role": { "Fn::GetAtt": [ "TestTemplateWriterLambdaRole192FE23A", "Arn" ] }, - "Handler": "index.handler", "Runtime": "nodejs18.x", "TracingConfig": { "Mode": "Active" @@ -326,13 +326,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip" - }, - "Role": { - "Fn::GetAtt": [ - "TestTemplateWriterProviderframeworkonEventServiceRoleED11CF9A", - "Arn" - ] + "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, "Description": "AWS CDK resource provider framework - onEvent (template-writer-from-asset/TestTemplateWriterProvider)", "Environment": { @@ -346,7 +340,13 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Role": { + "Fn::GetAtt": [ + "TestTemplateWriterProviderframeworkonEventServiceRoleED11CF9A", + "Arn" + ] + }, + "Runtime": "nodejs18.x", "Timeout": 900 }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-large-asset.expected.json b/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-large-asset.expected.json index 706be9649..e7903d42f 100644 --- a/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-large-asset.expected.json +++ b/source/patterns/@aws-solutions-constructs/resources/test/integ.template-writer-from-large-asset.expected.json @@ -211,14 +211,14 @@ }, "S3Key": "96f7d2d4f45b57a586d030966d31e06bc622b5f20258ca38d605fef38e6b9a17.zip" }, + "Handler": "index.handler", + "MemorySize": 1024, "Role": { "Fn::GetAtt": [ "TestTemplateWriterLambdaRole192FE23A", "Arn" ] }, - "Handler": "index.handler", - "MemorySize": 1024, "Runtime": "nodejs18.x", "Timeout": 60, "TracingConfig": { @@ -328,13 +328,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "8e3d635893ea17fa3158623489cd42c680fad925b38de1ef51cb10d84f6e245e.zip" - }, - "Role": { - "Fn::GetAtt": [ - "TestTemplateWriterProviderframeworkonEventServiceRoleED11CF9A", - "Arn" - ] + "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, "Description": "AWS CDK resource provider framework - onEvent (template-writer-from-large-asset/TestTemplateWriterProvider)", "Environment": { @@ -348,7 +342,13 @@ } }, "Handler": "framework.onEvent", - "Runtime": "nodejs14.x", + "Role": { + "Fn::GetAtt": [ + "TestTemplateWriterProviderframeworkonEventServiceRoleED11CF9A", + "Arn" + ] + }, + "Runtime": "nodejs18.x", "Timeout": 900 }, "DependsOn": [ diff --git a/source/tools/cdk-integ-tools/package.json b/source/tools/cdk-integ-tools/package.json index 25e932120..bbaf5dc05 100644 --- a/source/tools/cdk-integ-tools/package.json +++ b/source/tools/cdk-integ-tools/package.json @@ -32,12 +32,12 @@ "@types/node": "18.11.9", "tslint": "^5.20.1", "typescript": "~3.9.10", - "aws-cdk-lib": "2.81.0", + "aws-cdk-lib": "2.99.1", "constructs": "^10.0.0" }, "dependencies": { - "@aws-cdk/cloudformation-diff": "2.81.0", - "aws-cdk": "2.81.0", + "@aws-cdk/cloudformation-diff": "2.99.1", + "aws-cdk": "2.99.1", "fs-extra": "^9.0.1", "yargs": "^16.1.1", "deepmerge": "^4.0.0"