diff --git a/.viperlightignore b/.viperlightignore index d07f9c791..26e54fef2 100644 --- a/.viperlightignore +++ b/.viperlightignore @@ -5,17 +5,17 @@ node_modules/ deployment/publishing/nuget/publish.sh:43 deployment/publishing/nuget/publish.sh:44 source/use_cases/aws-serverless-web-app/test/integ.backend-deployment.expected.json:180 -source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.expected.json:172 -source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.expected.json:172 -source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json:172 -source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.expected.json:60 +source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-deployFunction.expected.json:172 +source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-existingFunction.expected.json:172 +source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-no-arguments.expected.json:172 +source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-existing-table.expected.json:60 CODE_OF_CONDUCT.md:4 CONTRIBUTING.md:244 source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts:107 source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/test.kinesisstream-gluejob.test.ts:126 -source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json:112 -source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json:112 -source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json:201 +source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunction.expected.json:112 +source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-existingFunction.expected.json:112 +source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-apigateway-sqs-crud.expected.json:201 source/tools/cdk-integ-tools/package-lock.json:373 source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.js:115 source/patterns/@aws-solutions-constructs/core/test/lambda-helper.test.ts:233 @@ -34,79 +34,79 @@ source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/eventbridge-s source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/dynamodb-stream-lambda.test.ts:103 source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/dynamodbstreams-lambda.test.ts:103 source/patterns/@aws-solutions-constructs/aws-apigateway-iot/README.md:39 -source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.expected.json:266 -source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.expected.json:269 +source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-defaultParams.expected.json:266 +source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-overrideParams.expected.json:269 source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts:29 -source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json:267 +source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-override_auth_api_keys.expected.json:267 source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts:487 source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts:214 source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/test.s3-sqs.test.ts:251 source/use_cases/aws-custom-glue-etl/stream-producer/generate_data.py:86 source/use_cases/aws-custom-glue-etl/stream-producer/generate_data.py:87 source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/lambda-secretsmanager.test.ts:460 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:6 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:9 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:12 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:15 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:18 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:21 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:24 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:27 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:30 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:33 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:36 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:39 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:42 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:45 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:48 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:51 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:54 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:57 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:60 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:63 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json:66 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:500 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:503 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:506 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:509 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:512 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:515 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:518 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:521 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:524 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:527 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:530 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:533 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:536 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:539 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:542 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:545 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:548 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:551 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:554 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:557 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json:560 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:6 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:9 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:12 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:15 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:18 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:21 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:24 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:27 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:30 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:33 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:36 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:39 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:42 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:45 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:48 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:51 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:54 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:57 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:60 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:63 -source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json:66 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:6 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:9 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:12 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:15 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:18 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:21 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:24 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:27 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:30 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:33 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:36 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:39 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:42 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:45 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:48 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:51 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:54 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:57 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:60 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:63 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json:66 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:500 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:503 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:506 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:509 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:512 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:515 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:518 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:521 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:524 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:527 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:530 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:533 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:536 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:539 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:542 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:545 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:548 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:551 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:554 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:557 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json:560 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:6 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:9 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:12 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:15 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:18 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:21 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:24 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:27 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:30 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:33 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:36 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:39 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:42 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:45 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:48 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:51 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:54 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:57 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:60 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:63 +source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json:66 source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test-helper.ts:24 source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test-helper.ts:27 source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test-helper.ts:30 @@ -128,35 +128,35 @@ source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test-helper.ts:78 source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test-helper.ts:81 source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/test-helper.ts:84 -source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json:33 -source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafwebacl-apigateway-iot.expected.json:265 -source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json:814 +source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-existing-s3-bucket.expected.json:33 +source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-wafwebacl-apigateway-iot.expected.json:265 +source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-existing-waf-to-multiple-gateways.expected.json:814 # This is a test case source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/test.kinesisstream-gluejob.test.ts:127 # aws-lambda-eventbridge. Auto generated Ids are ignored & x-ray resource permission with a `*` in test cases is ignored -source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.expected.json:122 -source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.expected.json:149 -source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.expected.json:163 -source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json:108 -source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json:122 +source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunction.expected.json:122 +source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithNewEventBus.expected.json:149 +source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithVpc.expected.json:163 +source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingEventBus.expected.json:108 +source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingFunction.expected.json:122 source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/aws-lambda-eventbridge.test.ts:28 source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/aws-lambda-eventbridge.test.ts:339 source/patterns/@aws-solutions-constructs/aws-alb-lambda/README.md:35 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/alb-lambda.test.ts:27 source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/alb-lambda.test.ts:680 # These are references to the us-east-1 ELBV2 account (publicly known) -source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json:235 -source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json:904 -source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json:233 -source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json:238 -source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json:244 -source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json:244 -source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json:1132 -source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json:1132 -source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json:1034 -source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json:1062 -source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json:237 -source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json:1089 +source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApi.expected.json:236 +source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.expected.json:905 +source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.expected.json:234 +source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiNewResources.expected.json:239 +source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiNewResources.expected.json:245 +source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-twoTargets.expected.json:245 +source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.expected.json:1133 +source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.expected.json:1133 +source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.expected.json:1034 +source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.expected.json:1063 +source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.expected.json:237 +source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.expected.json:1090 source/patterns/@aws-solutions-constructs/aws-alb-fargate/README.md:79 source/patterns/@aws-solutions-constructs/aws-alb-lambda/README.md:85 source/patterns/@aws-solutions-constructs/aws-route53-alb/README.md:60 diff --git a/CHANGELOG.md b/CHANGELOG.md index 09cecc0a0..a9bf148ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.46.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.45.0...v2.46.0) (2023-11-09) + +Built on CDK v2.105.0 +Renaming and refreshing of all integration test files + +### Bug Fixes + +* **aws-eventbridge-sns:** long sns topic names break eventbridge bindings ([#1024](https://github.com/awslabs/aws-solutions-constructs/issues/1024)) ([9da7065](https://github.com/awslabs/aws-solutions-constructs/commit/9da706586cf6cceb9bf4eba3cb9332003af195e0)) + ## [2.45.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.44.0...v2.45.0) (2023-10-14) Built on CDK v2.99.1 diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js index 7650ba383..cd4a923e5 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.99.1'; +const awsCdkLibVersion = '2.105.0'; const constructsVersion = '10.0.0'; const MODULE_EXEMPTIONS = new Set([ '@aws-cdk/cloudformation-diff', diff --git a/sonar-project.properties b/sonar-project.properties index f6b2fc410..1527677dd 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -60,7 +60,6 @@ sonar.javascript.lcov.reportPaths= \ source/patterns/@aws-solutions-constructs/aws-iot-lambda/coverage/lcov.info, \ source/patterns/@aws-solutions-constructs/aws-iot-s3/coverage/lcov.info, \ source/patterns/@aws-solutions-constructs/aws-iot-sqs/coverage/lcov.info, \ - source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/coverage/lcov.info, \ source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/coverage/lcov.info, \ source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/coverage/lcov.info, \ source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/coverage/lcov.info, \ diff --git a/source/lerna.json b/source/lerna.json index 189481e63..9c5ad553a 100644 --- a/source/lerna.json +++ b/source/lerna.json @@ -6,5 +6,5 @@ "./patterns/@aws-solutions-constructs/*" ], "rejectCycles": "true", - "version": "2.45.0" + "version": "2.46.0" } 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.albfar-all-existing-private-http.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-existing-private-http.expected.json index db34b0132..233ea53d7 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.albfar-all-existing-private-http.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc" + "Value": "albfar-all-existing-private-http/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet1" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet1" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet1" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet1" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet2" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet2" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet2" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet2" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet3" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet3" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet3" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PublicSubnet3" + "Value": "albfar-all-existing-private-http/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PrivateSubnet1" + "Value": "albfar-all-existing-private-http/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PrivateSubnet1" + "Value": "albfar-all-existing-private-http/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PrivateSubnet2" + "Value": "albfar-all-existing-private-http/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PrivateSubnet2" + "Value": "albfar-all-existing-private-http/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PrivateSubnet3" + "Value": "albfar-all-existing-private-http/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/PrivateSubnet3" + "Value": "albfar-all-existing-private-http/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc" + "Value": "albfar-all-existing-private-http/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/FlowLog" + "Value": "albfar-all-existing-private-http/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/FlowLog" + "Value": "albfar-all-existing-private-http/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-existing-private-http/Vpc/FlowLog" + "Value": "albfar-all-existing-private-http/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "allexistingprivatehttpECRAPIsecuritygroupD77FBBD5", + "albfarallexistingprivatehttpECRAPIsecuritygroup3F53A4F6", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "allexistingprivatehttpECRDKRsecuritygroup04338671", + "albfarallexistingprivatehttpECRDKRsecuritygroup2769317C", "GroupId" ] } @@ -771,10 +771,10 @@ } } }, - "allexistingprivatehttpECRAPIsecuritygroupD77FBBD5": { + "albfarallexistingprivatehttpECRAPIsecuritygroup3F53A4F6": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "all-existing-private-http/all-existing-private-http-ECR_API-security-group", + "GroupDescription": "albfar-all-existing-private-http/albfar-all-existing-private-http-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -829,10 +829,10 @@ } } }, - "allexistingprivatehttpECRDKRsecuritygroup04338671": { + "albfarallexistingprivatehttpECRDKRsecuritygroup2769317C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "all-existing-private-http/all-existing-private-http-ECR_DKR-security-group", + "GroupDescription": "albfar-all-existing-private-http/albfar-all-existing-private-http-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -925,7 +925,7 @@ } ], "Cpu": "256", - "Family": "allexistingprivatehttptesttaskdefFB96B83E", + "Family": "albfarallexistingprivatehttptesttaskdefC73C7852", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -969,7 +969,7 @@ } } }, - "testsgfromallexistingprivatehttptestalbSecurityGroup4B36914B80803EB3A82F": { + "testsgfromalbfarallexistingprivatehttptestalbSecurityGroupAC4D388D8080E8480E9E": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { "Description": "Load balancer to target", @@ -1105,7 +1105,7 @@ "testalbSecurityGroup0C84CDF9": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB allexistingprivatehttptestalbFA71009A", + "GroupDescription": "Automatically created Security Group for ELB albfarallexistingprivatehttptestalb104FD1D4", "SecurityGroupIngress": [ { "CidrIp": "0.0.0.0/0", @@ -1138,7 +1138,7 @@ } } }, - "testalbSecurityGrouptoallexistingprivatehttptestsgC280D41D8080C6A2C196": { + "testalbSecurityGrouptoalbfarallexistingprivatehttptestsgD60B2013808013EE9793": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { "Description": "Load balancer to target", diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.ts b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-existing-private-http.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-existing-private-http.ts 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.albfar-all-new-public-http.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.expected.json index 5f1ba0d9d..19cd44101 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.albfar-all-new-public-http.expected.json @@ -42,7 +42,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc" + "Value": "albfar-all-new-public-http/Vpc" } ] } @@ -64,7 +64,7 @@ }, { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet1" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet1" } ], "VpcId": { @@ -88,7 +88,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet1" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet1" } ], "VpcId": { @@ -129,7 +129,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet1" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet1" } ] } @@ -149,7 +149,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet1" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet1" } ] }, @@ -175,7 +175,7 @@ }, { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet2" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet2" } ], "VpcId": { @@ -199,7 +199,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet2" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet2" } ], "VpcId": { @@ -240,7 +240,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet2" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet2" } ] } @@ -260,7 +260,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet2" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet2" } ] }, @@ -286,7 +286,7 @@ }, { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet3" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet3" } ], "VpcId": { @@ -310,7 +310,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet3" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet3" } ], "VpcId": { @@ -351,7 +351,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet3" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet3" } ] } @@ -371,7 +371,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PublicSubnet3" + "Value": "albfar-all-new-public-http/Vpc/PublicSubnet3" } ] }, @@ -397,7 +397,7 @@ }, { "Key": "Name", - "Value": "all-new-public-http/Vpc/PrivateSubnet1" + "Value": "albfar-all-new-public-http/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -411,7 +411,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PrivateSubnet1" + "Value": "albfar-all-new-public-http/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -459,7 +459,7 @@ }, { "Key": "Name", - "Value": "all-new-public-http/Vpc/PrivateSubnet2" + "Value": "albfar-all-new-public-http/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -473,7 +473,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PrivateSubnet2" + "Value": "albfar-all-new-public-http/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -521,7 +521,7 @@ }, { "Key": "Name", - "Value": "all-new-public-http/Vpc/PrivateSubnet3" + "Value": "albfar-all-new-public-http/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -535,7 +535,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/PrivateSubnet3" + "Value": "albfar-all-new-public-http/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -572,7 +572,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc" + "Value": "albfar-all-new-public-http/Vpc" } ] } @@ -606,7 +606,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/FlowLog" + "Value": "albfar-all-new-public-http/Vpc/FlowLog" } ] } @@ -658,7 +658,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/FlowLog" + "Value": "albfar-all-new-public-http/Vpc/FlowLog" } ] }, @@ -695,7 +695,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-public-http/Vpc/FlowLog" + "Value": "albfar-all-new-public-http/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -708,7 +708,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "allnewpublichttpECRAPIsecuritygroup764A5BEA", + "albfarallnewpublichttpECRAPIsecuritygroupC34307CE", "GroupId" ] } @@ -738,7 +738,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "allnewpublichttpECRDKRsecuritygroup0DCDEE57", + "albfarallnewpublichttpECRDKRsecuritygroup310B1E0F", "GroupId" ] } @@ -862,7 +862,7 @@ "testconstructlbalbSecurityGroup5F187AF4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB allnewpublichttptestconstructlbalb44DAC1E9", + "GroupDescription": "Automatically created Security Group for ELB albfarallnewpublichttptestconstructlbalbEC3675DA", "SecurityGroupIngress": [ { "CidrIp": "0.0.0.0/0", @@ -900,7 +900,7 @@ } } }, - "testconstructlbalbSecurityGrouptoallnewpublichttptestconstructsgEFBACDED8080226DB910": { + "testconstructlbalbSecurityGrouptoalbfarallnewpublichttptestconstructsg1860422C8080865548FA": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { "Description": "Load balancer to target", @@ -1011,6 +1011,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1179,7 +1180,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1226,10 +1227,10 @@ } } }, - "allnewpublichttpECRAPIsecuritygroup764A5BEA": { + "albfarallnewpublichttpECRAPIsecuritygroupC34307CE": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "all-new-public-http/all-new-public-http-ECR_API-security-group", + "GroupDescription": "albfar-all-new-public-http/albfar-all-new-public-http-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1284,10 +1285,10 @@ } } }, - "allnewpublichttpECRDKRsecuritygroup0DCDEE57": { + "albfarallnewpublichttpECRDKRsecuritygroup310B1E0F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "all-new-public-http/all-new-public-http-ECR_DKR-security-group", + "GroupDescription": "albfar-all-new-public-http/albfar-all-new-public-http-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1380,7 +1381,7 @@ } ], "Cpu": "256", - "Family": "allnewpublichttptestconstructtaskdefDF932EBD", + "Family": "albfarallnewpublichttptestconstructtaskdef366971AB", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1424,7 +1425,7 @@ } } }, - "testconstructsgfromallnewpublichttptestconstructlbalbSecurityGroupA1A7ABDB8080D3FFEE20": { + "testconstructsgfromalbfarallnewpublichttptestconstructlbalbSecurityGroupBF68816E808021766483": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { "Description": "Load balancer to target", diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.ts b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-public-http.ts 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.albfar-all-new-two-targets.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.expected.json index 8a08f7628..d99620bf3 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.albfar-all-new-two-targets.expected.json @@ -32,7 +32,7 @@ } } }, - "testconstructtestconstructlistenerallnewtwotargetstargetsRule897FD7B6": { + "testconstructtestconstructlisteneralbfarallnewtwotargetstargetsRule9ADF76CF": { "Type": "AWS::ElasticLoadBalancingV2::ListenerRule", "Properties": { "Actions": [ @@ -69,7 +69,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc" + "Value": "albfar-all-new-two-targets/Vpc" } ] } @@ -91,7 +91,7 @@ }, { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet1" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet1" } ], "VpcId": { @@ -115,7 +115,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet1" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet1" } ], "VpcId": { @@ -156,7 +156,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet1" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet1" } ] } @@ -176,7 +176,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet1" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet1" } ] }, @@ -202,7 +202,7 @@ }, { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet2" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet2" } ], "VpcId": { @@ -226,7 +226,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet2" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet2" } ], "VpcId": { @@ -267,7 +267,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet2" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet2" } ] } @@ -287,7 +287,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet2" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet2" } ] }, @@ -313,7 +313,7 @@ }, { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet3" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet3" } ], "VpcId": { @@ -337,7 +337,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet3" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet3" } ], "VpcId": { @@ -378,7 +378,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet3" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet3" } ] } @@ -398,7 +398,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PublicSubnet3" + "Value": "albfar-all-new-two-targets/Vpc/PublicSubnet3" } ] }, @@ -424,7 +424,7 @@ }, { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PrivateSubnet1" + "Value": "albfar-all-new-two-targets/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -438,7 +438,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PrivateSubnet1" + "Value": "albfar-all-new-two-targets/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -486,7 +486,7 @@ }, { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PrivateSubnet2" + "Value": "albfar-all-new-two-targets/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -500,7 +500,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PrivateSubnet2" + "Value": "albfar-all-new-two-targets/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -548,7 +548,7 @@ }, { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PrivateSubnet3" + "Value": "albfar-all-new-two-targets/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -562,7 +562,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/PrivateSubnet3" + "Value": "albfar-all-new-two-targets/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -599,7 +599,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc" + "Value": "albfar-all-new-two-targets/Vpc" } ] } @@ -633,7 +633,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/FlowLog" + "Value": "albfar-all-new-two-targets/Vpc/FlowLog" } ] } @@ -685,7 +685,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/FlowLog" + "Value": "albfar-all-new-two-targets/Vpc/FlowLog" } ] }, @@ -722,7 +722,7 @@ "Tags": [ { "Key": "Name", - "Value": "all-new-two-targets/Vpc/FlowLog" + "Value": "albfar-all-new-two-targets/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -735,7 +735,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "allnewtwotargetsECRAPIsecuritygroupCC5C870C", + "albfarallnewtwotargetsECRAPIsecuritygroup47B0559C", "GroupId" ] } @@ -765,7 +765,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "allnewtwotargetsECRDKRsecuritygroup3CC9849F", + "albfarallnewtwotargetsECRDKRsecuritygroup4F68E980", "GroupId" ] } @@ -889,7 +889,7 @@ "testconstructlbalbSecurityGroup5F187AF4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB allnewtwotargetstestconstructlbalb803F4823", + "GroupDescription": "Automatically created Security Group for ELB albfarallnewtwotargetstestconstructlbalb5E943C48", "SecurityGroupIngress": [ { "CidrIp": "0.0.0.0/0", @@ -927,7 +927,7 @@ } } }, - "testconstructlbalbSecurityGrouptoallnewtwotargetstestconstructsgCB4347D58080785349CD": { + "testconstructlbalbSecurityGrouptoalbfarallnewtwotargetstestconstructsg36F923248080B80B6D0D": { "Type": "AWS::EC2::SecurityGroupEgress", "Properties": { "Description": "Load balancer to target", @@ -1038,6 +1038,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1206,7 +1207,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1253,10 +1254,10 @@ } } }, - "allnewtwotargetsECRAPIsecuritygroupCC5C870C": { + "albfarallnewtwotargetsECRAPIsecuritygroup47B0559C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "all-new-two-targets/all-new-two-targets-ECR_API-security-group", + "GroupDescription": "albfar-all-new-two-targets/albfar-all-new-two-targets-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1311,10 +1312,10 @@ } } }, - "allnewtwotargetsECRDKRsecuritygroup3CC9849F": { + "albfarallnewtwotargetsECRDKRsecuritygroup4F68E980": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "all-new-two-targets/all-new-two-targets-ECR_DKR-security-group", + "GroupDescription": "albfar-all-new-two-targets/albfar-all-new-two-targets-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1407,7 +1408,7 @@ } ], "Cpu": "256", - "Family": "allnewtwotargetstestconstructtaskdef8EF55A85", + "Family": "albfarallnewtwotargetstestconstructtaskdef27EF52BC", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1451,7 +1452,7 @@ } } }, - "testconstructsgfromallnewtwotargetstestconstructlbalbSecurityGroup7AE13AD9808027E2CC4F": { + "testconstructsgfromalbfarallnewtwotargetstestconstructlbalbSecurityGroup07EB9DFC8080E399C8E0": { "Type": "AWS::EC2::SecurityGroupIngress", "Properties": { "Description": "Load balancer to target", @@ -1538,7 +1539,7 @@ }, "DependsOn": [ "testconstructtaskdefTaskRoleC60414C4", - "testconstructtestconstructlistenerallnewtwotargetstargetsRule897FD7B6", + "testconstructtestconstructlisteneralbfarallnewtwotargetstargetsRule9ADF76CF", "testconstructtestconstructlistener484444F1" ] }, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.ts b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.albfar-all-new-two-targets.ts 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.alblam-privateApiExistingResources.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.expected.json index ebe2a257f..a9808d6dd 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.alblam-privateApiExistingResources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc" + "Value": "alblam-privateApiExistingResources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-privateApiExistingResources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PrivateSubnet1" + "Value": "alblam-privateApiExistingResources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PrivateSubnet1" + "Value": "alblam-privateApiExistingResources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PrivateSubnet2" + "Value": "alblam-privateApiExistingResources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PrivateSubnet2" + "Value": "alblam-privateApiExistingResources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PrivateSubnet3" + "Value": "alblam-privateApiExistingResources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/PrivateSubnet3" + "Value": "alblam-privateApiExistingResources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc" + "Value": "alblam-privateApiExistingResources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/FlowLog" + "Value": "alblam-privateApiExistingResources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/FlowLog" + "Value": "alblam-privateApiExistingResources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiExistingResources/Vpc/FlowLog" + "Value": "alblam-privateApiExistingResources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,7 +673,7 @@ "lambdasg93781054": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "privateApiExistingResources/lambda-sg", + "GroupDescription": "alblam-privateApiExistingResources/lambda-sg", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -949,7 +949,7 @@ "existingalbalbSecurityGroupC8DD2920": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB privateApiExistingResourcesexistingalbalbC2B8FCB6", + "GroupDescription": "Automatically created Security Group for ELB alblamprivateApiExistingResourcesexistingalbalb9103CE08", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -1081,6 +1081,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1249,7 +1250,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.ts b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiExistingResources.ts 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.alblam-privateApiNewResources.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiNewResources.expected.json index c24fba1c8..0247f376a 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.alblam-privateApiNewResources.expected.json @@ -55,7 +55,7 @@ "testonetestonealbSecurityGroup4DED9E2A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB privateApiNewResourcestestonetestonealbAC549B81", + "GroupDescription": "Automatically created Security Group for ELB alblamprivateApiNewResourcestestonetestonealb8D3CF023", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -187,6 +187,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -429,7 +430,7 @@ "testoneReplaceDefaultSecurityGroupsecuritygroupE46270FE": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "privateApiNewResources/test-one/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "alblam-privateApiNewResources/test-one/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -607,7 +608,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc" + "Value": "alblam-privateApiNewResources/Vpc" } ] } @@ -629,7 +630,7 @@ }, { "Key": "Name", - "Value": "privateApiNewResources/Vpc/isolatedSubnet1" + "Value": "alblam-privateApiNewResources/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -643,7 +644,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc/isolatedSubnet1" + "Value": "alblam-privateApiNewResources/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -679,7 +680,7 @@ }, { "Key": "Name", - "Value": "privateApiNewResources/Vpc/isolatedSubnet2" + "Value": "alblam-privateApiNewResources/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -693,7 +694,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc/isolatedSubnet2" + "Value": "alblam-privateApiNewResources/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -729,7 +730,7 @@ }, { "Key": "Name", - "Value": "privateApiNewResources/Vpc/isolatedSubnet3" + "Value": "alblam-privateApiNewResources/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -743,7 +744,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc/isolatedSubnet3" + "Value": "alblam-privateApiNewResources/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -780,7 +781,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc/FlowLog" + "Value": "alblam-privateApiNewResources/Vpc/FlowLog" } ] } @@ -832,7 +833,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc/FlowLog" + "Value": "alblam-privateApiNewResources/Vpc/FlowLog" } ] }, @@ -869,7 +870,7 @@ "Tags": [ { "Key": "Name", - "Value": "privateApiNewResources/Vpc/FlowLog" + "Value": "alblam-privateApiNewResources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -904,7 +905,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.ts b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiNewResources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-privateApiNewResources.ts 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.alblam-publicApiExistingResources.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.expected.json index ef2fc7821..895a53a72 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.alblam-publicApiExistingResources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc" + "Value": "alblam-publicApiExistingResources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiExistingResources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PrivateSubnet1" + "Value": "alblam-publicApiExistingResources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PrivateSubnet1" + "Value": "alblam-publicApiExistingResources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PrivateSubnet2" + "Value": "alblam-publicApiExistingResources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PrivateSubnet2" + "Value": "alblam-publicApiExistingResources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PrivateSubnet3" + "Value": "alblam-publicApiExistingResources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/PrivateSubnet3" + "Value": "alblam-publicApiExistingResources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc" + "Value": "alblam-publicApiExistingResources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/FlowLog" + "Value": "alblam-publicApiExistingResources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/FlowLog" + "Value": "alblam-publicApiExistingResources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiExistingResources/Vpc/FlowLog" + "Value": "alblam-publicApiExistingResources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,7 +673,7 @@ "lambdasg93781054": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "publicApiExistingResources/lambda-sg", + "GroupDescription": "alblam-publicApiExistingResources/lambda-sg", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -949,7 +949,7 @@ "existingalbalbSecurityGroupC8DD2920": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB publicApiExistingResourcesexistingalbalb2415E979", + "GroupDescription": "Automatically created Security Group for ELB alblampublicApiExistingResourcesexistingalbalb1EA1EAA3", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -1081,6 +1081,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1249,7 +1250,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.ts b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiExistingResources.ts 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.alblam-publicApiNewResources.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiNewResources.expected.json index b6c7be27d..b790b7365 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.alblam-publicApiNewResources.expected.json @@ -61,7 +61,7 @@ "testonetestonealbSecurityGroup4DED9E2A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB publicApiNewResourcestestonetestonealb8536470B", + "GroupDescription": "Automatically created Security Group for ELB alblampublicApiNewResourcestestonetestonealbE07397A7", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -193,6 +193,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -435,7 +436,7 @@ "testoneReplaceDefaultSecurityGroupsecuritygroupE46270FE": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "publicApiNewResources/test-one/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "alblam-publicApiNewResources/test-one/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -619,7 +620,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc" + "Value": "alblam-publicApiNewResources/Vpc" } ] } @@ -641,7 +642,7 @@ }, { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -665,7 +666,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -706,7 +707,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet1" } ] } @@ -726,7 +727,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet1" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet1" } ] }, @@ -752,7 +753,7 @@ }, { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -776,7 +777,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -817,7 +818,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet2" } ] } @@ -837,7 +838,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet2" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet2" } ] }, @@ -863,7 +864,7 @@ }, { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -887,7 +888,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -928,7 +929,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet3" } ] } @@ -948,7 +949,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PublicSubnet3" + "Value": "alblam-publicApiNewResources/Vpc/PublicSubnet3" } ] }, @@ -974,7 +975,7 @@ }, { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PrivateSubnet1" + "Value": "alblam-publicApiNewResources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -988,7 +989,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PrivateSubnet1" + "Value": "alblam-publicApiNewResources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1036,7 +1037,7 @@ }, { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PrivateSubnet2" + "Value": "alblam-publicApiNewResources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1050,7 +1051,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PrivateSubnet2" + "Value": "alblam-publicApiNewResources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1098,7 +1099,7 @@ }, { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PrivateSubnet3" + "Value": "alblam-publicApiNewResources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1112,7 +1113,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/PrivateSubnet3" + "Value": "alblam-publicApiNewResources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1149,7 +1150,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc" + "Value": "alblam-publicApiNewResources/Vpc" } ] } @@ -1183,7 +1184,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/FlowLog" + "Value": "alblam-publicApiNewResources/Vpc/FlowLog" } ] } @@ -1235,7 +1236,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/FlowLog" + "Value": "alblam-publicApiNewResources/Vpc/FlowLog" } ] }, @@ -1272,7 +1273,7 @@ "Tags": [ { "Key": "Name", - "Value": "publicApiNewResources/Vpc/FlowLog" + "Value": "alblam-publicApiNewResources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1307,7 +1308,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.ts b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiNewResources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-publicApiNewResources.ts 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.alblam-twoTargets.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-twoTargets.expected.json index 447e2e805..01a5ffba8 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.alblam-twoTargets.expected.json @@ -61,7 +61,7 @@ "testonetestonealbSecurityGroup4DED9E2A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB twoTargetstestonetestonealbB0E5AEF9", + "GroupDescription": "Automatically created Security Group for ELB alblamtwoTargetstestonetestonealbCEEAAF66", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -193,6 +193,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -435,7 +436,7 @@ "testoneReplaceDefaultSecurityGroupsecuritygroupE46270FE": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "twoTargets/test-one/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "alblam-twoTargets/test-one/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -646,7 +647,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc" + "Value": "alblam-twoTargets/Vpc" } ] } @@ -668,7 +669,7 @@ }, { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet1" + "Value": "alblam-twoTargets/Vpc/PublicSubnet1" } ], "VpcId": { @@ -692,7 +693,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet1" + "Value": "alblam-twoTargets/Vpc/PublicSubnet1" } ], "VpcId": { @@ -733,7 +734,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet1" + "Value": "alblam-twoTargets/Vpc/PublicSubnet1" } ] } @@ -753,7 +754,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet1" + "Value": "alblam-twoTargets/Vpc/PublicSubnet1" } ] }, @@ -779,7 +780,7 @@ }, { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet2" + "Value": "alblam-twoTargets/Vpc/PublicSubnet2" } ], "VpcId": { @@ -803,7 +804,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet2" + "Value": "alblam-twoTargets/Vpc/PublicSubnet2" } ], "VpcId": { @@ -844,7 +845,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet2" + "Value": "alblam-twoTargets/Vpc/PublicSubnet2" } ] } @@ -864,7 +865,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet2" + "Value": "alblam-twoTargets/Vpc/PublicSubnet2" } ] }, @@ -890,7 +891,7 @@ }, { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet3" + "Value": "alblam-twoTargets/Vpc/PublicSubnet3" } ], "VpcId": { @@ -914,7 +915,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet3" + "Value": "alblam-twoTargets/Vpc/PublicSubnet3" } ], "VpcId": { @@ -955,7 +956,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet3" + "Value": "alblam-twoTargets/Vpc/PublicSubnet3" } ] } @@ -975,7 +976,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PublicSubnet3" + "Value": "alblam-twoTargets/Vpc/PublicSubnet3" } ] }, @@ -1001,7 +1002,7 @@ }, { "Key": "Name", - "Value": "twoTargets/Vpc/PrivateSubnet1" + "Value": "alblam-twoTargets/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1015,7 +1016,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PrivateSubnet1" + "Value": "alblam-twoTargets/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1063,7 +1064,7 @@ }, { "Key": "Name", - "Value": "twoTargets/Vpc/PrivateSubnet2" + "Value": "alblam-twoTargets/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1077,7 +1078,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PrivateSubnet2" + "Value": "alblam-twoTargets/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1125,7 +1126,7 @@ }, { "Key": "Name", - "Value": "twoTargets/Vpc/PrivateSubnet3" + "Value": "alblam-twoTargets/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1139,7 +1140,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/PrivateSubnet3" + "Value": "alblam-twoTargets/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1176,7 +1177,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc" + "Value": "alblam-twoTargets/Vpc" } ] } @@ -1210,7 +1211,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/FlowLog" + "Value": "alblam-twoTargets/Vpc/FlowLog" } ] } @@ -1262,7 +1263,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/FlowLog" + "Value": "alblam-twoTargets/Vpc/FlowLog" } ] }, @@ -1299,7 +1300,7 @@ "Tags": [ { "Key": "Name", - "Value": "twoTargets/Vpc/FlowLog" + "Value": "alblam-twoTargets/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1334,7 +1335,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1484,7 +1485,7 @@ "testtwoReplaceDefaultSecurityGroupsecuritygroupE62CC6C1": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "twoTargets/test-two/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "alblam-twoTargets/test-two/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.ts b/source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-twoTargets.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.ts rename to source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.alblam-twoTargets.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates-custom-resource-name.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates-custom-resource-name.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates-custom-resource-name.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates-custom-resource-name.expected.json index 782a0bdc5..3469d6b9c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates-custom-resource-name.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates-custom-resource-name.expected.json @@ -4,27 +4,27 @@ "existingtableE51CCC93": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "PK", - "KeyType": "HASH" + "AttributeType": "S" }, { "AttributeName": "SK", - "KeyType": "RANGE" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "PK", - "AttributeType": "S" + "KeyType": "HASH" }, { "AttributeName": "SK", - "AttributeType": "S" + "KeyType": "RANGE" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, @@ -68,10 +68,10 @@ "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiDeployment7F5497B67361a1e02c5799cae81447bf3ad5ef46": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiidGETB657BB05", @@ -91,9 +91,6 @@ "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiDeploymentStageprodDD2DED0B": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -114,6 +111,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE" + }, "StageName": "prod", "TracingEnabled": true } @@ -136,14 +136,8 @@ "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiidGETB657BB05": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiid4EBF99AB" - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -225,7 +219,13 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiid4EBF99AB" + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiC4813ABE" + } } }, "testapigatewaydynamodbadditionalrequesttemplatescustomresourcenameRestApiUsagePlan4D14DF10": { @@ -423,4 +423,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates-custom-resource-name.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates-custom-resource-name.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates-custom-resource-name.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates-custom-resource-name.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates.expected.json index 8a7cb091d..cbb85b914 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates.expected.json @@ -4,19 +4,19 @@ "existingtableE51CCC93": { "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 }, @@ -60,10 +60,10 @@ "testapigatewaydynamodbadditionalrequesttemplatesRestApiDeployment0AE7C47741477f52c0bb6da128d2999e75c543fc": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaydynamodbadditionalrequesttemplatesRestApiidGET05129D15", @@ -83,9 +83,6 @@ "testapigatewaydynamodbadditionalrequesttemplatesRestApiDeploymentStageprod33ED5D23": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -106,6 +103,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" + }, "StageName": "prod", "TracingEnabled": true } @@ -128,14 +128,8 @@ "testapigatewaydynamodbadditionalrequesttemplatesRestApiidGET05129D15": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApiidA77CCE90" - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -217,7 +211,13 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApiidA77CCE90" + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" + } } }, "testapigatewaydynamodbadditionalrequesttemplatesRestApiUsagePlan905D10C7": { @@ -415,4 +415,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.additional-request-templates.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-additional-request-templates.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-CRUD.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-CRUD.expected.json index facc03a46..d14d2f2dd 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-CRUD.expected.json @@ -4,19 +4,19 @@ "testapigatewaydynamodbDynamoTableEEE3F463": { "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 }, @@ -60,10 +60,10 @@ "testapigatewaydynamodbRestApiDeployment1898674B00abb8cad507ed5309ac584f2dddf379": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaydynamodbRestApi80489300" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaydynamodbRestApiidDELETE6FC8A9F3", @@ -86,9 +86,6 @@ "testapigatewaydynamodbRestApiDeploymentStageprod2855C2C3": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaydynamodbRestApi80489300" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -109,6 +106,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaydynamodbRestApi80489300" + }, "StageName": "prod", "TracingEnabled": true } @@ -131,14 +131,8 @@ "testapigatewaydynamodbRestApiidGET6196F638": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaydynamodbRestApiid78018D34" - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbRestApi80489300" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -208,20 +202,20 @@ }, "StatusCode": "500" } - ] - } - }, - "testapigatewaydynamodbRestApiidPUT1F965B23": { - "Type": "AWS::ApiGateway::Method", - "Properties": { - "HttpMethod": "PUT", + ], "ResourceId": { "Ref": "testapigatewaydynamodbRestApiid78018D34" }, "RestApiId": { "Ref": "testapigatewaydynamodbRestApi80489300" - }, + } + } + }, + "testapigatewaydynamodbRestApiidPUT1F965B23": { + "Type": "AWS::ApiGateway::Method", + "Properties": { "AuthorizationType": "AWS_IAM", + "HttpMethod": "PUT", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -291,20 +285,20 @@ }, "StatusCode": "500" } - ] - } - }, - "testapigatewaydynamodbRestApiidDELETE6FC8A9F3": { - "Type": "AWS::ApiGateway::Method", - "Properties": { - "HttpMethod": "DELETE", + ], "ResourceId": { "Ref": "testapigatewaydynamodbRestApiid78018D34" }, "RestApiId": { "Ref": "testapigatewaydynamodbRestApi80489300" - }, + } + } + }, + "testapigatewaydynamodbRestApiidDELETE6FC8A9F3": { + "Type": "AWS::ApiGateway::Method", + "Properties": { "AuthorizationType": "AWS_IAM", + "HttpMethod": "DELETE", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -374,23 +368,20 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaydynamodbRestApiid78018D34" + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbRestApi80489300" + } } }, "testapigatewaydynamodbRestApiPOSTE99BD0BD": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaydynamodbRestApi80489300", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbRestApi80489300" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -460,7 +451,16 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaydynamodbRestApi80489300", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbRestApi80489300" + } } }, "testapigatewaydynamodbRestApiUsagePlan244F06C8": { @@ -688,4 +688,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-CRUD.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-CRUD.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-existing-table.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-existing-table.expected.json index 84ec8af74..8fb3beeae 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-existing-table.expected.json @@ -4,19 +4,19 @@ "existingtableE51CCC93": { "Type": "AWS::DynamoDB::Table", "Properties": { - "KeySchema": [ + "AttributeDefinitions": [ { "AttributeName": "oddName", - "KeyType": "HASH" + "AttributeType": "S" } ], - "AttributeDefinitions": [ + "BillingMode": "PAY_PER_REQUEST", + "KeySchema": [ { "AttributeName": "oddName", - "AttributeType": "S" + "KeyType": "HASH" } ], - "BillingMode": "PAY_PER_REQUEST", "PointInTimeRecoverySpecification": { "PointInTimeRecoveryEnabled": true }, @@ -60,10 +60,10 @@ "testapigatewaydynamodbdefaultRestApiDeploymentFAC726F35a5f302579207081dccaeca1e34daf59": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaydynamodbdefaultRestApioddNameGET9FAAF1BB", @@ -83,9 +83,6 @@ "testapigatewaydynamodbdefaultRestApiDeploymentStageprod7834D304": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -106,6 +103,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" + }, "StageName": "prod", "TracingEnabled": true } @@ -128,14 +128,8 @@ "testapigatewaydynamodbdefaultRestApioddNameGET9FAAF1BB": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaydynamodbdefaultRestApioddName392BDAEE" - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -205,7 +199,13 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaydynamodbdefaultRestApioddName392BDAEE" + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" + } } }, "testapigatewaydynamodbdefaultRestApiUsagePlanA266BB3D": { @@ -403,4 +403,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-existing-table.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-apigateway-dynamodb-existing-table.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.custom-integration-responses.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-custom-integration-responses.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.custom-integration-responses.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-custom-integration-responses.expected.json index e67df73de..28443ecb8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.custom-integration-responses.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-custom-integration-responses.expected.json @@ -4,19 +4,19 @@ "existingtableE51CCC93": { "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 }, @@ -60,10 +60,10 @@ "testapigatewaydynamodbadditionalrequesttemplatesRestApiDeployment0AE7C47761b8949a9247c12493c939f05e630c9d": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaydynamodbadditionalrequesttemplatesRestApiidGET05129D15", @@ -83,9 +83,6 @@ "testapigatewaydynamodbadditionalrequesttemplatesRestApiDeploymentStageprod33ED5D23": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -106,6 +103,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" + }, "StageName": "prod", "TracingEnabled": true } @@ -128,14 +128,8 @@ "testapigatewaydynamodbadditionalrequesttemplatesRestApiidGET05129D15": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApiidA77CCE90" - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -205,7 +199,13 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApiidA77CCE90" + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbadditionalrequesttemplatesRestApi03F6484C" + } } }, "testapigatewaydynamodbadditionalrequesttemplatesRestApiUsagePlan905D10C7": { @@ -403,4 +403,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.custom-integration-responses.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-custom-integration-responses.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.custom-integration-responses.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-custom-integration-responses.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-no-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-no-arguments.expected.json index 5c02ac352..afff932ba 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-no-arguments.expected.json @@ -4,19 +4,19 @@ "testapigatewaydynamodbdefaultDynamoTable0720D92C": { "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 }, @@ -60,10 +60,10 @@ "testapigatewaydynamodbdefaultRestApiDeploymentFAC726F3818e0ad130f9a49152a4afbd35ada7b6": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaydynamodbdefaultRestApiidGET94B6F433", @@ -83,9 +83,6 @@ "testapigatewaydynamodbdefaultRestApiDeploymentStageprod7834D304": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -106,6 +103,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" + }, "StageName": "prod", "TracingEnabled": true } @@ -128,14 +128,8 @@ "testapigatewaydynamodbdefaultRestApiidGET94B6F433": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaydynamodbdefaultRestApiidFD6A9E91" - }, - "RestApiId": { - "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -205,7 +199,13 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaydynamodbdefaultRestApiidFD6A9E91" + }, + "RestApiId": { + "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9" + } } }, "testapigatewaydynamodbdefaultRestApiUsagePlanA266BB3D": { @@ -403,4 +403,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apiddb-no-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-defaultParams.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-defaultParams.expected.json index cb176c354..9ead7c37b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-defaultParams.expected.json @@ -113,10 +113,10 @@ "testapigatewayiotRestApiDeploymentA8FCF5057ffc77ee6fd9f35b0f1c353f67d36988": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewayiotRestApi0EC16DD2" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewayiotawsapigatewayiotreqval2BA7D930", @@ -155,9 +155,6 @@ "testapigatewayiotRestApiDeploymentStageprod25838482": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -178,6 +175,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" + }, "StageName": "prod", "TracingEnabled": true } @@ -212,14 +212,8 @@ "testapigatewayiotRestApimessagetopiclevel1POST4E6A3C44": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1CB1305F5" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -292,6 +286,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1CB1305F5" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -310,14 +310,8 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2POST09BB4430": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel25B0B16A2" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -392,6 +386,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel25B0B16A2" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -410,14 +410,8 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3POST0B6A3876": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel35F49E3DD" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -494,6 +488,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel35F49E3DD" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -512,14 +512,8 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4POST93CAD241": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4C5A3338B" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -598,6 +592,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4C5A3338B" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -616,14 +616,8 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5POST2D2539FA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5497EB56B" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -704,6 +698,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5497EB56B" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -722,14 +722,8 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6POST806C543B": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel69F2FBFA8" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -812,6 +806,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel69F2FBFA8" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -830,14 +830,8 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel7POSTAF784AE7": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel78397BAEF" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -922,6 +916,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel78397BAEF" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -955,14 +955,8 @@ "testapigatewayiotRestApishadowthingNamePOSTD37686D4": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApishadowthingName3837242E" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -1035,6 +1029,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApishadowthingName3837242E" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -1053,14 +1053,8 @@ "testapigatewayiotRestApishadowthingNameshadowNamePOST260BE793": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApishadowthingNameshadowName04D15774" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -1135,6 +1129,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApishadowthingNameshadowName04D15774" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } } }, @@ -1300,4 +1300,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-defaultParams.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-defaultParams.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-overrideParams.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-overrideParams.expected.json index 1133dd641..363238a62 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-overrideParams.expected.json @@ -107,10 +107,10 @@ "testapigatewayiotRestApiDeploymentA8FCF5050f1987d2a995276f2146de670d9fa976": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Description for the Regional Rest Api", "RestApiId": { "Ref": "testapigatewayiotRestApi0EC16DD2" - }, - "Description": "Description for the Regional Rest Api" + } }, "DependsOn": [ "testapigatewayiotawsapigatewayiotreqval2BA7D930", @@ -149,9 +149,6 @@ "testapigatewayiotRestApiDeploymentStageprod25838482": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -172,6 +169,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" + }, "StageName": "prod", "TracingEnabled": true } @@ -206,15 +206,9 @@ "testapigatewayiotRestApimessagetopiclevel1POST4E6A3C44": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1CB1305F5" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -287,6 +281,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1CB1305F5" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -315,15 +315,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2POST09BB4430": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel25B0B16A2" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -398,6 +392,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel25B0B16A2" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -426,15 +426,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3POST0B6A3876": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel35F49E3DD" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -511,6 +505,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel35F49E3DD" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -539,15 +539,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4POST93CAD241": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4C5A3338B" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -626,6 +620,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4C5A3338B" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -654,15 +654,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5POST2D2539FA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5497EB56B" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -743,6 +737,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5497EB56B" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -771,15 +771,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6POST806C543B": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel69F2FBFA8" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -862,6 +856,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel69F2FBFA8" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -890,15 +890,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel7POSTAF784AE7": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel78397BAEF" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -983,6 +977,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel78397BAEF" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -1026,15 +1026,9 @@ "testapigatewayiotRestApishadowthingNamePOSTD37686D4": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApishadowthingName3837242E" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -1107,6 +1101,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApishadowthingName3837242E" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -1135,15 +1135,9 @@ "testapigatewayiotRestApishadowthingNameshadowNamePOST260BE793": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApishadowthingNameshadowName04D15774" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -1218,6 +1212,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApishadowthingNameshadowName04D15774" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -1247,7 +1247,7 @@ ] } }, - "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceoverrideParamstestapigatewayiotRestApiApiKey9DF117C022AD8BF0": { + "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceapiiotoverrideParamstestapigatewayiotRestApiApiKeyA957893EA334C391": { "Type": "AWS::ApiGateway::UsagePlanKey", "Properties": { "KeyId": { @@ -1421,4 +1421,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-overrideParams.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-overrideParams.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-override_auth_api_keys.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-override_auth_api_keys.expected.json index 1a2184a10..93591e26e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-override_auth_api_keys.expected.json @@ -113,10 +113,10 @@ "testapigatewayiotRestApiDeploymentA8FCF50585c5ccbacf1bb79394cb3eea4f66a01a": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewayiotRestApi0EC16DD2" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewayiotawsapigatewayiotreqval2BA7D930", @@ -155,9 +155,6 @@ "testapigatewayiotRestApiDeploymentStageprod25838482": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -178,6 +175,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" + }, "StageName": "prod", "TracingEnabled": true } @@ -212,15 +212,9 @@ "testapigatewayiotRestApimessagetopiclevel1POST4E6A3C44": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1CB1305F5" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -293,6 +287,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1CB1305F5" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -321,15 +321,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2POST09BB4430": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel25B0B16A2" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -404,6 +398,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel25B0B16A2" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -432,15 +432,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3POST0B6A3876": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel35F49E3DD" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -517,6 +511,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel35F49E3DD" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -545,15 +545,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4POST93CAD241": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4C5A3338B" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -632,6 +626,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4C5A3338B" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -660,15 +660,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5POST2D2539FA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5497EB56B" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -749,6 +743,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5497EB56B" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -777,15 +777,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6POST806C543B": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel69F2FBFA8" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -868,6 +862,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel69F2FBFA8" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -896,15 +896,9 @@ "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel7POSTAF784AE7": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel78397BAEF" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -989,6 +983,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApimessagetopiclevel1topiclevel2topiclevel3topiclevel4topiclevel5topiclevel6topiclevel78397BAEF" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -1032,15 +1032,9 @@ "testapigatewayiotRestApishadowthingNamePOSTD37686D4": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApishadowthingName3837242E" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -1113,6 +1107,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApishadowthingName3837242E" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -1141,15 +1141,9 @@ "testapigatewayiotRestApishadowthingNameshadowNamePOST260BE793": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewayiotRestApishadowthingNameshadowName04D15774" - }, - "RestApiId": { - "Ref": "testapigatewayiotRestApi0EC16DD2" - }, "ApiKeyRequired": true, "AuthorizationType": "NONE", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -1224,6 +1218,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewayiotawsapigatewayiotreqval2BA7D930" + }, + "ResourceId": { + "Ref": "testapigatewayiotRestApishadowthingNameshadowName04D15774" + }, + "RestApiId": { + "Ref": "testapigatewayiotRestApi0EC16DD2" } }, "Metadata": { @@ -1253,7 +1253,7 @@ ] } }, - "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceoverrideauthapikeystestapigatewayiotRestApiApiKey393D3E36B43FA58D": { + "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceapiiotoverrideauthapikeystestapigatewayiotRestApiApiKey08654B853EA9B936": { "Type": "AWS::ApiGateway::UsagePlanKey", "Properties": { "KeyId": { @@ -1427,4 +1427,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-override_auth_api_keys.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.apiiot-override_auth_api_keys.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-additional-request-templates.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-additional-request-templates.expected.json index 8108502ac..8e14c257f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-additional-request-templates.expected.json @@ -34,10 +34,10 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApiDeployment5A447E3D3f205cdf3c053c5a1187e7b2a0f3474d": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaykinesisadditionalrequesttemplatesRestApirecordPOST307FC87D", @@ -62,9 +62,6 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApiDeploymentStageprodD274025B": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -85,6 +82,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" + }, "StageName": "prod", "TracingEnabled": true } @@ -107,14 +107,8 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApirecordPOST307FC87D": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecord01520200" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -204,6 +198,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirequestvalidator69E589CE" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecord01520200" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" } } }, @@ -225,14 +225,8 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApirecordsPOST5F6260A2": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecords37B412D1" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -310,6 +304,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirequestvalidator69E589CE" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecords37B412D1" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" } } }, @@ -332,22 +332,22 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApirequestvalidator69E589CE": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-body-validator", "RestApiId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" }, - "Name": "request-body-validator", "ValidateRequestBody": true } }, "testapigatewaykinesisadditionalrequesttemplatesRestApiPutRecordModel1A75CC15": { "Type": "AWS::ApiGateway::Model", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "ContentType": "application/json", "Description": "PutRecord proxy single-record payload", "Name": "PutRecordModel", + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" + }, "Schema": { "$schema": "http://json-schema.org/draft-04/schema#", "title": "PutRecord proxy single-record payload", @@ -370,12 +370,12 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApiPutRecordsModel49E0CAB9": { "Type": "AWS::ApiGateway::Model", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "ContentType": "application/json", "Description": "PutRecords proxy payload data", "Name": "PutRecordsModel", + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" + }, "Schema": { "$schema": "http://json-schema.org/draft-04/schema#", "title": "PutRecords proxy payload data", @@ -529,9 +529,9 @@ "testapigatewaykinesisadditionalrequesttemplatesKinesisStreamGetRecordsIteratorAgeAlarm05247CB0": { "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, @@ -542,9 +542,9 @@ "testapigatewaykinesisadditionalrequesttemplatesKinesisStreamReadProvisionedThroughputExceededAlarmE49197EC": { "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, @@ -626,4 +626,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-additional-request-templates.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-additional-request-templates.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-apigateway-kinesis-overwrite.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-apigateway-kinesis-overwrite.expected.json index 5de730a4e..9b944aeea 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-apigateway-kinesis-overwrite.expected.json @@ -34,10 +34,10 @@ "testapigatewaykinesisoverwriteRestApiDeployment1EE3B096ca960d6e964dacd9ef8ada66856cca97": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaykinesisoverwriteRestApirecordPOST2B249308", @@ -62,9 +62,6 @@ "testapigatewaykinesisoverwriteRestApiDeploymentStageprodA3A23FDE": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -92,6 +89,9 @@ "ThrottlingRateLimit": 100 } ], + "RestApiId": { + "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" + }, "StageName": "prod", "TracingEnabled": true } @@ -114,14 +114,8 @@ "testapigatewaykinesisoverwriteRestApirecordPOST2B249308": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisoverwriteRestApirecordAECF6BBC" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -199,6 +193,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisoverwriteRestApirequestvalidatorBAD987F2" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisoverwriteRestApirecordAECF6BBC" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" } } }, @@ -220,14 +220,8 @@ "testapigatewaykinesisoverwriteRestApirecordsPOST1501AC33": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisoverwriteRestApirecordsB70B7E7F" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -305,6 +299,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisoverwriteRestApirequestvalidatorBAD987F2" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisoverwriteRestApirecordsB70B7E7F" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" } } }, @@ -327,20 +327,20 @@ "testapigatewaykinesisoverwriteRestApirequestvalidatorBAD987F2": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-body-validator", "RestApiId": { "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" }, - "Name": "request-body-validator", "ValidateRequestBody": true } }, "testapigatewaykinesisoverwriteRestApiPutRecordModel82F936E0": { "Type": "AWS::ApiGateway::Model", "Properties": { + "ContentType": "application/json", "RestApiId": { "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" }, - "ContentType": "application/json", "Schema": { "$schema": "http://json-schema.org/draft-04/schema#" } @@ -349,10 +349,10 @@ "testapigatewaykinesisoverwriteRestApiPutRecordsModel120A48A8": { "Type": "AWS::ApiGateway::Model", "Properties": { + "ContentType": "application/json", "RestApiId": { "Ref": "testapigatewaykinesisoverwriteRestApi77ABE5DA" }, - "ContentType": "application/json", "Schema": { "$schema": "http://json-schema.org/draft-04/schema#" } @@ -481,9 +481,9 @@ "testapigatewaykinesisoverwriteKinesisStreamGetRecordsIteratorAgeAlarmAF0BEF52": { "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, @@ -494,9 +494,9 @@ "testapigatewaykinesisoverwriteKinesisStreamReadProvisionedThroughputExceededAlarm5C0040FB": { "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, @@ -578,4 +578,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-apigateway-kinesis-overwrite.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-apigateway-kinesis-overwrite.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-custom-integration-responses.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-custom-integration-responses.expected.json index bbdf26eb8..87be3b186 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-custom-integration-responses.expected.json @@ -34,10 +34,10 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApiDeployment5A447E3D68efb2650de4064374902887dee80c33": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaykinesisadditionalrequesttemplatesRestApirecordPOST307FC87D", @@ -62,9 +62,6 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApiDeploymentStageprodD274025B": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -85,6 +82,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" + }, "StageName": "prod", "TracingEnabled": true } @@ -107,14 +107,8 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApirecordPOST307FC87D": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecord01520200" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -188,6 +182,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirequestvalidator69E589CE" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecord01520200" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" } } }, @@ -209,14 +209,8 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApirecordsPOST5F6260A2": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecords37B412D1" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -294,6 +288,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirequestvalidator69E589CE" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApirecords37B412D1" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" } } }, @@ -316,22 +316,22 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApirequestvalidator69E589CE": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-body-validator", "RestApiId": { "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" }, - "Name": "request-body-validator", "ValidateRequestBody": true } }, "testapigatewaykinesisadditionalrequesttemplatesRestApiPutRecordModel1A75CC15": { "Type": "AWS::ApiGateway::Model", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "ContentType": "application/json", "Description": "PutRecord proxy single-record payload", "Name": "PutRecordModel", + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" + }, "Schema": { "$schema": "http://json-schema.org/draft-04/schema#", "title": "PutRecord proxy single-record payload", @@ -354,12 +354,12 @@ "testapigatewaykinesisadditionalrequesttemplatesRestApiPutRecordsModel49E0CAB9": { "Type": "AWS::ApiGateway::Model", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" - }, "ContentType": "application/json", "Description": "PutRecords proxy payload data", "Name": "PutRecordsModel", + "RestApiId": { + "Ref": "testapigatewaykinesisadditionalrequesttemplatesRestApiCCD096E7" + }, "Schema": { "$schema": "http://json-schema.org/draft-04/schema#", "title": "PutRecords proxy payload data", @@ -513,9 +513,9 @@ "testapigatewaykinesisadditionalrequesttemplatesKinesisStreamGetRecordsIteratorAgeAlarm05247CB0": { "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, @@ -526,9 +526,9 @@ "testapigatewaykinesisadditionalrequesttemplatesKinesisStreamReadProvisionedThroughputExceededAlarmE49197EC": { "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, @@ -610,4 +610,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-custom-integration-responses.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-custom-integration-responses.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-no-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-no-arguments.expected.json index 7037d7e4f..4e6df2a10 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-no-arguments.expected.json @@ -34,10 +34,10 @@ "testapigatewaykinesisdefaultRestApiDeployment2852F1AA922824384d19fd27217710115cc2344f": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaykinesisdefaultRestApirecordPOST731165E8", @@ -62,9 +62,6 @@ "testapigatewaykinesisdefaultRestApiDeploymentStageprodB6206494": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -85,6 +82,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" + }, "StageName": "prod", "TracingEnabled": true } @@ -107,14 +107,8 @@ "testapigatewaykinesisdefaultRestApirecordPOST731165E8": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisdefaultRestApirecord500DDD57" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -192,6 +186,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisdefaultRestApirequestvalidator5901C267" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisdefaultRestApirecord500DDD57" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" } } }, @@ -213,14 +213,8 @@ "testapigatewaykinesisdefaultRestApirecordsPOST165BE933": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Ref": "testapigatewaykinesisdefaultRestApirecords972EAFEA" - }, - "RestApiId": { - "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -298,6 +292,12 @@ }, "RequestValidatorId": { "Ref": "testapigatewaykinesisdefaultRestApirequestvalidator5901C267" + }, + "ResourceId": { + "Ref": "testapigatewaykinesisdefaultRestApirecords972EAFEA" + }, + "RestApiId": { + "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" } } }, @@ -320,22 +320,22 @@ "testapigatewaykinesisdefaultRestApirequestvalidator5901C267": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-body-validator", "RestApiId": { "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" }, - "Name": "request-body-validator", "ValidateRequestBody": true } }, "testapigatewaykinesisdefaultRestApiPutRecordModel06DC611F": { "Type": "AWS::ApiGateway::Model", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" - }, "ContentType": "application/json", "Description": "PutRecord proxy single-record payload", "Name": "PutRecordModel", + "RestApiId": { + "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" + }, "Schema": { "$schema": "http://json-schema.org/draft-04/schema#", "title": "PutRecord proxy single-record payload", @@ -358,12 +358,12 @@ "testapigatewaykinesisdefaultRestApiPutRecordsModelA7CA8D6D": { "Type": "AWS::ApiGateway::Model", "Properties": { - "RestApiId": { - "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" - }, "ContentType": "application/json", "Description": "PutRecords proxy payload data", "Name": "PutRecordsModel", + "RestApiId": { + "Ref": "testapigatewaykinesisdefaultRestApi68CBA18C" + }, "Schema": { "$schema": "http://json-schema.org/draft-04/schema#", "title": "PutRecords proxy payload data", @@ -517,9 +517,9 @@ "testapigatewaykinesisdefaultKinesisStreamGetRecordsIteratorAgeAlarm0638BB32": { "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, @@ -530,9 +530,9 @@ "testapigatewaykinesisdefaultKinesisStreamReadProvisionedThroughputExceededAlarmE7251F6A": { "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, @@ -614,4 +614,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apikin-no-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-deployFunction.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-deployFunction.expected.json index e154b7aa8..60277b77d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-deployFunction.expected.json @@ -99,18 +99,18 @@ }, "S3Key": "0904d3723480fed2daf7885caa427b930881caae6879d1e6b0d395020173ef6f.zip" }, - "Role": { - "Fn::GetAtt": [ - "testapigatewaylambdaLambdaFunctionServiceRole5CD2E9F7", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testapigatewaylambdaLambdaFunctionServiceRole5CD2E9F7", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -172,10 +172,10 @@ "testapigatewaylambdaLambdaRestApiDeployment85334BB3a1765c45928980e423727978265730d1": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaylambdaLambdaRestApiproxyANYF6150927", @@ -196,9 +196,6 @@ "testapigatewaylambdaLambdaRestApiDeploymentStageprod4EBF7247": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -219,6 +216,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaylambdaLambdaRestApiE957E944" + }, "StageName": "prod", "TracingEnabled": true } @@ -238,7 +238,7 @@ } } }, - "testapigatewaylambdaLambdaRestApiproxyANYApiPermissiondeployFunctiontestapigatewaylambdaLambdaRestApiDFF7E210ANYproxy84284392": { + "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionapilamdeployFunctiontestapigatewaylambdaLambdaRestApiAF929C5FANYproxy83DC1CFF": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -279,7 +279,7 @@ } } }, - "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestdeployFunctiontestapigatewaylambdaLambdaRestApiDFF7E210ANYproxy52515209": { + "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestapilamdeployFunctiontestapigatewaylambdaLambdaRestApiAF929C5FANYproxy46D6E92A": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -319,14 +319,8 @@ "testapigatewaylambdaLambdaRestApiproxyANYF6150927": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testapigatewaylambdaLambdaRestApiproxy2C2C544E" - }, - "RestApiId": { - "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -353,10 +347,16 @@ ] ] } + }, + "ResourceId": { + "Ref": "testapigatewaylambdaLambdaRestApiproxy2C2C544E" + }, + "RestApiId": { + "Ref": "testapigatewaylambdaLambdaRestApiE957E944" } } }, - "testapigatewaylambdaLambdaRestApiANYApiPermissiondeployFunctiontestapigatewaylambdaLambdaRestApiDFF7E210ANY037EAB10": { + "testapigatewaylambdaLambdaRestApiANYApiPermissionapilamdeployFunctiontestapigatewaylambdaLambdaRestApiAF929C5FANY15383DB1": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -397,7 +397,7 @@ } } }, - "testapigatewaylambdaLambdaRestApiANYApiPermissionTestdeployFunctiontestapigatewaylambdaLambdaRestApiDFF7E210ANY7E2E56FC": { + "testapigatewaylambdaLambdaRestApiANYApiPermissionTestapilamdeployFunctiontestapigatewaylambdaLambdaRestApiAF929C5FANYC3A64F38": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -437,17 +437,8 @@ "testapigatewaylambdaLambdaRestApiANY1FACA749": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaylambdaLambdaRestApiE957E944", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -474,6 +465,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaylambdaLambdaRestApiE957E944", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaylambdaLambdaRestApiE957E944" } } }, @@ -629,4 +629,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-deployFunction.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-existingFunction.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-existingFunction.expected.json index 500d0accd..4b5bd8abf 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-existingFunction.expected.json @@ -99,18 +99,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" @@ -172,10 +172,10 @@ "testapigatewaylambdaLambdaRestApiDeployment85334BB3938813331492485ced06ab87062fb015": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaylambdaLambdaRestApiproxyANYF6150927", @@ -196,9 +196,6 @@ "testapigatewaylambdaLambdaRestApiDeploymentStageprod4EBF7247": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -219,6 +216,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaylambdaLambdaRestApiE957E944" + }, "StageName": "prod", "TracingEnabled": true } @@ -238,7 +238,7 @@ } } }, - "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionexistingFunctiontestapigatewaylambdaLambdaRestApi67C22A4BANYproxy0CD9F739": { + "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionapilamexistingFunctiontestapigatewaylambdaLambdaRestApiEC1EB7CDANYproxy184097FE": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -279,7 +279,7 @@ } } }, - "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestexistingFunctiontestapigatewaylambdaLambdaRestApi67C22A4BANYproxy3558317D": { + "testapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestapilamexistingFunctiontestapigatewaylambdaLambdaRestApiEC1EB7CDANYproxy0716AB43": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -319,14 +319,8 @@ "testapigatewaylambdaLambdaRestApiproxyANYF6150927": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testapigatewaylambdaLambdaRestApiproxy2C2C544E" - }, - "RestApiId": { - "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -353,10 +347,16 @@ ] ] } + }, + "ResourceId": { + "Ref": "testapigatewaylambdaLambdaRestApiproxy2C2C544E" + }, + "RestApiId": { + "Ref": "testapigatewaylambdaLambdaRestApiE957E944" } } }, - "testapigatewaylambdaLambdaRestApiANYApiPermissionexistingFunctiontestapigatewaylambdaLambdaRestApi67C22A4BANY45EBFD09": { + "testapigatewaylambdaLambdaRestApiANYApiPermissionapilamexistingFunctiontestapigatewaylambdaLambdaRestApiEC1EB7CDANY245ECD8E": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -397,7 +397,7 @@ } } }, - "testapigatewaylambdaLambdaRestApiANYApiPermissionTestexistingFunctiontestapigatewaylambdaLambdaRestApi67C22A4BANY7AEAC00D": { + "testapigatewaylambdaLambdaRestApiANYApiPermissionTestapilamexistingFunctiontestapigatewaylambdaLambdaRestApiEC1EB7CDANYCE9E6EFA": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -437,17 +437,8 @@ "testapigatewaylambdaLambdaRestApiANY1FACA749": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaylambdaLambdaRestApiE957E944", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaylambdaLambdaRestApiE957E944" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -474,6 +465,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaylambdaLambdaRestApiE957E944", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaylambdaLambdaRestApiE957E944" } } }, @@ -629,4 +629,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.apilam-existingFunction.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.additional-request-templates.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-additional-request-templates.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.additional-request-templates.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-additional-request-templates.expected.json index a56e9da6a..0fa8fb57b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.additional-request-templates.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-additional-request-templates.expected.json @@ -34,10 +34,10 @@ "testapigatewaysagemakerendpointdefaultRestApiDeployment04BFEB63ab5dc870083af2a47a41af0f4ee69fff": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysagemakerendpointdefaultRestApiuseridGETB3BB79AA", @@ -58,9 +58,6 @@ "testapigatewaysagemakerendpointdefaultRestApiDeploymentStageprodFD1743A7": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -81,6 +78,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" + }, "StageName": "prod", "TracingEnabled": true } @@ -103,14 +103,8 @@ "testapigatewaysagemakerendpointdefaultRestApiuseridGETB3BB79AA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaysagemakerendpointdefaultRestApiuserid9952BA11" - }, - "RestApiId": { - "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -171,6 +165,12 @@ ], "RequestValidatorId": { "Ref": "testapigatewaysagemakerendpointdefaultRestApirequestvalidator1A23C251" + }, + "ResourceId": { + "Ref": "testapigatewaysagemakerendpointdefaultRestApiuserid9952BA11" + }, + "RestApiId": { + "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" } } }, @@ -193,10 +193,10 @@ "testapigatewaysagemakerendpointdefaultRestApirequestvalidator1A23C251": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-param-validator", "RestApiId": { "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" }, - "Name": "request-param-validator", "ValidateRequestParameters": true } }, @@ -393,4 +393,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.additional-request-templates.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-additional-request-templates.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.additional-request-templates.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-additional-request-templates.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apigateway-sagemakerendpoint-overwrite.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-apigateway-sagemakerendpoint-overwrite.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apigateway-sagemakerendpoint-overwrite.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-apigateway-sagemakerendpoint-overwrite.expected.json index f42bbea54..51fc55c7c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apigateway-sagemakerendpoint-overwrite.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-apigateway-sagemakerendpoint-overwrite.expected.json @@ -86,10 +86,10 @@ "testapigatewaysagemakerendpointoverwriteRestApiDeployment3B3B03364a19f99c87430d39385b3313a65df211": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysagemakerendpointoverwriteRestApi0EE22754" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysagemakerendpointoverwriteRestApipredictedratingsuseridGET06B35696", @@ -111,9 +111,6 @@ "testapigatewaysagemakerendpointoverwriteRestApiDeploymentStageprod39A2035F": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysagemakerendpointoverwriteRestApi0EE22754" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -134,6 +131,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysagemakerendpointoverwriteRestApi0EE22754" + }, "StageName": "prod", "TracingEnabled": true } @@ -168,14 +168,8 @@ "testapigatewaysagemakerendpointoverwriteRestApipredictedratingsuseridGET06B35696": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaysagemakerendpointoverwriteRestApipredictedratingsuseridB999A556" - }, - "RestApiId": { - "Ref": "testapigatewaysagemakerendpointoverwriteRestApi0EE22754" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -238,6 +232,12 @@ ], "RequestValidatorId": { "Ref": "testapigatewaysagemakerendpointoverwriteRestApirequestvalidatorFA90CC69" + }, + "ResourceId": { + "Ref": "testapigatewaysagemakerendpointoverwriteRestApipredictedratingsuseridB999A556" + }, + "RestApiId": { + "Ref": "testapigatewaysagemakerendpointoverwriteRestApi0EE22754" } } }, @@ -260,10 +260,10 @@ "testapigatewaysagemakerendpointoverwriteRestApirequestvalidatorFA90CC69": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-param-validator", "RestApiId": { "Ref": "testapigatewaysagemakerendpointoverwriteRestApi0EE22754" }, - "Name": "request-param-validator", "ValidateRequestParameters": true } }, @@ -403,4 +403,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apigateway-sagemakerendpoint-overwrite.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-apigateway-sagemakerendpoint-overwrite.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apigateway-sagemakerendpoint-overwrite.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-apigateway-sagemakerendpoint-overwrite.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.no-overwrite.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-no-overwrite.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.no-overwrite.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-no-overwrite.expected.json index 7ab66b90f..fb77cc90d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.no-overwrite.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-no-overwrite.expected.json @@ -34,10 +34,10 @@ "testapigatewaysagemakerendpointdefaultRestApiDeployment04BFEB63b4264c277dbe6aa60ff584ba21d5d060": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysagemakerendpointdefaultRestApiuseridGETB3BB79AA", @@ -58,9 +58,6 @@ "testapigatewaysagemakerendpointdefaultRestApiDeploymentStageprodFD1743A7": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -81,6 +78,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" + }, "StageName": "prod", "TracingEnabled": true } @@ -103,14 +103,8 @@ "testapigatewaysagemakerendpointdefaultRestApiuseridGETB3BB79AA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "testapigatewaysagemakerendpointdefaultRestApiuserid9952BA11" - }, - "RestApiId": { - "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -170,6 +164,12 @@ ], "RequestValidatorId": { "Ref": "testapigatewaysagemakerendpointdefaultRestApirequestvalidator1A23C251" + }, + "ResourceId": { + "Ref": "testapigatewaysagemakerendpointdefaultRestApiuserid9952BA11" + }, + "RestApiId": { + "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" } } }, @@ -192,10 +192,10 @@ "testapigatewaysagemakerendpointdefaultRestApirequestvalidator1A23C251": { "Type": "AWS::ApiGateway::RequestValidator", "Properties": { + "Name": "request-param-validator", "RestApiId": { "Ref": "testapigatewaysagemakerendpointdefaultRestApi7D1DA11B" }, - "Name": "request-param-validator", "ValidateRequestParameters": true } }, @@ -392,4 +392,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.no-overwrite.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-no-overwrite.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.no-overwrite.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/test/integ.apisag-no-overwrite.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.additional-request-templates.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-additional-request-templates.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.additional-request-templates.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-additional-request-templates.expected.json index f50cec09a..f871d7bf2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.additional-request-templates.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-additional-request-templates.expected.json @@ -201,10 +201,10 @@ "testapigatewaysqsdefaultRestApiDeploymentFB9688F5aa398c65c945d66dd485b50d59cc7a25": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysqsdefaultRestApiGET733E6394", @@ -225,9 +225,6 @@ "testapigatewaysqsdefaultRestApiDeploymentStageprod600FEEE2": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -248,6 +245,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysqsdefaultRestApi554243C3" + }, "StageName": "prod", "TracingEnabled": true } @@ -270,17 +270,8 @@ "testapigatewaysqsdefaultRestApiPOSTD8ACD1CB": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaysqsdefaultRestApi554243C3", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -350,13 +341,7 @@ }, "StatusCode": "500" } - ] - } - }, - "testapigatewaysqsdefaultRestApiGET733E6394": { - "Type": "AWS::ApiGateway::Method", - "Properties": { - "HttpMethod": "GET", + ], "ResourceId": { "Fn::GetAtt": [ "testapigatewaysqsdefaultRestApi554243C3", @@ -365,8 +350,14 @@ }, "RestApiId": { "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, + } + } + }, + "testapigatewaysqsdefaultRestApiGET733E6394": { + "Type": "AWS::ApiGateway::Method", + "Properties": { "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -435,7 +426,16 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaysqsdefaultRestApi554243C3", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaysqsdefaultRestApi554243C3" + } } }, "testapigatewaysqsdefaultRestApiUsagePlan3475CA67": { @@ -643,4 +643,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.additional-request-templates.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-additional-request-templates.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.additional-request-templates.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-additional-request-templates.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-apigateway-sqs-crud.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-apigateway-sqs-crud.expected.json index 752ae8ec5..1b5fd0c33 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-apigateway-sqs-crud.expected.json @@ -201,10 +201,10 @@ "testapigatewaysqsRestApiDeploymentCA19D3723284170350125cf6cf25e30c33a57efd": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysqsRestApi557C7EDC" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysqsRestApiGET4AA265C9", @@ -226,9 +226,6 @@ "testapigatewaysqsRestApiDeploymentStageprod1C007159": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysqsRestApi557C7EDC" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -249,6 +246,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysqsRestApi557C7EDC" + }, "StageName": "prod", "TracingEnabled": true } @@ -271,14 +271,8 @@ "testapigatewaysqsRestApimessageDELETE2D4539B7": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "DELETE", - "ResourceId": { - "Ref": "testapigatewaysqsRestApimessage6D62B7B0" - }, - "RestApiId": { - "Ref": "testapigatewaysqsRestApi557C7EDC" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "DELETE", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -347,23 +341,20 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Ref": "testapigatewaysqsRestApimessage6D62B7B0" + }, + "RestApiId": { + "Ref": "testapigatewaysqsRestApi557C7EDC" + } } }, "testapigatewaysqsRestApiPOST26D15DBA": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "POST", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaysqsRestApi557C7EDC", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaysqsRestApi557C7EDC" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "POST", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -432,13 +423,7 @@ }, "StatusCode": "500" } - ] - } - }, - "testapigatewaysqsRestApiGET4AA265C9": { - "Type": "AWS::ApiGateway::Method", - "Properties": { - "HttpMethod": "GET", + ], "ResourceId": { "Fn::GetAtt": [ "testapigatewaysqsRestApi557C7EDC", @@ -447,8 +432,14 @@ }, "RestApiId": { "Ref": "testapigatewaysqsRestApi557C7EDC" - }, + } + } + }, + "testapigatewaysqsRestApiGET4AA265C9": { + "Type": "AWS::ApiGateway::Method", + "Properties": { "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -517,7 +508,16 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaysqsRestApi557C7EDC", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaysqsRestApi557C7EDC" + } } }, "testapigatewaysqsRestApiUsagePlan2295EB95": { @@ -735,4 +735,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-apigateway-sqs-crud.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-apigateway-sqs-crud.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.custom-integration-responses.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-custom-integration-responses.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.custom-integration-responses.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-custom-integration-responses.expected.json index 746f632fa..10ff3fd83 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.custom-integration-responses.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-custom-integration-responses.expected.json @@ -201,10 +201,10 @@ "testapigatewaysqsintegrationresponsesRestApiDeployment9749223507b4327bc896117bc13d1c395d6fa5e7": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysqsintegrationresponsesRestApi3BE7E402" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysqsintegrationresponsesRestApiGETD105D1F1", @@ -224,9 +224,6 @@ "testapigatewaysqsintegrationresponsesRestApiDeploymentStageprod07200D02": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysqsintegrationresponsesRestApi3BE7E402" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -247,6 +244,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysqsintegrationresponsesRestApi3BE7E402" + }, "StageName": "prod", "TracingEnabled": true } @@ -269,17 +269,8 @@ "testapigatewaysqsintegrationresponsesRestApiGETD105D1F1": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaysqsintegrationresponsesRestApi3BE7E402", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaysqsintegrationresponsesRestApi3BE7E402" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -344,7 +335,16 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaysqsintegrationresponsesRestApi3BE7E402", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaysqsintegrationresponsesRestApi3BE7E402" + } } }, "testapigatewaysqsintegrationresponsesRestApiUsagePlan4172DBF8": { @@ -542,4 +542,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.custom-integration-responses.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-custom-integration-responses.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.custom-integration-responses.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-custom-integration-responses.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.existing-queue.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-existing-queue.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.existing-queue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-existing-queue.expected.json index fb76a1f8a..95af50d20 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.existing-queue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-existing-queue.expected.json @@ -113,10 +113,10 @@ "testapigatewaysqsexistingqueueRestApiDeploymentA3CB681F40a3b61200f0070439f29a9d27e30e73": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysqsexistingqueueRestApi2E025EF5" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysqsexistingqueueRestApiGET860786F8", @@ -136,9 +136,6 @@ "testapigatewaysqsexistingqueueRestApiDeploymentStageprod0DDAF676": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysqsexistingqueueRestApi2E025EF5" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -159,6 +156,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysqsexistingqueueRestApi2E025EF5" + }, "StageName": "prod", "TracingEnabled": true } @@ -181,17 +181,8 @@ "testapigatewaysqsexistingqueueRestApiGET860786F8": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaysqsexistingqueueRestApi2E025EF5", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaysqsexistingqueueRestApi2E025EF5" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -260,7 +251,16 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaysqsexistingqueueRestApi2E025EF5", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaysqsexistingqueueRestApi2E025EF5" + } } }, "testapigatewaysqsexistingqueueRestApiUsagePlan02E1D7E7": { @@ -458,4 +458,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.existing-queue.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-existing-queue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.existing-queue.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-existing-queue.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-no-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-no-arguments.expected.json index 4797bac67..569e49fc9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-no-arguments.expected.json @@ -201,10 +201,10 @@ "testapigatewaysqsdefaultRestApiDeploymentFB9688F5638eca4a0d71dff702d4b2c6b1d1e2df": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testapigatewaysqsdefaultRestApiGET733E6394", @@ -224,9 +224,6 @@ "testapigatewaysqsdefaultRestApiDeploymentStageprod600FEEE2": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -247,6 +244,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testapigatewaysqsdefaultRestApi554243C3" + }, "StageName": "prod", "TracingEnabled": true } @@ -269,17 +269,8 @@ "testapigatewaysqsdefaultRestApiGET733E6394": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Fn::GetAtt": [ - "testapigatewaysqsdefaultRestApi554243C3", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testapigatewaysqsdefaultRestApi554243C3" - }, "AuthorizationType": "AWS_IAM", + "HttpMethod": "GET", "Integration": { "Credentials": { "Fn::GetAtt": [ @@ -348,7 +339,16 @@ }, "StatusCode": "500" } - ] + ], + "ResourceId": { + "Fn::GetAtt": [ + "testapigatewaysqsdefaultRestApi554243C3", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testapigatewaysqsdefaultRestApi554243C3" + } } }, "testapigatewaysqsdefaultRestApiUsagePlan3475CA67": { @@ -546,4 +546,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apisqs-no-arguments.ts 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.cftaplam-customCloudfrontLoggingBucket.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-customCloudfrontLoggingBucket.expected.json index 159abab0a..487b9c752 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.cftaplam-customCloudfrontLoggingBucket.expected.json @@ -99,18 +99,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "cfapigwlambdaLambdaFunctionServiceRole9B40D826", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "cfapigwlambdaLambdaFunctionServiceRole9B40D826", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -172,10 +172,10 @@ "cfapigwlambdaLambdaRestApiDeployment33C24C7D5b6eb6dc887b9e8b9bde9a765f4aacbb": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "cfapigwlambdaLambdaRestApi775C255B" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "cfapigwlambdaLambdaRestApiproxyANY68181290", @@ -196,9 +196,6 @@ "cfapigwlambdaLambdaRestApiDeploymentStageprod83104011": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "cfapigwlambdaLambdaRestApi775C255B" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -219,6 +216,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "cfapigwlambdaLambdaRestApi775C255B" + }, "StageName": "prod", "TracingEnabled": true } @@ -238,7 +238,7 @@ } } }, - "cfapigwlambdaLambdaRestApiproxyANYApiPermissioncustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi1C5998E7ANYproxyA3ACBFF5": { + "cfapigwlambdaLambdaRestApiproxyANYApiPermissioncftaplamcustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi92F6CCCCANYproxy3A68AEF4": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -279,7 +279,7 @@ } } }, - "cfapigwlambdaLambdaRestApiproxyANYApiPermissionTestcustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi1C5998E7ANYproxyAF2D9C87": { + "cfapigwlambdaLambdaRestApiproxyANYApiPermissionTestcftaplamcustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi92F6CCCCANYproxyCDE7366D": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -319,14 +319,8 @@ "cfapigwlambdaLambdaRestApiproxyANY68181290": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "cfapigwlambdaLambdaRestApiproxy6A768910" - }, - "RestApiId": { - "Ref": "cfapigwlambdaLambdaRestApi775C255B" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -353,6 +347,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "cfapigwlambdaLambdaRestApiproxy6A768910" + }, + "RestApiId": { + "Ref": "cfapigwlambdaLambdaRestApi775C255B" } }, "Metadata": { @@ -366,7 +366,7 @@ } } }, - "cfapigwlambdaLambdaRestApiANYApiPermissioncustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi1C5998E7ANY3C46A898": { + "cfapigwlambdaLambdaRestApiANYApiPermissioncftaplamcustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi92F6CCCCANY63987F12": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -407,7 +407,7 @@ } } }, - "cfapigwlambdaLambdaRestApiANYApiPermissionTestcustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi1C5998E7ANY2F5B90FD": { + "cfapigwlambdaLambdaRestApiANYApiPermissionTestcftaplamcustomCloudfrontLoggingBucketcfapigwlambdaLambdaRestApi92F6CCCCANYA05B319C": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -447,17 +447,8 @@ "cfapigwlambdaLambdaRestApiANY81C176E9": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "cfapigwlambdaLambdaRestApi775C255B", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "cfapigwlambdaLambdaRestApi775C255B" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -484,6 +475,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "cfapigwlambdaLambdaRestApi775C255B", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "cfapigwlambdaLambdaRestApi775C255B" } }, "Metadata": { @@ -589,13 +589,13 @@ "cfapigwlambdaCloudFrontToApiGatewaySetHttpSecurityHeadersE20F2933": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8273ed23dc12ef2b23814ad425355213a41659e4f", + "Comment": "SetHttpSecurityHeadersc860b559e82562b55d86431c32566a0eb839407df7", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8273ed23dc12ef2b23814ad425355213a41659e4f", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc860b559e82562b55d86431c32566a0eb839407df7" } }, "cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2": { @@ -691,6 +691,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -769,7 +770,7 @@ } } ], - "TargetOriginId": "customCloudfrontLoggingBucketcfapigwlambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin1C90DACBB", + "TargetOriginId": "cftaplamcustomCloudfrontLoggingBucketcfapigwlambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin169FDD6AF", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -835,7 +836,7 @@ } ] }, - "Id": "customCloudfrontLoggingBucketcfapigwlambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin1C90DACBB", + "Id": "cftaplamcustomCloudfrontLoggingBucketcfapigwlambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin169FDD6AF", "OriginPath": { "Fn::Join": [ "", @@ -891,7 +892,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1001,4 +1002,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-customCloudfrontLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-customCloudfrontLoggingBucket.ts 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.cftaplam-no-arguments.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-no-arguments.expected.json index 46696cee7..3fe8ae626 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.cftaplam-no-arguments.expected.json @@ -99,18 +99,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "testcloudfrontapigatewaylambdaLambdaFunctionServiceRoleCB74590F", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testcloudfrontapigatewaylambdaLambdaFunctionServiceRoleCB74590F", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -172,10 +172,10 @@ "testcloudfrontapigatewaylambdaLambdaRestApiDeployment0C4661C03abb023c303d9e3ff2b4d984cd5d60ab": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "testcloudfrontapigatewaylambdaLambdaRestApiproxyANYAE500A13", @@ -196,9 +196,6 @@ "testcloudfrontapigatewaylambdaLambdaRestApiDeploymentStageprod4617A7B7": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -219,6 +216,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" + }, "StageName": "prod", "TracingEnabled": true } @@ -238,7 +238,7 @@ } } }, - "testcloudfrontapigatewaylambdaLambdaRestApiproxyANYApiPermissionnoargumentstestcloudfrontapigatewaylambdaLambdaRestApi48EFA4E6ANYproxy9F8A87CE": { + "testcloudfrontapigatewaylambdaLambdaRestApiproxyANYApiPermissioncftaplamnoargumentstestcloudfrontapigatewaylambdaLambdaRestApiF14A7709ANYproxyB4BC87CC": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -279,7 +279,7 @@ } } }, - "testcloudfrontapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestnoargumentstestcloudfrontapigatewaylambdaLambdaRestApi48EFA4E6ANYproxy9EBF2E85": { + "testcloudfrontapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestcftaplamnoargumentstestcloudfrontapigatewaylambdaLambdaRestApiF14A7709ANYproxy647FCDDD": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -319,14 +319,8 @@ "testcloudfrontapigatewaylambdaLambdaRestApiproxyANYAE500A13": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "testcloudfrontapigatewaylambdaLambdaRestApiproxyBC09D86F" - }, - "RestApiId": { - "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -353,6 +347,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "testcloudfrontapigatewaylambdaLambdaRestApiproxyBC09D86F" + }, + "RestApiId": { + "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" } }, "Metadata": { @@ -366,7 +366,7 @@ } } }, - "testcloudfrontapigatewaylambdaLambdaRestApiANYApiPermissionnoargumentstestcloudfrontapigatewaylambdaLambdaRestApi48EFA4E6ANYAF9AD91E": { + "testcloudfrontapigatewaylambdaLambdaRestApiANYApiPermissioncftaplamnoargumentstestcloudfrontapigatewaylambdaLambdaRestApiF14A7709ANY1BADAD44": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -407,7 +407,7 @@ } } }, - "testcloudfrontapigatewaylambdaLambdaRestApiANYApiPermissionTestnoargumentstestcloudfrontapigatewaylambdaLambdaRestApi48EFA4E6ANY7C6CF5D5": { + "testcloudfrontapigatewaylambdaLambdaRestApiANYApiPermissionTestcftaplamnoargumentstestcloudfrontapigatewaylambdaLambdaRestApiF14A7709ANYA87D989E": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -447,17 +447,8 @@ "testcloudfrontapigatewaylambdaLambdaRestApiANYBC435DFD": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -484,6 +475,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "testcloudfrontapigatewaylambdaLambdaRestApi6A4CBD44" } }, "Metadata": { @@ -589,13 +589,13 @@ "testcloudfrontapigatewaylambdaCloudFrontToApiGatewaySetHttpSecurityHeaders6945414A": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8118ca6b46a588ddfb2f1826effa6addb3adda75e", + "Comment": "SetHttpSecurityHeadersc87d9e55c0a6a55f893f95e9a700c7ce19634229d0", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8118ca6b46a588ddfb2f1826effa6addb3adda75e", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc87d9e55c0a6a55f893f95e9a700c7ce19634229d0" } }, "testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421": { @@ -691,6 +691,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -769,7 +770,7 @@ } } ], - "TargetOriginId": "noargumentstestcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin1E0B3F41B", + "TargetOriginId": "cftaplamnoargumentstestcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin14C55B0B8", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -835,7 +836,7 @@ } ] }, - "Id": "noargumentstestcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin1E0B3F41B", + "Id": "cftaplamnoargumentstestcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudFrontDistributionOrigin14C55B0B8", "OriginPath": { "Fn::Join": [ "", @@ -891,7 +892,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1001,4 +1002,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-no-arguments.ts 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.cftaplam-override-behavior.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-override-behavior.expected.json index 120092782..d5398b174 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.cftaplam-override-behavior.expected.json @@ -147,18 +147,18 @@ }, "S3Key": "42a35bbf0dec9ef0ac5b0dde87e71a1b8929e8d2d178dd09ccfb2c928ec0198c.zip" }, - "Role": { - "Fn::GetAtt": [ - "cfapilambdaoverrideLambdaFunctionServiceRole4B1A4043", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "cfapilambdaoverrideLambdaFunctionServiceRole4B1A4043", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -220,10 +220,10 @@ "cfapilambdaoverrideLambdaRestApiDeployment82ACBB00e7f3a114a506221ddcaf53765c4dd518": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "cfapilambdaoverrideLambdaRestApi6E7952FC" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "cfapilambdaoverrideLambdaRestApidynamicGET15050D54", @@ -245,9 +245,6 @@ "cfapilambdaoverrideLambdaRestApiDeploymentStageprodC4F6FBB5": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "cfapilambdaoverrideLambdaRestApi6E7952FC" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -268,6 +265,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "cfapilambdaoverrideLambdaRestApi6E7952FC" + }, "StageName": "prod", "TracingEnabled": true } @@ -290,18 +290,18 @@ "cfapilambdaoverrideLambdaRestApistaticGET81EF9C24": { "Type": "AWS::ApiGateway::Method", "Properties": { + "AuthorizationType": "NONE", "HttpMethod": "GET", + "Integration": { + "IntegrationHttpMethod": "GET", + "Type": "HTTP_PROXY", + "Uri": "http://amazon.com" + }, "ResourceId": { "Ref": "cfapilambdaoverrideLambdaRestApistaticC2ECB649" }, "RestApiId": { "Ref": "cfapilambdaoverrideLambdaRestApi6E7952FC" - }, - "AuthorizationType": "NONE", - "Integration": { - "IntegrationHttpMethod": "GET", - "Type": "HTTP_PROXY", - "Uri": "http://amazon.com" } }, "Metadata": { @@ -330,7 +330,7 @@ } } }, - "cfapilambdaoverrideLambdaRestApidynamicGETApiPermissionoverridebehaviorcfapilambdaoverrideLambdaRestApi38D1477BGETdynamic7D0BDE06": { + "cfapilambdaoverrideLambdaRestApidynamicGETApiPermissioncftaplamoverridebehaviorcfapilambdaoverrideLambdaRestApiE3676062GETdynamic9C58B7B8": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -371,7 +371,7 @@ } } }, - "cfapilambdaoverrideLambdaRestApidynamicGETApiPermissionTestoverridebehaviorcfapilambdaoverrideLambdaRestApi38D1477BGETdynamic8C94F569": { + "cfapilambdaoverrideLambdaRestApidynamicGETApiPermissionTestcftaplamoverridebehaviorcfapilambdaoverrideLambdaRestApiE3676062GETdynamic5810873D": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -411,14 +411,8 @@ "cfapilambdaoverrideLambdaRestApidynamicGET15050D54": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "GET", - "ResourceId": { - "Ref": "cfapilambdaoverrideLambdaRestApidynamic88206171" - }, - "RestApiId": { - "Ref": "cfapilambdaoverrideLambdaRestApi6E7952FC" - }, "AuthorizationType": "NONE", + "HttpMethod": "GET", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -445,6 +439,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "cfapilambdaoverrideLambdaRestApidynamic88206171" + }, + "RestApiId": { + "Ref": "cfapilambdaoverrideLambdaRestApi6E7952FC" } }, "Metadata": { @@ -550,13 +550,13 @@ "cfapilambdaoverrideCloudFrontToApiGatewaySetHttpSecurityHeaders67E61E6E": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc82a9e79410026b75533b53f0a37eeb986a591fa95", + "Comment": "SetHttpSecurityHeadersc826c2a6a3ffe209aed33765f37752084820de0d3b", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc82a9e79410026b75533b53f0a37eeb986a591fa95", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc826c2a6a3ffe209aed33765f37752084820de0d3b" } }, "cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0": { @@ -652,6 +652,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -723,7 +724,7 @@ }, "Compress": true, "PathPattern": "/dynamic", - "TargetOriginId": "overridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin2DA299FBD", + "TargetOriginId": "cftaplamoverridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin2D0C9421C", "ViewerProtocolPolicy": "allow-all" } ], @@ -743,7 +744,7 @@ } } ], - "TargetOriginId": "overridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin153BCD088", + "TargetOriginId": "cftaplamoverridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin14C42522D", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -809,7 +810,7 @@ } ] }, - "Id": "overridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin153BCD088", + "Id": "cftaplamoverridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin14C42522D", "OriginPath": { "Fn::Join": [ "", @@ -873,7 +874,7 @@ } ] }, - "Id": "overridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin2DA299FBD", + "Id": "cftaplamoverridebehaviorcfapilambdaoverrideCloudFrontToApiGatewayCloudFrontDistributionOrigin2D0C9421C", "OriginPath": { "Fn::Join": [ "", @@ -930,7 +931,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1040,4 +1041,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-override-behavior.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.cftaplam-override-behavior.ts 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.cftapi-customCloudfrontLoggingBucket.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-customCloudfrontLoggingBucket.expected.json index 954c1541e..4396bedcb 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.cftapi-customCloudfrontLoggingBucket.expected.json @@ -99,18 +99,18 @@ }, "S3Key": "3a18fd3de4803f72260a058823accffd4f8d69986c6862a23cd86265f6cafa0f.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" @@ -172,10 +172,10 @@ "LambdaRestApiDeploymentBA640578812946cff1910fe2b8b339ee3a8d51c7": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "LambdaRestApi95870433" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "LambdaRestApiproxyANY93D43CC0", @@ -196,9 +196,6 @@ "LambdaRestApiDeploymentStageprodB1F3862A": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "LambdaRestApi95870433" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -219,6 +216,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "LambdaRestApi95870433" + }, "StageName": "prod", "TracingEnabled": true } @@ -238,7 +238,7 @@ } } }, - "LambdaRestApiproxyANYApiPermissioncustomCloudfrontLoggingBucketLambdaRestApiB3C97BC3ANYproxyB2970EF0": { + "LambdaRestApiproxyANYApiPermissioncftapicustomCloudfrontLoggingBucketLambdaRestApi99E9E0A2ANYproxyD8618381": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -279,7 +279,7 @@ } } }, - "LambdaRestApiproxyANYApiPermissionTestcustomCloudfrontLoggingBucketLambdaRestApiB3C97BC3ANYproxyB96C3608": { + "LambdaRestApiproxyANYApiPermissionTestcftapicustomCloudfrontLoggingBucketLambdaRestApi99E9E0A2ANYproxy9C09767F": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -319,14 +319,8 @@ "LambdaRestApiproxyANY93D43CC0": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "LambdaRestApiproxy9F99E187" - }, - "RestApiId": { - "Ref": "LambdaRestApi95870433" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -353,6 +347,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "LambdaRestApiproxy9F99E187" + }, + "RestApiId": { + "Ref": "LambdaRestApi95870433" } }, "Metadata": { @@ -366,7 +366,7 @@ } } }, - "LambdaRestApiANYApiPermissioncustomCloudfrontLoggingBucketLambdaRestApiB3C97BC3ANY61586206": { + "LambdaRestApiANYApiPermissioncftapicustomCloudfrontLoggingBucketLambdaRestApi99E9E0A2ANY7163B9C3": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -407,7 +407,7 @@ } } }, - "LambdaRestApiANYApiPermissionTestcustomCloudfrontLoggingBucketLambdaRestApiB3C97BC3ANYBE8D9316": { + "LambdaRestApiANYApiPermissionTestcftapicustomCloudfrontLoggingBucketLambdaRestApi99E9E0A2ANY57980E7B": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -447,17 +447,8 @@ "LambdaRestApiANYA831AD87": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "LambdaRestApi95870433", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "LambdaRestApi95870433" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -484,6 +475,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "LambdaRestApi95870433", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "LambdaRestApi95870433" } }, "Metadata": { @@ -589,13 +589,13 @@ "cfapigwSetHttpSecurityHeaders07A0F0C0": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8fc067b45a5c199a519a90c3b5f02d380f1625f1d", + "Comment": "SetHttpSecurityHeadersc8cc607f355edae7717ef60e6468962d623a2d5ea9", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8fc067b45a5c199a519a90c3b5f02d380f1625f1d", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8cc607f355edae7717ef60e6468962d623a2d5ea9" } }, "cfapigwCloudfrontLoggingBucket79FE4195": { @@ -691,6 +691,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -769,7 +770,7 @@ } } ], - "TargetOriginId": "customCloudfrontLoggingBucketcfapigwCloudFrontDistributionOrigin1D25D62E1", + "TargetOriginId": "cftapicustomCloudfrontLoggingBucketcfapigwCloudFrontDistributionOrigin150F4E889", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -835,7 +836,7 @@ } ] }, - "Id": "customCloudfrontLoggingBucketcfapigwCloudFrontDistributionOrigin1D25D62E1", + "Id": "cftapicustomCloudfrontLoggingBucketcfapigwCloudFrontDistributionOrigin150F4E889", "OriginPath": { "Fn::Join": [ "", @@ -891,7 +892,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1001,4 +1002,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-customCloudfrontLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-customCloudfrontLoggingBucket.ts 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.cftapi-no-arguments.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-no-arguments.expected.json index ba44a3a00..911ae50a2 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.cftapi-no-arguments.expected.json @@ -99,18 +99,18 @@ }, "S3Key": "3a18fd3de4803f72260a058823accffd4f8d69986c6862a23cd86265f6cafa0f.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" @@ -172,10 +172,10 @@ "LambdaRestApiDeploymentBA640578812946cff1910fe2b8b339ee3a8d51c7": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "LambdaRestApi95870433" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "LambdaRestApiproxyANY93D43CC0", @@ -196,9 +196,6 @@ "LambdaRestApiDeploymentStageprodB1F3862A": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "LambdaRestApi95870433" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -219,6 +216,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "LambdaRestApi95870433" + }, "StageName": "prod", "TracingEnabled": true } @@ -238,7 +238,7 @@ } } }, - "LambdaRestApiproxyANYApiPermissionnoargumentsLambdaRestApi1B816FD2ANYproxyBDE6648C": { + "LambdaRestApiproxyANYApiPermissioncftapinoargumentsLambdaRestApiF940E0B7ANYproxyB0743A1B": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -279,7 +279,7 @@ } } }, - "LambdaRestApiproxyANYApiPermissionTestnoargumentsLambdaRestApi1B816FD2ANYproxyC33E886D": { + "LambdaRestApiproxyANYApiPermissionTestcftapinoargumentsLambdaRestApiF940E0B7ANYproxy3C8A7D38": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -319,14 +319,8 @@ "LambdaRestApiproxyANY93D43CC0": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Ref": "LambdaRestApiproxy9F99E187" - }, - "RestApiId": { - "Ref": "LambdaRestApi95870433" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -353,6 +347,12 @@ ] ] } + }, + "ResourceId": { + "Ref": "LambdaRestApiproxy9F99E187" + }, + "RestApiId": { + "Ref": "LambdaRestApi95870433" } }, "Metadata": { @@ -366,7 +366,7 @@ } } }, - "LambdaRestApiANYApiPermissionnoargumentsLambdaRestApi1B816FD2ANYA28D6642": { + "LambdaRestApiANYApiPermissioncftapinoargumentsLambdaRestApiF940E0B7ANY40A5EEFB": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -407,7 +407,7 @@ } } }, - "LambdaRestApiANYApiPermissionTestnoargumentsLambdaRestApi1B816FD2ANY084A62B7": { + "LambdaRestApiANYApiPermissionTestcftapinoargumentsLambdaRestApiF940E0B7ANYDA8F06BF": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -447,17 +447,8 @@ "LambdaRestApiANYA831AD87": { "Type": "AWS::ApiGateway::Method", "Properties": { - "HttpMethod": "ANY", - "ResourceId": { - "Fn::GetAtt": [ - "LambdaRestApi95870433", - "RootResourceId" - ] - }, - "RestApiId": { - "Ref": "LambdaRestApi95870433" - }, "AuthorizationType": "NONE", + "HttpMethod": "ANY", "Integration": { "IntegrationHttpMethod": "POST", "Type": "AWS_PROXY", @@ -484,6 +475,15 @@ ] ] } + }, + "ResourceId": { + "Fn::GetAtt": [ + "LambdaRestApi95870433", + "RootResourceId" + ] + }, + "RestApiId": { + "Ref": "LambdaRestApi95870433" } }, "Metadata": { @@ -589,13 +589,13 @@ "testcloudfrontapigatewaySetHttpSecurityHeadersD8DBA642": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc86815c5ef0b0f2cdd73c6957ce5bbd25e8f895b9b", + "Comment": "SetHttpSecurityHeadersc8b8093f33c7dec7c3b269919bb775882671d92f95", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc86815c5ef0b0f2cdd73c6957ce5bbd25e8f895b9b", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8b8093f33c7dec7c3b269919bb775882671d92f95" } }, "testcloudfrontapigatewayCloudfrontLoggingBucket9811F6E8": { @@ -691,6 +691,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -769,7 +770,7 @@ } } ], - "TargetOriginId": "noargumentstestcloudfrontapigatewayCloudFrontDistributionOrigin154FE4EF8", + "TargetOriginId": "cftapinoargumentstestcloudfrontapigatewayCloudFrontDistributionOrigin187166803", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -835,7 +836,7 @@ } ] }, - "Id": "noargumentstestcloudfrontapigatewayCloudFrontDistributionOrigin154FE4EF8", + "Id": "cftapinoargumentstestcloudfrontapigatewayCloudFrontDistributionOrigin187166803", "OriginPath": { "Fn::Join": [ "", @@ -891,7 +892,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1001,4 +1002,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.cftapi-no-arguments.ts 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.cftmed-customCloudFrontLoggingBucket.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-customCloudFrontLoggingBucket.expected.json index 1dda93107..f6efa9c26 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.cftmed-customCloudFrontLoggingBucket.expected.json @@ -26,10 +26,10 @@ "cloudfrontmediastoreMediaStoreContainer1772C1D5": { "Type": "AWS::MediaStore::Container", "Properties": { + "AccessLoggingEnabled": true, "ContainerName": { "Ref": "AWS::StackName" }, - "AccessLoggingEnabled": true, "CorsPolicy": [ { "AllowedHeaders": [ @@ -175,6 +175,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -276,13 +277,13 @@ "cloudfrontmediastoreSetHttpSecurityHeadersC55C3265": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc80b17555ef95835e434ce55c4536b557a9baf1262", + "Comment": "SetHttpSecurityHeadersc81207803c6e843456a3ffad1566fa3c93edc3a910", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc80b17555ef95835e434ce55c4536b557a9baf1262", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc81207803c6e843456a3ffad1566fa3c93edc3a910" } }, "cloudfrontmediastoreCloudFrontDistribution639346BB": { @@ -316,7 +317,7 @@ "OriginRequestPolicyId": { "Ref": "cloudfrontmediastoreCloudfrontOriginRequestPolicyC99EB0D7" }, - "TargetOriginId": "customCloudFrontLoggingBucketcloudfrontmediastoreCloudFrontDistributionOrigin1ABFFF077", + "TargetOriginId": "cftmedcustomCloudFrontLoggingBucketcloudfrontmediastoreCloudFrontDistributionOrigin155C3A2EE", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -364,7 +365,7 @@ } ] }, - "Id": "customCloudFrontLoggingBucketcloudfrontmediastoreCloudFrontDistributionOrigin1ABFFF077", + "Id": "cftmedcustomCloudFrontLoggingBucketcloudfrontmediastoreCloudFrontDistributionOrigin155C3A2EE", "OriginCustomHeaders": [ { "HeaderName": "User-Agent", @@ -417,7 +418,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-customCloudFrontLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.customCloudFrontLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-customCloudFrontLoggingBucket.ts 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.cftmed-default.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-default.expected.json index 017e02b08..293b2d1e4 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.cftmed-default.expected.json @@ -26,10 +26,10 @@ "testcloudfrontmediastoreMediaStoreContainerF60A96BB": { "Type": "AWS::MediaStore::Container", "Properties": { + "AccessLoggingEnabled": true, "ContainerName": { "Ref": "AWS::StackName" }, - "AccessLoggingEnabled": true, "CorsPolicy": [ { "AllowedHeaders": [ @@ -175,6 +175,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -276,13 +277,13 @@ "testcloudfrontmediastoreSetHttpSecurityHeaders9995A63D": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc85e0befbf4ed85d473981453c3bd34f0a97efbe49", + "Comment": "SetHttpSecurityHeadersc8fc38070dfbd4b29ae6ce900d59a286fe30194d37", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc85e0befbf4ed85d473981453c3bd34f0a97efbe49", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8fc38070dfbd4b29ae6ce900d59a286fe30194d37" } }, "testcloudfrontmediastoreCloudFrontDistributionED9265B1": { @@ -316,7 +317,7 @@ "OriginRequestPolicyId": { "Ref": "testcloudfrontmediastoreCloudfrontOriginRequestPolicyA1D988D3" }, - "TargetOriginId": "defaulttestcloudfrontmediastoreCloudFrontDistributionOrigin104C1DF32", + "TargetOriginId": "cftmeddefaulttestcloudfrontmediastoreCloudFrontDistributionOrigin18FCE310D", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -364,7 +365,7 @@ } ] }, - "Id": "defaulttestcloudfrontmediastoreCloudFrontDistributionOrigin104C1DF32", + "Id": "cftmeddefaulttestcloudfrontmediastoreCloudFrontDistributionOrigin18FCE310D", "OriginCustomHeaders": [ { "HeaderName": "User-Agent", @@ -417,7 +418,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-default.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-default.ts 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.cftmed-existingContainer.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-existingContainer.expected.json index 4685cedc1..f696b89fb 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.cftmed-existingContainer.expected.json @@ -100,6 +100,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -201,13 +202,13 @@ "testcloudfrontmediastoreSetHttpSecurityHeaders9995A63D": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8671d40ce388b672e8795a9218fe7e3f368379f42", + "Comment": "SetHttpSecurityHeadersc81c3292af2c681c7c1a90878198ca9e244a6d4b59", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8671d40ce388b672e8795a9218fe7e3f368379f42", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc81c3292af2c681c7c1a90878198ca9e244a6d4b59" } }, "testcloudfrontmediastoreCloudFrontDistributionED9265B1": { @@ -241,7 +242,7 @@ "OriginRequestPolicyId": { "Ref": "testcloudfrontmediastoreCloudfrontOriginRequestPolicyA1D988D3" }, - "TargetOriginId": "existingContainertestcloudfrontmediastoreCloudFrontDistributionOrigin18E12B71C", + "TargetOriginId": "cftmedexistingContainertestcloudfrontmediastoreCloudFrontDistributionOrigin197FFCE03", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -289,7 +290,7 @@ } ] }, - "Id": "existingContainertestcloudfrontmediastoreCloudFrontDistributionOrigin18E12B71C" + "Id": "cftmedexistingContainertestcloudfrontmediastoreCloudFrontDistributionOrigin197FFCE03" } ] } @@ -334,7 +335,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-existingContainer.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.existingContainer.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-existingContainer.ts 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.cftmed-overrideProperties.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-overrideProperties.expected.json index b7373e8e3..b94760369 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.cftmed-overrideProperties.expected.json @@ -4,8 +4,8 @@ "testcloudfrontmediastoreMediaStoreContainerF60A96BB": { "Type": "AWS::MediaStore::Container", "Properties": { - "ContainerName": "MyOwnMediaStoreContainer", "AccessLoggingEnabled": true, + "ContainerName": "MyOwnMediaStoreContainer", "CorsPolicy": [ { "AllowedHeaders": [ @@ -139,6 +139,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -240,13 +241,13 @@ "testcloudfrontmediastoreSetHttpSecurityHeaders9995A63D": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8f338626119f90653fe964a54eb18cb4a8d6406ce", + "Comment": "SetHttpSecurityHeadersc834ed9460f71cbf9e095fdd5f74b7899e8b403a13", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8f338626119f90653fe964a54eb18cb4a8d6406ce", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc834ed9460f71cbf9e095fdd5f74b7899e8b403a13" } }, "testcloudfrontmediastoreCloudFrontDistributionED9265B1": { @@ -283,7 +284,7 @@ "OriginRequestPolicyId": { "Ref": "testcloudfrontmediastoreCloudfrontOriginRequestPolicyA1D988D3" }, - "TargetOriginId": "overridePropertiestestcloudfrontmediastoreCloudFrontDistributionOrigin1120F47FC", + "TargetOriginId": "cftmedoverridePropertiestestcloudfrontmediastoreCloudFrontDistributionOrigin164C330F3", "ViewerProtocolPolicy": "https-only" }, "Enabled": true, @@ -331,7 +332,7 @@ } ] }, - "Id": "overridePropertiestestcloudfrontmediastoreCloudFrontDistributionOrigin1120F47FC" + "Id": "cftmedoverridePropertiestestcloudfrontmediastoreCloudFrontDistributionOrigin164C330F3" } ] } @@ -376,7 +377,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-overrideProperties.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.overrideProperties.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-overrideProperties.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withSecurityHeaderBehavior.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withSecurityHeaderBehavior.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withSecurityHeaderBehavior.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withSecurityHeaderBehavior.expected.json index 5d05ca67e..b587f4fbc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withSecurityHeaderBehavior.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withSecurityHeaderBehavior.expected.json @@ -26,10 +26,10 @@ "testcloudfrontmediastoreMediaStoreContainerF60A96BB": { "Type": "AWS::MediaStore::Container", "Properties": { + "AccessLoggingEnabled": true, "ContainerName": { "Ref": "AWS::StackName" }, - "AccessLoggingEnabled": true, "CorsPolicy": [ { "AllowedHeaders": [ @@ -214,7 +214,7 @@ "Type": "AWS::CloudFront::ResponseHeadersPolicy", "Properties": { "ResponseHeadersPolicyConfig": { - "Name": "withSecurityHeaderBehaviortestcloudfrontmediastoreResponseHeadersPolicyA685DA47", + "Name": "cftmedwithSecurityHeaderBehaviortestcloudfrontmediastoreResponseHeadersPolicy9AD9613C", "SecurityHeadersConfig": { "ContentSecurityPolicy": { "ContentSecurityPolicy": "upgrade-insecure-requests; default-src 'none';", @@ -253,7 +253,7 @@ "ResponseHeadersPolicyId": { "Ref": "testcloudfrontmediastoreResponseHeadersPolicyE359AC46" }, - "TargetOriginId": "withSecurityHeaderBehaviortestcloudfrontmediastoreCloudFrontDistributionOrigin1F2E772A7", + "TargetOriginId": "cftmedwithSecurityHeaderBehaviortestcloudfrontmediastoreCloudFrontDistributionOrigin19AE9261A", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -301,7 +301,7 @@ } ] }, - "Id": "withSecurityHeaderBehaviortestcloudfrontmediastoreCloudFrontDistributionOrigin1F2E772A7", + "Id": "cftmedwithSecurityHeaderBehaviortestcloudfrontmediastoreCloudFrontDistributionOrigin19AE9261A", "OriginCustomHeaders": [ { "HeaderName": "User-Agent", diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withSecurityHeaderBehavior.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withSecurityHeaderBehavior.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withSecurityHeaderBehavior.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withSecurityHeaderBehavior.ts 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.cftmed-withoutHttpSecurityHeaders.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withoutHttpSecurityHeaders.expected.json index f32082de5..12191e2fe 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.cftmed-withoutHttpSecurityHeaders.expected.json @@ -26,10 +26,10 @@ "testcloudfrontmediastoreMediaStoreContainerF60A96BB": { "Type": "AWS::MediaStore::Container", "Properties": { + "AccessLoggingEnabled": true, "ContainerName": { "Ref": "AWS::StackName" }, - "AccessLoggingEnabled": true, "CorsPolicy": [ { "AllowedHeaders": [ @@ -175,6 +175,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -293,7 +294,7 @@ "OriginRequestPolicyId": { "Ref": "testcloudfrontmediastoreCloudfrontOriginRequestPolicyA1D988D3" }, - "TargetOriginId": "withoutHttpSecurityHeaderstestcloudfrontmediastoreCloudFrontDistributionOrigin1E9279918", + "TargetOriginId": "cftmedwithoutHttpSecurityHeaderstestcloudfrontmediastoreCloudFrontDistributionOrigin188E58576", "ViewerProtocolPolicy": "redirect-to-https" }, "Enabled": true, @@ -341,7 +342,7 @@ } ] }, - "Id": "withoutHttpSecurityHeaderstestcloudfrontmediastoreCloudFrontDistributionOrigin1E9279918", + "Id": "cftmedwithoutHttpSecurityHeaderstestcloudfrontmediastoreCloudFrontDistributionOrigin188E58576", "OriginCustomHeaders": [ { "HeaderName": "User-Agent", @@ -394,7 +395,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withoutHttpSecurityHeaders.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.withoutHttpSecurityHeaders.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.cftmed-withoutHttpSecurityHeaders.ts 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.cfts3-custom-headers.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.expected.json index 266cdd2a2..f00c3051e 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.cfts3-custom-headers.expected.json @@ -4,6 +4,7 @@ "MyFunction3BAA72D1": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; base-uri 'self'; img-src 'self'; script-src 'self'; style-src 'self' https:; object-src 'none'; frame-ancestors 'none'; font-src 'self' https:; form-action 'self'; manifest-src 'self'; connect-src 'self'\" }; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; headers['referrer-policy'] = { value: 'same-origin' }; return response; }", "FunctionConfig": { "Comment": { @@ -13,7 +14,7 @@ { "Ref": "AWS::Region" }, - "customsecurityheadersMyFunctionFAC550FB" + "cfts3customheadersMyFunction7C965360" ] ] }, @@ -26,11 +27,10 @@ { "Ref": "AWS::Region" }, - "customsecurityheadersMyFunctionFAC550FB" + "cfts3customheadersMyFunction7C965360" ] ] - }, - "AutoPublish": true + } } }, "testcloudfronts3S3LoggingBucket90D239DD": { @@ -244,6 +244,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -343,13 +344,13 @@ "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8132e0ba07d4c8fdbdb431ae46eef456c0589cb21", + "Comment": "SetHttpSecurityHeadersc8da5865185980f6eb00e7dd351786a8b49cd2929e", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8132e0ba07d4c8fdbdb431ae46eef456c0589cb21", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8da5865185980f6eb00e7dd351786a8b49cd2929e" } }, "testcloudfronts3CloudfrontLoggingBucket985C0FE8": { @@ -445,6 +446,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -509,7 +511,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for customsecurityheaderstestcloudfronts3CloudFrontDistributionOrigin1FCAF9C77" + "Comment": "Identity for cfts3customheaderstestcloudfronts3CloudFrontDistributionOrigin126E0E496" } } }, @@ -531,7 +533,7 @@ } } ], - "TargetOriginId": "customsecurityheaderstestcloudfronts3CloudFrontDistributionOrigin1FCAF9C77", + "TargetOriginId": "cfts3customheaderstestcloudfronts3CloudFrontDistributionOrigin126E0E496", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -554,7 +556,7 @@ "RegionalDomainName" ] }, - "Id": "customsecurityheaderstestcloudfronts3CloudFrontDistributionOrigin1FCAF9C77", + "Id": "cfts3customheaderstestcloudfronts3CloudFrontDistributionOrigin126E0E496", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -612,7 +614,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-security-headers.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-headers.ts 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.cfts3-custom-originPath.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.expected.json index aa9a6f24b..e49b49920 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.cfts3-custom-originPath.expected.json @@ -212,6 +212,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -311,13 +312,13 @@ "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc824484dfea4176847245e871498ffd7e454223fe4", + "Comment": "SetHttpSecurityHeadersc8966f7b24c95d47868a69c8831fbd3ccac3fa3d70", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc824484dfea4176847245e871498ffd7e454223fe4", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8966f7b24c95d47868a69c8831fbd3ccac3fa3d70" } }, "testcloudfronts3CloudfrontLoggingBucket985C0FE8": { @@ -413,6 +414,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -477,7 +479,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1B44CC042" + "Comment": "Identity for cfts3customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1AE2DDD7C" } } }, @@ -499,7 +501,7 @@ } } ], - "TargetOriginId": "customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1B44CC042", + "TargetOriginId": "cfts3customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1AE2DDD7C", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -522,7 +524,7 @@ "RegionalDomainName" ] }, - "Id": "customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1B44CC042", + "Id": "cfts3customoriginPathtestcloudfronts3CloudFrontDistributionOrigin1AE2DDD7C", "OriginPath": "/testPath", "S3OriginConfig": { "OriginAccessIdentity": { @@ -581,7 +583,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.custom-originPath.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-custom-originPath.ts 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.cfts3-customCloudFrontLoggingBucket.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.expected.json index 5b99a5606..ecd890e66 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.cfts3-customCloudFrontLoggingBucket.expected.json @@ -212,6 +212,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -311,13 +312,13 @@ "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc88d4d30b2e66a3bd009aa7f11e35596ee70824ece", + "Comment": "SetHttpSecurityHeadersc853f5cf48adabb9680b666a0c549e9b779fe54127", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc88d4d30b2e66a3bd009aa7f11e35596ee70824ece", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc853f5cf48adabb9680b666a0c549e9b779fe54127" } }, "testcloudfronts3CloudfrontLoggingBucket985C0FE8": { @@ -413,6 +414,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -477,7 +479,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for customCloudFrontLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin115B4D0FD" + "Comment": "Identity for cfts3customCloudFrontLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin18A4ECB64" } } }, @@ -499,7 +501,7 @@ } } ], - "TargetOriginId": "customCloudFrontLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin115B4D0FD", + "TargetOriginId": "cfts3customCloudFrontLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin18A4ECB64", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -522,7 +524,7 @@ "RegionalDomainName" ] }, - "Id": "customCloudFrontLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin115B4D0FD", + "Id": "cfts3customCloudFrontLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin18A4ECB64", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -580,7 +582,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customCloudFrontLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customCloudFrontLoggingBucket.ts 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.cfts3-customLoggingBucket.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBucket.expected.json index 1a5473490..9654a03cf 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.cfts3-customLoggingBucket.expected.json @@ -86,6 +86,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -275,6 +276,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -374,13 +376,13 @@ "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8adfb824ff76ff8867fe60ef9e02c0d312ebd9f83", + "Comment": "SetHttpSecurityHeadersc8c3d2243132d57b810e98b12d9e3c4c64e6e1cabe", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8adfb824ff76ff8867fe60ef9e02c0d312ebd9f83", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8c3d2243132d57b810e98b12d9e3c4c64e6e1cabe" } }, "testcloudfronts3CloudfrontLoggingBucket985C0FE8": { @@ -476,6 +478,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -540,7 +543,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for customLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin10D3900D7" + "Comment": "Identity for cfts3customLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin169BF6A51" } } }, @@ -562,7 +565,7 @@ } } ], - "TargetOriginId": "customLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin10D3900D7", + "TargetOriginId": "cfts3customLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin169BF6A51", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -585,7 +588,7 @@ "RegionalDomainName" ] }, - "Id": "customLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin10D3900D7", + "Id": "cfts3customLoggingBuckettestcloudfronts3CloudFrontDistributionOrigin169BF6A51", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -643,7 +646,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-customLoggingBucket.ts 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.cfts3-existing-bucket.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.expected.json index 6aaa2e8cf..de1f4c341 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.cfts3-existing-bucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -204,7 +205,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -254,13 +255,13 @@ "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc87bceb93c12dbe589df4f4994a0258334a9b78e4a", + "Comment": "SetHttpSecurityHeadersc8321a2c9fa54d380831d390bfbd7aff27f99fd427", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc87bceb93c12dbe589df4f4994a0258334a9b78e4a", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc8321a2c9fa54d380831d390bfbd7aff27f99fd427" } }, "testcloudfronts3CloudfrontLoggingBucket985C0FE8": { @@ -356,6 +357,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -420,7 +422,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for existingbuckettestcloudfronts3CloudFrontDistributionOrigin1F40EF14E" + "Comment": "Identity for cfts3existingbuckettestcloudfronts3CloudFrontDistributionOrigin10617473F" } } }, @@ -435,7 +437,7 @@ }, "Compress": true, "PathPattern": "/images/*.jpg", - "TargetOriginId": "existingbuckettestcloudfronts3CloudFrontDistributionOrigin2EB6A4DC9", + "TargetOriginId": "cfts3existingbuckettestcloudfronts3CloudFrontDistributionOrigin28690577F", "ViewerProtocolPolicy": "allow-all" } ], @@ -453,7 +455,7 @@ } } ], - "TargetOriginId": "existingbuckettestcloudfronts3CloudFrontDistributionOrigin1F40EF14E", + "TargetOriginId": "cfts3existingbuckettestcloudfronts3CloudFrontDistributionOrigin10617473F", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -476,7 +478,7 @@ "RegionalDomainName" ] }, - "Id": "existingbuckettestcloudfronts3CloudFrontDistributionOrigin1F40EF14E", + "Id": "cfts3existingbuckettestcloudfronts3CloudFrontDistributionOrigin10617473F", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -498,7 +500,7 @@ "RegionalDomainName" ] }, - "Id": "existingbuckettestcloudfronts3CloudFrontDistributionOrigin2EB6A4DC9", + "Id": "cfts3existingbuckettestcloudfronts3CloudFrontDistributionOrigin28690577F", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -531,7 +533,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for existingbuckettestcloudfronts3CloudFrontDistributionOrigin2EB6A4DC9" + "Comment": "Identity for cfts3existingbuckettestcloudfronts3CloudFrontDistributionOrigin28690577F" } } }, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-existing-bucket.ts 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.cfts3-no-arguments.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.expected.json index 6fdb685d1..f050b41cd 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.cfts3-no-arguments.expected.json @@ -99,6 +99,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -198,13 +199,13 @@ "testcloudfronts3SetHttpSecurityHeaders6C5A1E69": { "Type": "AWS::CloudFront::Function", "Properties": { + "AutoPublish": true, "FunctionCode": "function handler(event) { var response = event.response; var headers = response.headers; headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; headers['content-security-policy'] = { value: \"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\"}; headers['x-content-type-options'] = { value: 'nosniff'}; headers['x-frame-options'] = {value: 'DENY'}; headers['x-xss-protection'] = {value: '1; mode=block'}; return response; }", "FunctionConfig": { - "Comment": "SetHttpSecurityHeadersc8075c5215eb89e52dc0db6c01788e90b8e754531c", + "Comment": "SetHttpSecurityHeadersc88b3e0fe5ebfb7f401b410752c35f74a3678d5cb1", "Runtime": "cloudfront-js-1.0" }, - "Name": "SetHttpSecurityHeadersc8075c5215eb89e52dc0db6c01788e90b8e754531c", - "AutoPublish": true + "Name": "SetHttpSecurityHeadersc88b3e0fe5ebfb7f401b410752c35f74a3678d5cb1" } }, "testcloudfronts3CloudfrontLoggingBucket985C0FE8": { @@ -300,6 +301,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -364,7 +366,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for noargumentstestcloudfronts3CloudFrontDistributionOrigin1E8A0111C" + "Comment": "Identity for cfts3noargumentstestcloudfronts3CloudFrontDistributionOrigin1203032D1" } } }, @@ -386,7 +388,7 @@ } } ], - "TargetOriginId": "noargumentstestcloudfronts3CloudFrontDistributionOrigin1E8A0111C", + "TargetOriginId": "cfts3noargumentstestcloudfronts3CloudFrontDistributionOrigin1203032D1", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -409,7 +411,7 @@ "RegionalDomainName" ] }, - "Id": "noargumentstestcloudfronts3CloudFrontDistributionOrigin1E8A0111C", + "Id": "cfts3noargumentstestcloudfronts3CloudFrontDistributionOrigin1203032D1", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -467,7 +469,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-arguments.ts 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.cfts3-no-security-headers.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.expected.json index 495087c8b..fa33e7460 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.cfts3-no-security-headers.expected.json @@ -212,6 +212,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -401,6 +402,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -465,7 +467,7 @@ "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", "Properties": { "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Identity for nosecurityheaderstestcloudfronts3nosecurityheadersCloudFrontDistributionOrigin10FDD9A1E" + "Comment": "Identity for cfts3nosecurityheaderstestcloudfronts3nosecurityheadersCloudFrontDistributionOrigin1A0125E27" } } }, @@ -476,7 +478,7 @@ "DefaultCacheBehavior": { "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6", "Compress": true, - "TargetOriginId": "nosecurityheaderstestcloudfronts3nosecurityheadersCloudFrontDistributionOrigin10FDD9A1E", + "TargetOriginId": "cfts3nosecurityheaderstestcloudfronts3nosecurityheadersCloudFrontDistributionOrigin1A0125E27", "ViewerProtocolPolicy": "redirect-to-https" }, "DefaultRootObject": "index.html", @@ -499,7 +501,7 @@ "RegionalDomainName" ] }, - "Id": "nosecurityheaderstestcloudfronts3nosecurityheadersCloudFrontDistributionOrigin10FDD9A1E", + "Id": "cfts3nosecurityheaderstestcloudfronts3nosecurityheadersCloudFrontDistributionOrigin1A0125E27", "S3OriginConfig": { "OriginAccessIdentity": { "Fn::Join": [ @@ -557,7 +559,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.ts rename to source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.cfts3-no-security-headers.ts 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.cogapilam-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.cogapilam-no-arguments.expected.json index d2b8fd4b5..9bd5d05e6 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.cogapilam-no-arguments.expected.json @@ -237,7 +237,7 @@ } } }, - "testcognitoapigatewaylambdaLambdaRestApiproxyANYApiPermissionnoargumentstestcognitoapigatewaylambdaLambdaRestApi462B9E89ANYproxy65783C1A": { + "testcognitoapigatewaylambdaLambdaRestApiproxyANYApiPermissioncogapilamnoargumentstestcognitoapigatewaylambdaLambdaRestApi67DF35F8ANYproxyEED76CEA": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -278,7 +278,7 @@ } } }, - "testcognitoapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestnoargumentstestcognitoapigatewaylambdaLambdaRestApi462B9E89ANYproxy8099796A": { + "testcognitoapigatewaylambdaLambdaRestApiproxyANYApiPermissionTestcogapilamnoargumentstestcognitoapigatewaylambdaLambdaRestApi67DF35F8ANYproxyD56E5373": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -358,7 +358,7 @@ } } }, - "testcognitoapigatewaylambdaLambdaRestApiANYApiPermissionnoargumentstestcognitoapigatewaylambdaLambdaRestApi462B9E89ANY9464EB5C": { + "testcognitoapigatewaylambdaLambdaRestApiANYApiPermissioncogapilamnoargumentstestcognitoapigatewaylambdaLambdaRestApi67DF35F8ANYF85B79BE": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -399,7 +399,7 @@ } } }, - "testcognitoapigatewaylambdaLambdaRestApiANYApiPermissionTestnoargumentstestcognitoapigatewaylambdaLambdaRestApi462B9E89ANYDB0151A4": { + "testcognitoapigatewaylambdaLambdaRestApiANYApiPermissionTestcogapilamnoargumentstestcognitoapigatewaylambdaLambdaRestApi67DF35F8ANYC215720C": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.cogapilam-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.cogapilam-no-arguments.ts 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.dbslamels-deploy-with-vpc.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-deploy-with-vpc.expected.json index ff8d022f8..1c6d1bdfb 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.dbslamels-deploy-with-vpc.expected.json @@ -136,7 +136,7 @@ "testddbstreamslambdaeskLambdaToElasticSearchReplaceDefaultSecurityGroupsecuritygroupB649DF04": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deploy-with-vpc/test-ddbstreams-lambda-esk/LambdaToElasticSearch/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/LambdaToElasticSearch/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -242,7 +242,7 @@ } } }, - "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionDynamoDBEventSourcedeploywithvpctestddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTableB7F9F75CD09B2055": { + "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionDynamoDBEventSourcedbslamelsdeploywithvpctestddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTable3450D24364E2F0CA": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "BatchSize": 100, @@ -359,7 +359,7 @@ "testddbstreamslambdaeskLambdaToElasticSearchUserPoolDomainA6C84014": { "Type": "AWS::Cognito::UserPoolDomain", "Properties": { - "Domain": "pooldomaintest-7c94db", + "Domain": "pooldomaintest-2342", "UserPoolId": { "Ref": "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPool97EA2952" } @@ -416,7 +416,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/pooldomaintest-7c94db/*" + ":domain/pooldomaintest-2342/*" ] ] } @@ -529,7 +529,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domaintest-7c94db" + ":domain/domaintest-1234" ] ] } @@ -601,7 +601,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domaintest-7c94db/*" + ":domain/domaintest-1234/*" ] ] } @@ -628,7 +628,7 @@ "EnforceHTTPS": true, "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07" }, - "DomainName": "domaintest-7c94db", + "DomainName": "domaintest-1234", "EBSOptions": { "EBSEnabled": true, "VolumeSize": 10 @@ -816,7 +816,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc" } ] } @@ -838,7 +838,7 @@ }, { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet1" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -852,7 +852,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet1" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -888,7 +888,7 @@ }, { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet2" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -902,7 +902,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet2" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -938,7 +938,7 @@ }, { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet3" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -952,7 +952,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet3" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -989,7 +989,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" + "Value": "dbslamels-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/FlowLog" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" } ] }, @@ -1078,7 +1078,7 @@ "Tags": [ { "Key": "Name", - "Value": "deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" + "Value": "dbslamels-deploy-with-vpc/test-ddbstreams-lambda-esk/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-deploy-with-vpc.ts similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.ts rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-deploy-with-vpc.ts index 7cd4f1bac..aeac16b60 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-deploy-with-vpc.ts @@ -28,8 +28,8 @@ const props: DynamoDBStreamsToLambdaToElasticSearchAndKibanaProps = { runtime: lambda.Runtime.NODEJS_16_X, handler: 'index.handler' }, - domainName: 'domaintest-7c94db', - cognitoDomainName: 'pooldomaintest-7c94db', + domainName: 'domaintest-1234', + cognitoDomainName: 'pooldomaintest-2342', deployVpc: 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.dbslamels-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-no-arguments.expected.json index e1a92f7b7..55ed4697a 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.dbslamels-no-arguments.expected.json @@ -177,7 +177,7 @@ } } }, - "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionDynamoDBEventSourcenoargumentstestddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTable6C5773679DA39002": { + "testddbstreamslambdaeskLambdaToElasticSearchLambdaFunctionDynamoDBEventSourcedbslamelsnoargumentstestddbstreamslambdaeskDynamoDBStreamsToLambdaDynamoTableE5DA3737A0F8E1D7": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "BatchSize": 100, @@ -289,7 +289,7 @@ "testddbstreamslambdaeskLambdaToElasticSearchUserPoolDomainA6C84014": { "Type": "AWS::Cognito::UserPoolDomain", "Properties": { - "Domain": "pooldomaintest-7c94db", + "Domain": "pooldomaintest-98eb", "UserPoolId": { "Ref": "testddbstreamslambdaeskLambdaToElasticSearchCognitoUserPool97EA2952" } @@ -346,7 +346,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/pooldomaintest-7c94db/*" + ":domain/pooldomaintest-98eb/*" ] ] } @@ -459,7 +459,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domaintest-7c94db" + ":domain/domaintest-84ef" ] ] } @@ -531,7 +531,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domaintest-7c94db/*" + ":domain/domaintest-84ef/*" ] ] } @@ -558,7 +558,7 @@ "EnforceHTTPS": true, "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07" }, - "DomainName": "domaintest-7c94db", + "DomainName": "domaintest-84ef", "EBSOptions": { "EBSEnabled": true, "VolumeSize": 10 diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-no-arguments.ts similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-no-arguments.ts index 490aaba9f..bc5a49757 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.dbslamels-no-arguments.ts @@ -28,8 +28,8 @@ const props: DynamoDBStreamsToLambdaToElasticSearchAndKibanaProps = { runtime: lambda.Runtime.NODEJS_16_X, handler: 'index.handler' }, - domainName: 'domaintest-7c94db', - cognitoDomainName: 'pooldomaintest-7c94db' + domainName: 'domaintest-84ef', + cognitoDomainName: 'pooldomaintest-98eb' }; new DynamoDBStreamsToLambdaToElasticSearchAndKibana(stack, 'test-ddbstreams-lambda-esk', props); diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.existing-table.expected.json b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-existing-table.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.existing-table.expected.json rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-existing-table.expected.json index b89b0b08d..7f9f9b0b6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.existing-table.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-existing-table.expected.json @@ -3,19 +3,19 @@ "mytable0FC8E698": { "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 }, @@ -160,18 +160,18 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testdynamodbstreamslambdaLambdaFunctionServiceRole17CB5CA1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testdynamodbstreamslambdaLambdaFunctionServiceRole17CB5CA1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -200,12 +200,9 @@ } } }, - "testdynamodbstreamslambdaLambdaFunctionDynamoDBEventSourceexistingtablemytable8CDC3452876951B6": { + "testdynamodbstreamslambdaLambdaFunctionDynamoDBEventSourcedbslamexistingtablemytable00A85A16A55832C3": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testdynamodbstreamslambdaLambdaFunctionE18EC5EF" - }, "BatchSize": 100, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -224,6 +221,9 @@ "StreamArn" ] }, + "FunctionName": { + "Ref": "testdynamodbstreamslambdaLambdaFunctionE18EC5EF" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 500, "StartingPosition": "TRIM_HORIZON" diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.existing-table.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-existing-table.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.existing-table.ts rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-existing-table.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-no-arguments.expected.json index ae6f93c0d..c9e4a9c14 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-no-arguments.expected.json @@ -131,18 +131,18 @@ }, "S3Key": "0c3255e93ffe7a906c7422e9f0e9cc4c7fd86ee996ee3bb302e2f134b38463c8.zip" }, - "Role": { - "Fn::GetAtt": [ - "testdynamodbstreamslambdaLambdaFunctionServiceRole17CB5CA1", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testdynamodbstreamslambdaLambdaFunctionServiceRole17CB5CA1", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -171,12 +171,9 @@ } } }, - "testdynamodbstreamslambdaLambdaFunctionDynamoDBEventSourcenoargumentstestdynamodbstreamslambdaDynamoTableAFF0DC9B4ED090BE": { + "testdynamodbstreamslambdaLambdaFunctionDynamoDBEventSourcedbslamnoargumentstestdynamodbstreamslambdaDynamoTable052A32715F190F5F": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { - "FunctionName": { - "Ref": "testdynamodbstreamslambdaLambdaFunctionE18EC5EF" - }, "BatchSize": 100, "BisectBatchOnFunctionError": true, "DestinationConfig": { @@ -195,6 +192,9 @@ "StreamArn" ] }, + "FunctionName": { + "Ref": "testdynamodbstreamslambdaLambdaFunctionE18EC5EF" + }, "MaximumRecordAgeInSeconds": 86400, "MaximumRetryAttempts": 5, "StartingPosition": "TRIM_HORIZON" @@ -203,19 +203,19 @@ "testdynamodbstreamslambdaDynamoTable64210BF7": { "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/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/test/integ.dbslam-no-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-customLoggingBucket.expected.json similarity index 77% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-customLoggingBucket.expected.json index b9f4c55de..9038d995c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-customLoggingBucket.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketAutoDeleteObjectsCustomResourceB808B0FC": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C" + } + }, + "DependsOn": [ + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketPolicyCF0D71BD" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testkinesisfirehoses3KinesisFirehoseToS3S3Bucket303877FF": { "Type": "AWS::S3::Bucket", "Properties": { @@ -341,7 +405,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosecustomLoggingBuckoses3KinesisFirehoseToS38ABD91BB", + "DeliveryStreamName": "KinesisFirehoseevtfhss3customLogoses3KinesisFirehoseToS3E4F82781", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -466,6 +530,82 @@ } ] } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-customLoggingBucket.ts similarity index 88% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-customLoggingBucket.ts index ef5852a3f..d25f52a2f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-customLoggingBucket.ts @@ -14,7 +14,7 @@ /// !cdk-integ * import { App, Stack, RemovalPolicy, Duration } from "aws-cdk-lib"; import { EventbridgeToKinesisFirehoseToS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; import * as s3 from "aws-cdk-lib/aws-s3"; import * as events from 'aws-cdk-lib/aws-events'; @@ -32,6 +32,7 @@ new EventbridgeToKinesisFirehoseToS3(stack, 'test-kinesisfirehose-s3', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: s3.BucketEncryption.S3_MANAGED, versioned: true @@ -41,4 +42,5 @@ new EventbridgeToKinesisFirehoseToS3(stack, 'test-kinesisfirehose-s3', { } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-existing-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-existing-eventbus.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-existing-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-existing-eventbus.expected.json index 4cc9bd8bf..3c281d102 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-existing-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-existing-eventbus.expected.json @@ -234,7 +234,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseeventbridgekinesioses3KinesisFirehoseToS316415EBE", + "DeliveryStreamName": "KinesisFirehoseevtfhss3eventbridoses3KinesisFirehoseToS377F40344", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-existing-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-existing-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-existing-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-existing-eventbus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-new-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-new-eventbus.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-new-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-new-eventbus.expected.json index 674560545..b2641aa1a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-new-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-new-eventbus.expected.json @@ -228,7 +228,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseeventbridgekinesioses3KinesisFirehoseToS3BB825337", + "DeliveryStreamName": "KinesisFirehoseevtfhss3eventbridoses3KinesisFirehoseToS3980BC114", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-new-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-new-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-new-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-new-eventbus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-no-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-no-arguments.expected.json index c5bfb2b37..054f3cf12 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-no-arguments.expected.json @@ -341,7 +341,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseeventbridgekinesioses3KinesisFirehoseToS3EFE1A339", + "DeliveryStreamName": "KinesisFirehoseevtfhss3eventbridoses3KinesisFirehoseToS3BF3B2749", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.eventbridge-kinesisfirehose-s3-no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-eventbridge-kinesisfirehose-s3-no-arguments.ts 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.evtfhss3-existingLoggingBucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-existingLoggingBucket.expected.json index 8a3494f26..59941168d 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.evtfhss3-existingLoggingBucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -178,7 +179,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -447,7 +448,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseexistingLoggingBuoses3KinesisFirehoseToS3375399AD", + "DeliveryStreamName": "KinesisFirehoseevtfhss3existingLoses3KinesisFirehoseToS3EAD9E0AB", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-existingLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.existingLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/test/integ.evtfhss3-existingLoggingBucket.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing-eventbus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing-eventbus.expected.json index 8ac3c17b4..093123e2b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing-eventbus.expected.json @@ -100,9 +100,9 @@ "testeventbridgekinesisstreamexistingKinesisStreamGetRecordsIteratorAgeAlarmA1800C3D": { "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, @@ -113,9 +113,9 @@ "testeventbridgekinesisstreamexistingKinesisStreamReadProvisionedThroughputExceededAlarm078FEB59": { "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-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing-eventbus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing.expected.json index 7b52073cf..7f68bd995 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing.expected.json @@ -87,9 +87,9 @@ "testeventbridgekinesisstreamexistingKinesisStreamGetRecordsIteratorAgeAlarmA1800C3D": { "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, @@ -100,9 +100,9 @@ "testeventbridgekinesisstreamexistingKinesisStreamReadProvisionedThroughputExceededAlarm078FEB59": { "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-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-existing.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-new-eventbus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-new-eventbus.expected.json index 188654d1b..37362f5ee 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-new-eventbus.expected.json @@ -100,9 +100,9 @@ "testeventbridgekinesisstreamKinesisStreamGetRecordsIteratorAgeAlarm5FD9545D": { "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, @@ -113,9 +113,9 @@ "testeventbridgekinesisstreamKinesisStreamReadProvisionedThroughputExceededAlarm600B4281": { "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-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-new-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-new-eventbus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-no-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-no-arguments.expected.json index 62961abd1..1048fccdf 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-no-arguments.expected.json @@ -87,9 +87,9 @@ "testeventbridgekinesisstreamKinesisStreamGetRecordsIteratorAgeAlarm5FD9545D": { "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, @@ -100,9 +100,9 @@ "testeventbridgekinesisstreamKinesisStreamReadProvisionedThroughputExceededAlarm600B4281": { "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-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/test/integ.evtkin-eventbridge-kinesisstreams-no-arguments.ts 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.evtlam-eventbridge-existing-eventbus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-existing-eventbus.expected.json 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.evtlam-eventbridge-existing-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-existing-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-existing-eventbus.ts 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.evtlam-eventbridge-new-eventbus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-new-eventbus.expected.json 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.evtlam-eventbridge-new-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-new-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-new-eventbus.ts 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.evtlam-eventbridge-no-argument.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-no-argument.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-no-argument.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.eventbridge-no-argument.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/integ.evtlam-eventbridge-no-argument.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/lib/index.ts index 16f117634..ec101f64c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/lib/index.ts @@ -15,6 +15,7 @@ import * as sns from 'aws-cdk-lib/aws-sns'; import * as events from 'aws-cdk-lib/aws-events'; import * as kms from 'aws-cdk-lib/aws-kms'; import * as defaults from '@aws-solutions-constructs/core'; +import * as cdk from 'aws-cdk-lib'; // Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate import { Construct } from 'constructs'; import { overrideProps } from '@aws-solutions-constructs/core'; @@ -107,10 +108,22 @@ export class EventbridgeToSns extends Construct { this.snsTopic = buildTopicResponse.topic; this.encryptionKey = buildTopicResponse.key; + // Setup the event rule target as sns topic. + + // The CDK generally avoids resource names that are too long, but in this case the maximum SNS topic name is 256 characters and the maximum + // binding id is 64 characters, so a long SNS topic name (driven by Stack id, Construct id, etc.) breaks upon launch. Because of this, we take + // control of the physical name ourselves. + const maxBindingIdLength = 64; + const nameParts: string[] = [ + cdk.Stack.of(scope).stackName, // Name of the stack + id, // Construct ID + ]; + const generatedTopicName = defaults.generatePhysicalName("", nameParts, maxBindingIdLength); + const topicEventTarget: events.IRuleTarget = { bind: () => ({ - id: this.snsTopic.topicName, + id: generatedTopicName, arn: this.snsTopic.topicArn }) }; diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/eventbridge-sns-topic.test.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/eventbridge-sns-topic.test.ts index 7e967141a..3df78779a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/eventbridge-sns-topic.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/eventbridge-sns-topic.test.ts @@ -155,9 +155,24 @@ test('check events rule properties', () => { Ref: "testSnsTopic42942701" }, Id: { - "Fn::GetAtt": [ - "testSnsTopic42942701", - "TopicName" + "Fn::Join": [ + "", + [ + "Defaulttest-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + Ref: "AWS::StackId" + } + ] + } + ] + } + ] ] } } diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.exist-bus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-exist-bus.expected.json similarity index 91% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.exist-bus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-exist-bus.expected.json index 99754ff5c..ea66e7bec 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.exist-bus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-exist-bus.expected.json @@ -9,6 +9,7 @@ "testconstructEncryptionKey6153B053": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -49,8 +50,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -179,9 +179,24 @@ "Ref": "testconstructSnsTopic44188529" }, "Id": { - "Fn::GetAtt": [ - "testconstructSnsTopic44188529", - "TopicName" + "Fn::Join": [ + "", + [ + "evtsns-exist-test-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] ] } } diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.exist-bus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-exist-bus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.exist-bus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-exist-bus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-long-stack-name.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-long-stack-name.expected.json new file mode 100644 index 000000000..5ba9f272e --- /dev/null +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-long-stack-name.expected.json @@ -0,0 +1,418 @@ +{ + "Resources": { + "testconstructEncryptionKey6153B053": { + "Type": "AWS::KMS::Key", + "Properties": { + "EnableKeyRotation": true, + "KeyPolicy": { + "Statement": [ + { + "Action": "kms:*", + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": "*" + }, + { + "Action": [ + "kms:Decrypt", + "kms:Encrypt", + "kms:ReEncrypt*", + "kms:GenerateDataKey*" + ], + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": "*" + } + ], + "Version": "2012-10-17" + } + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "testconstructSnsTopic44188529": { + "Type": "AWS::SNS::Topic", + "Properties": { + "KmsMasterKeyId": { + "Fn::GetAtt": [ + "testconstructEncryptionKey6153B053", + "Arn" + ] + } + } + }, + "testconstructSnsTopicPolicy72FFD530": { + "Type": "AWS::SNS::TopicPolicy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "StringEquals": { + "AWS:SourceOwner": { + "Ref": "AWS::AccountId" + } + } + }, + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": { + "Ref": "testconstructSnsTopic44188529" + }, + "Sid": "TopicOwnerOnlyAccess" + }, + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "Bool": { + "aws:SecureTransport": "false" + } + }, + "Effect": "Deny", + "Principal": { + "AWS": "*" + }, + "Resource": { + "Ref": "testconstructSnsTopic44188529" + }, + "Sid": "HttpsOnly" + }, + { + "Action": "sns:Publish", + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": { + "Ref": "testconstructSnsTopic44188529" + }, + "Sid": "2" + } + ], + "Version": "2012-10-17" + }, + "Topics": [ + { + "Ref": "testconstructSnsTopic44188529" + } + ] + } + }, + "testconstructEventsRule145DBA20": { + "Type": "AWS::Events::Rule", + "Properties": { + "ScheduleExpression": "rate(1 minute)", + "State": "ENABLED", + "Targets": [ + { + "Arn": { + "Ref": "testconstructSnsTopic44188529" + }, + "Id": { + "Fn::Join": [ + "", + [ + "evtsnslongstatest-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] + ] + } + } + ] + } + }, + "secondconstructEncryptionKey6A63A25A": { + "Type": "AWS::KMS::Key", + "Properties": { + "EnableKeyRotation": true, + "KeyPolicy": { + "Statement": [ + { + "Action": "kms:*", + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": "*" + }, + { + "Action": [ + "kms:Decrypt", + "kms:Encrypt", + "kms:ReEncrypt*", + "kms:GenerateDataKey*" + ], + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": "*" + } + ], + "Version": "2012-10-17" + } + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "secondconstructSnsTopicCE75056B": { + "Type": "AWS::SNS::Topic", + "Properties": { + "KmsMasterKeyId": { + "Fn::GetAtt": [ + "secondconstructEncryptionKey6A63A25A", + "Arn" + ] + } + } + }, + "secondconstructSnsTopicPolicyD6D4DA55": { + "Type": "AWS::SNS::TopicPolicy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "StringEquals": { + "AWS:SourceOwner": { + "Ref": "AWS::AccountId" + } + } + }, + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Sid": "TopicOwnerOnlyAccess" + }, + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "Bool": { + "aws:SecureTransport": "false" + } + }, + "Effect": "Deny", + "Principal": { + "AWS": "*" + }, + "Resource": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Sid": "HttpsOnly" + }, + { + "Action": "sns:Publish", + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Sid": "2" + } + ], + "Version": "2012-10-17" + }, + "Topics": [ + { + "Ref": "secondconstructSnsTopicCE75056B" + } + ] + } + }, + "secondconstructEventsRuleFA5C1CE6": { + "Type": "AWS::Events::Rule", + "Properties": { + "ScheduleExpression": "rate(1 minute)", + "State": "ENABLED", + "Targets": [ + { + "Arn": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Id": { + "Fn::Join": [ + "", + [ + "evtsnslongstacond-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] + ] + } + } + ] + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-long-stack-name.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-long-stack-name.ts new file mode 100644 index 000000000..6bbb3f4e9 --- /dev/null +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-long-stack-name.ts @@ -0,0 +1,32 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ + +import { Duration } from 'aws-cdk-lib'; +import { EventbridgeToSns, EventbridgeToSnsProps } from '../lib'; +import * as events from 'aws-cdk-lib/aws-events'; +import { App, Stack } from 'aws-cdk-lib'; +import { generateIntegStackName } from '@aws-solutions-constructs/core'; + +const app = new App(); +const stack = new Stack(app, generateIntegStackName(__filename) + 'ThisIsTheLongestNameForAStackItMustBeGreaterThanSixtyFourCharactersLongAndThisShouldJustAboutDoItNoItMustBeABitLonger'); + +const props: EventbridgeToSnsProps = { + eventRuleProps: { + schedule: events.Schedule.rate(Duration.minutes(1)) + } +}; + +new EventbridgeToSns(stack, 'test-construct', props); +new EventbridgeToSns(stack, 'second-construct', props); + +app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.new-bus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-new-bus.expected.json similarity index 91% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.new-bus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-new-bus.expected.json index a009ae1f9..a1ef80ba0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.new-bus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-new-bus.expected.json @@ -3,6 +3,7 @@ "testconstructEncryptionKey6153B053": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -43,8 +44,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -179,9 +179,24 @@ "Ref": "testconstructSnsTopic44188529" }, "Id": { - "Fn::GetAtt": [ - "testconstructSnsTopic44188529", - "TopicName" + "Fn::Join": [ + "", + [ + "evtsns-new-butest-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] ] } } diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.new-bus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-new-bus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.new-bus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-new-bus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.no-arg.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-no-arg.expected.json similarity index 91% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.no-arg.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-no-arg.expected.json index 1b036dafb..12b2ac362 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.no-arg.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-no-arg.expected.json @@ -3,6 +3,7 @@ "testconstructEncryptionKey6153B053": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -43,8 +44,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -166,9 +166,24 @@ "Ref": "testconstructSnsTopic44188529" }, "Id": { - "Fn::GetAtt": [ - "testconstructSnsTopic44188529", - "TopicName" + "Fn::Join": [ + "", + [ + "evtsns-no-argtest-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] ] } } diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.no-arg.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-no-arg.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.no-arg.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-no-arg.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-second-long-stack-name.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-second-long-stack-name.expected.json new file mode 100644 index 000000000..09044192c --- /dev/null +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-second-long-stack-name.expected.json @@ -0,0 +1,418 @@ +{ + "Resources": { + "testconstructEncryptionKey6153B053": { + "Type": "AWS::KMS::Key", + "Properties": { + "EnableKeyRotation": true, + "KeyPolicy": { + "Statement": [ + { + "Action": "kms:*", + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": "*" + }, + { + "Action": [ + "kms:Decrypt", + "kms:Encrypt", + "kms:ReEncrypt*", + "kms:GenerateDataKey*" + ], + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": "*" + } + ], + "Version": "2012-10-17" + } + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "testconstructSnsTopic44188529": { + "Type": "AWS::SNS::Topic", + "Properties": { + "KmsMasterKeyId": { + "Fn::GetAtt": [ + "testconstructEncryptionKey6153B053", + "Arn" + ] + } + } + }, + "testconstructSnsTopicPolicy72FFD530": { + "Type": "AWS::SNS::TopicPolicy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "StringEquals": { + "AWS:SourceOwner": { + "Ref": "AWS::AccountId" + } + } + }, + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": { + "Ref": "testconstructSnsTopic44188529" + }, + "Sid": "TopicOwnerOnlyAccess" + }, + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "Bool": { + "aws:SecureTransport": "false" + } + }, + "Effect": "Deny", + "Principal": { + "AWS": "*" + }, + "Resource": { + "Ref": "testconstructSnsTopic44188529" + }, + "Sid": "HttpsOnly" + }, + { + "Action": "sns:Publish", + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": { + "Ref": "testconstructSnsTopic44188529" + }, + "Sid": "2" + } + ], + "Version": "2012-10-17" + }, + "Topics": [ + { + "Ref": "testconstructSnsTopic44188529" + } + ] + } + }, + "testconstructEventsRule145DBA20": { + "Type": "AWS::Events::Rule", + "Properties": { + "ScheduleExpression": "rate(1 minute)", + "State": "ENABLED", + "Targets": [ + { + "Arn": { + "Ref": "testconstructSnsTopic44188529" + }, + "Id": { + "Fn::Join": [ + "", + [ + "evtsnssecondltest-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] + ] + } + } + ] + } + }, + "secondconstructEncryptionKey6A63A25A": { + "Type": "AWS::KMS::Key", + "Properties": { + "EnableKeyRotation": true, + "KeyPolicy": { + "Statement": [ + { + "Action": "kms:*", + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": "*" + }, + { + "Action": [ + "kms:Decrypt", + "kms:Encrypt", + "kms:ReEncrypt*", + "kms:GenerateDataKey*" + ], + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": "*" + } + ], + "Version": "2012-10-17" + } + }, + "UpdateReplacePolicy": "Retain", + "DeletionPolicy": "Retain" + }, + "secondconstructSnsTopicCE75056B": { + "Type": "AWS::SNS::Topic", + "Properties": { + "KmsMasterKeyId": { + "Fn::GetAtt": [ + "secondconstructEncryptionKey6A63A25A", + "Arn" + ] + } + } + }, + "secondconstructSnsTopicPolicyD6D4DA55": { + "Type": "AWS::SNS::TopicPolicy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "StringEquals": { + "AWS:SourceOwner": { + "Ref": "AWS::AccountId" + } + } + }, + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + }, + "Resource": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Sid": "TopicOwnerOnlyAccess" + }, + { + "Action": [ + "SNS:Publish", + "SNS:RemovePermission", + "SNS:SetTopicAttributes", + "SNS:DeleteTopic", + "SNS:ListSubscriptionsByTopic", + "SNS:GetTopicAttributes", + "SNS:Receive", + "SNS:AddPermission", + "SNS:Subscribe" + ], + "Condition": { + "Bool": { + "aws:SecureTransport": "false" + } + }, + "Effect": "Deny", + "Principal": { + "AWS": "*" + }, + "Resource": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Sid": "HttpsOnly" + }, + { + "Action": "sns:Publish", + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Sid": "2" + } + ], + "Version": "2012-10-17" + }, + "Topics": [ + { + "Ref": "secondconstructSnsTopicCE75056B" + } + ] + } + }, + "secondconstructEventsRuleFA5C1CE6": { + "Type": "AWS::Events::Rule", + "Properties": { + "ScheduleExpression": "rate(1 minute)", + "State": "ENABLED", + "Targets": [ + { + "Arn": { + "Ref": "secondconstructSnsTopicCE75056B" + }, + "Id": { + "Fn::Join": [ + "", + [ + "evtsnssecondlcond-construct-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + } + ] + ] + } + } + ] + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-second-long-stack-name.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-second-long-stack-name.ts new file mode 100644 index 000000000..0e6fc2f23 --- /dev/null +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/integ.evtsns-second-long-stack-name.ts @@ -0,0 +1,38 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ + +// In order to confirm that we avoid name collisions on the event binding with both multiple constructs and multiple stacks, +// launch two stacks with two constructs at the same time using +// cdk-integ integ.second-long-stack-name.js integ.long-stack-name.js --no-clean +// and confirm that all topics are publishing messages. + +import { Duration } from 'aws-cdk-lib'; +import { EventbridgeToSns, EventbridgeToSnsProps } from '../lib'; +import * as events from 'aws-cdk-lib/aws-events'; +import { App, Stack } from 'aws-cdk-lib'; +import { generateIntegStackName } from '@aws-solutions-constructs/core'; + +const app = new App(); + +const stackTwo = new Stack(app, generateIntegStackName(__filename) + 'ThisIsTheLongestNameForAStackItMustBeGreaterThanSixtyFourCharactersLongAndThisShouldJustAboutDoItNoItMustBeABitLessShort'); + +const propsTwo: EventbridgeToSnsProps = { + eventRuleProps: { + schedule: events.Schedule.rate(Duration.minutes(1)) + } +}; + +new EventbridgeToSns(stackTwo, 'test-construct', propsTwo); +new EventbridgeToSns(stackTwo, 'second-construct', propsTwo); + +app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-bus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-bus.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-bus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-bus.expected.json index ed59bf5c3..b63928b31 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-bus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-bus.expected.json @@ -3,6 +3,7 @@ "MyKey6AB29FA6": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -43,8 +44,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-bus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-bus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-bus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-bus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-queue.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-queue.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-queue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-queue.expected.json index b888ac1b9..f76a2f2cb 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-queue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-queue.expected.json @@ -3,6 +3,7 @@ "MyKey6AB29FA6": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -43,8 +44,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-queue.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-queue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.exist-queue.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-exist-queue.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.new-bus.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-new-bus.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.new-bus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-new-bus.expected.json index 3b3c5a47e..0abe9486a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.new-bus.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-new-bus.expected.json @@ -82,6 +82,7 @@ "constructEncryptionKey9426451E": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -122,8 +123,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.new-bus.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-new-bus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.new-bus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-new-bus.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.no-arg.expected.json b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-no-arg.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.no-arg.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-no-arg.expected.json index 47c71c258..63f8ecca2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.no-arg.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-no-arg.expected.json @@ -82,6 +82,7 @@ "constructEncryptionKey9426451E": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -122,8 +123,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.no-arg.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-no-arg.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.no-arg.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/integ.evtsqs-no-arg.ts 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.evtstp-eventbridge-stepfunctions-existing-eventbus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-existing-eventbus.expected.json 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.evtstp-eventbridge-stepfunctions-existing-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-existing-eventbus.ts 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.evtstp-eventbridge-stepfunctions-new-eventbus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-new-eventbus.expected.json 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.evtstp-eventbridge-stepfunctions-new-eventbus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-new-eventbus.ts 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.evtstp-eventbridge-stepfunctions-no-argument.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-no-argument.expected.json index 2511b0adc..61ce72236 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.evtstp-eventbridge-stepfunctions-no-argument.expected.json @@ -7,7 +7,7 @@ "Fn::Join": [ "", [ - "/aws/vendedlogs/states/constructs/eventbridge-stepfunctions-no-argumenttest-eventbridge-stepfunctions-constructStateMachineLog-", + "/aws/vendedlogs/states/constructs/evtstp-eventbridge-stepfunctions-no-argumenttest-eventbridge-stepfunctions-constructStateMachineLog-", { "Fn::Select": [ 2, diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-no-argument.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-no-argument.ts 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.evtstp-eventbridge-stepfunctions-with-lambda.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-with-lambda.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-with-lambda.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.ts rename to source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.evtstp-eventbridge-stepfunctions-with-lambda.ts 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.farddb-existing-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.farddb-existing-resources.expected.json index d02e765af..8e4a0dfe9 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.farddb-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farddb-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farddb-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farddb-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farddb-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farddb-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farddb-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farddb-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farddb-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farddb-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farddb-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farddb-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farddb-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farddb-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farddb-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farddb-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farddb-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farddb-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farddb-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farddb-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farddb-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farddb-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farddb-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farddb-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "farddbexistingresourcesECRAPIsecuritygroup2D1C2961", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "farddbexistingresourcesECRDKRsecuritygroup11EC6157", "GroupId" ] } @@ -838,10 +838,10 @@ "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" }, - "existingresourcesECRAPIsecuritygroup78294485": { + "farddbexistingresourcesECRAPIsecuritygroup2D1C2961": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "farddb-existing-resources/farddb-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -896,10 +896,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "farddbexistingresourcesECRDKRsecuritygroup11EC6157": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "farddb-existing-resources/farddb-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1053,7 +1053,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "farddbexistingresourcestesttaskdef48323A94", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.farddb-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.farddb-existing-resources.ts 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.farddb-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.farddb-new-resources.expected.json index 3b243e331..75dd27a42 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.farddb-new-resources.expected.json @@ -37,7 +37,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farddb-new-resources/Vpc" } ] } @@ -59,7 +59,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farddb-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -83,7 +83,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farddb-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -124,7 +124,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farddb-new-resources/Vpc/PublicSubnet1" } ] } @@ -144,7 +144,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farddb-new-resources/Vpc/PublicSubnet1" } ] }, @@ -170,7 +170,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farddb-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -194,7 +194,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farddb-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -235,7 +235,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farddb-new-resources/Vpc/PublicSubnet2" } ] } @@ -255,7 +255,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farddb-new-resources/Vpc/PublicSubnet2" } ] }, @@ -281,7 +281,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farddb-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -305,7 +305,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farddb-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -346,7 +346,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farddb-new-resources/Vpc/PublicSubnet3" } ] } @@ -366,7 +366,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farddb-new-resources/Vpc/PublicSubnet3" } ] }, @@ -392,7 +392,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farddb-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -406,7 +406,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farddb-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -454,7 +454,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farddb-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -468,7 +468,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farddb-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -516,7 +516,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farddb-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -530,7 +530,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farddb-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -567,7 +567,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farddb-new-resources/Vpc" } ] } @@ -601,7 +601,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farddb-new-resources/Vpc/FlowLog" } ] } @@ -653,7 +653,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farddb-new-resources/Vpc/FlowLog" } ] }, @@ -690,7 +690,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farddb-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -744,7 +744,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farddbnewresourcesECRAPIsecuritygroup6FC91C04", "GroupId" ] } @@ -774,7 +774,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farddbnewresourcesECRDKRsecuritygroup0930364A", "GroupId" ] } @@ -838,10 +838,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farddbnewresourcesECRAPIsecuritygroup6FC91C04": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farddb-new-resources/farddb-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -896,10 +896,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farddbnewresourcesECRDKRsecuritygroup0930364A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farddb-new-resources/farddb-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1053,7 +1053,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "farddbnewresourcestestconstructtaskdefF4399DA9", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.farddb-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.farddb-new-resources.ts 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.farevt-existing-resources.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.farevt-existing-resources.expected.json index befd1b89b..00695cbad 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.farevt-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farevt-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farevt-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farevt-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farevt-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farevt-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farevt-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farevt-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farevt-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farevt-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farevt-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farevt-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farevt-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farevt-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farevt-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farevt-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farevt-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farevt-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farevt-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farevt-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farevt-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farevt-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farevt-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farevt-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "farevtexistingresourcesECRAPIsecuritygroup1075412D", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "farevtexistingresourcesECRDKRsecuritygroup19D33D2A", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesCLOUDWATCHEVENTSsecuritygroupD95BA196", + "farevtexistingresourcesCLOUDWATCHEVENTSsecuritygroup33E6AE58", "GroupId" ] } @@ -801,10 +801,10 @@ } } }, - "existingresourcesECRAPIsecuritygroup78294485": { + "farevtexistingresourcesECRAPIsecuritygroup1075412D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "farevt-existing-resources/farevt-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -859,10 +859,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "farevtexistingresourcesECRDKRsecuritygroup19D33D2A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "farevt-existing-resources/farevt-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -989,7 +989,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "farevtexistingresourcestesttaskdefF2E3720F", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1091,10 +1091,10 @@ "Name": "test" } }, - "existingresourcesCLOUDWATCHEVENTSsecuritygroupD95BA196": { + "farevtexistingresourcesCLOUDWATCHEVENTSsecuritygroup33E6AE58": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-CLOUDWATCH_EVENTS-security-group", + "GroupDescription": "farevt-existing-resources/farevt-existing-resources-CLOUDWATCH_EVENTS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.farevt-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.farevt-existing-resources.ts 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.farevt-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.farevt-new-resources.expected.json index 15a6c4295..2290bd6aa 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.farevt-new-resources.expected.json @@ -17,7 +17,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farevt-new-resources/Vpc" } ] } @@ -39,7 +39,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farevt-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -63,7 +63,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farevt-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -104,7 +104,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farevt-new-resources/Vpc/PublicSubnet1" } ] } @@ -124,7 +124,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farevt-new-resources/Vpc/PublicSubnet1" } ] }, @@ -150,7 +150,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farevt-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -174,7 +174,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farevt-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -215,7 +215,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farevt-new-resources/Vpc/PublicSubnet2" } ] } @@ -235,7 +235,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farevt-new-resources/Vpc/PublicSubnet2" } ] }, @@ -261,7 +261,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farevt-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -285,7 +285,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farevt-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -326,7 +326,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farevt-new-resources/Vpc/PublicSubnet3" } ] } @@ -346,7 +346,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farevt-new-resources/Vpc/PublicSubnet3" } ] }, @@ -372,7 +372,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farevt-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -386,7 +386,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farevt-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -434,7 +434,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farevt-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -448,7 +448,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farevt-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -496,7 +496,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farevt-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -510,7 +510,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farevt-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -547,7 +547,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farevt-new-resources/Vpc" } ] } @@ -581,7 +581,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farevt-new-resources/Vpc/FlowLog" } ] } @@ -633,7 +633,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farevt-new-resources/Vpc/FlowLog" } ] }, @@ -670,7 +670,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farevt-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -683,7 +683,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesCLOUDWATCHEVENTSsecuritygroupC0F12F92", + "farevtnewresourcesCLOUDWATCHEVENTSsecuritygroup07F35AB2", "GroupId" ] } @@ -713,7 +713,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farevtnewresourcesECRAPIsecuritygroup5499E098", "GroupId" ] } @@ -743,7 +743,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farevtnewresourcesECRDKRsecuritygroupC8F4AFAB", "GroupId" ] } @@ -807,10 +807,10 @@ } } }, - "newresourcesCLOUDWATCHEVENTSsecuritygroupC0F12F92": { + "farevtnewresourcesCLOUDWATCHEVENTSsecuritygroup07F35AB2": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-CLOUDWATCH_EVENTS-security-group", + "GroupDescription": "farevt-new-resources/farevt-new-resources-CLOUDWATCH_EVENTS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -865,10 +865,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farevtnewresourcesECRAPIsecuritygroup5499E098": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farevt-new-resources/farevt-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -923,10 +923,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farevtnewresourcesECRDKRsecuritygroupC8F4AFAB": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farevt-new-resources/farevt-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1053,7 +1053,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "farevtnewresourcestestconstructtaskdef0A14010C", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.farevt-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.farevt-new-resources.ts 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.farfhs-existingFargateService.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-existingFargateService.expected.json index 5f1f86256..3986dd0ff 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.farfhs-existingFargateService.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "farfhs-existingFargateService/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farfhs-existingFargateService/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet1" + "Value": "farfhs-existingFargateService/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet1" + "Value": "farfhs-existingFargateService/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet2" + "Value": "farfhs-existingFargateService/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet2" + "Value": "farfhs-existingFargateService/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet3" + "Value": "farfhs-existingFargateService/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet3" + "Value": "farfhs-existingFargateService/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "farfhs-existingFargateService/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/FlowLog" + "Value": "farfhs-existingFargateService/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/FlowLog" + "Value": "farfhs-existingFargateService/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/FlowLog" + "Value": "farfhs-existingFargateService/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -676,7 +676,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingFargateServiceECRAPIsecuritygroup5EE2643E", + "farfhsexistingFargateServiceECRAPIsecuritygroupA97DCBC0", "GroupId" ] } @@ -717,7 +717,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingFargateServiceECRDKRsecuritygroup41F182BE", + "farfhsexistingFargateServiceECRDKRsecuritygroupE5EBBFB7", "GroupId" ] } @@ -799,7 +799,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingFargateServiceKINESISFIREHOSEsecuritygroup9CDC51DB", + "farfhsexistingFargateServiceKINESISFIREHOSEsecuritygroup7DCAD91B", "GroupId" ] } @@ -918,6 +918,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1107,6 +1108,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1299,7 +1301,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseexistingFargateServicedestinationfirehose0C07B822", + "DeliveryStreamName": "KinesisFirehosefarfhsexistingFarrvicedestinationfirehoseB43CCB26", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -1383,7 +1385,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1430,10 +1432,10 @@ } } }, - "existingFargateServiceECRAPIsecuritygroup5EE2643E": { + "farfhsexistingFargateServiceECRAPIsecuritygroupA97DCBC0": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingFargateService/existingFargateService-ECR_API-security-group", + "GroupDescription": "farfhs-existingFargateService/farfhs-existingFargateService-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1488,10 +1490,10 @@ } } }, - "existingFargateServiceECRDKRsecuritygroup41F182BE": { + "farfhsexistingFargateServiceECRDKRsecuritygroupE5EBBFB7": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingFargateService/existingFargateService-ECR_DKR-security-group", + "GroupDescription": "farfhs-existingFargateService/farfhs-existingFargateService-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1605,7 +1607,7 @@ "Environment": [ { "Name": "FIREHOSE_DELIVERYSTREAM_NAME", - "Value": "KinesisFirehoseexistingFargateServicedestinationfirehose0C07B822" + "Value": "KinesisFirehosefarfhsexistingFarrvicedestinationfirehoseB43CCB26" } ], "Essential": true, @@ -1621,7 +1623,7 @@ } ], "Cpu": "256", - "Family": "existingFargateServicetesttaskdef55189A31", + "Family": "farfhsexistingFargateServicetesttaskdefCE4EB283", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1717,10 +1719,10 @@ "testtaskdefTaskRoleB2DEF113" ] }, - "existingFargateServiceKINESISFIREHOSEsecuritygroup9CDC51DB": { + "farfhsexistingFargateServiceKINESISFIREHOSEsecuritygroup7DCAD91B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingFargateService/existingFargateService-KINESIS_FIREHOSE-security-group", + "GroupDescription": "farfhs-existingFargateService/farfhs-existingFargateService-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-existingFargateService.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-existingFargateService.ts 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.farfhs-existingVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-existingVpc.expected.json index dd8a62f26..52ff7192a 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.farfhs-existingVpc.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "farfhs-existingVpc/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farfhs-existingVpc/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet1" + "Value": "farfhs-existingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet1" + "Value": "farfhs-existingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet2" + "Value": "farfhs-existingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet2" + "Value": "farfhs-existingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet3" + "Value": "farfhs-existingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet3" + "Value": "farfhs-existingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "farfhs-existingVpc/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "farfhs-existingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "farfhs-existingVpc/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "farfhs-existingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -676,7 +676,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcKINESISFIREHOSEsecuritygroupCC06079B", + "farfhsexistingVpcKINESISFIREHOSEsecuritygroup14103283", "GroupId" ] } @@ -717,7 +717,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcECRAPIsecuritygroupB3E4A376", + "farfhsexistingVpcECRAPIsecuritygroup51B9740B", "GroupId" ] } @@ -758,7 +758,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcECRDKRsecuritygroup0500FAE6", + "farfhsexistingVpcECRDKRsecuritygroup0940D84A", "GroupId" ] } @@ -918,6 +918,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1107,6 +1108,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1299,7 +1301,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseexistingVpcdestinationfirehose4FF537ED", + "DeliveryStreamName": "KinesisFirehosefarfhsexistingVpcdestinationfirehose00DD7D12", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -1383,7 +1385,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1430,10 +1432,10 @@ } } }, - "existingVpcKINESISFIREHOSEsecuritygroupCC06079B": { + "farfhsexistingVpcKINESISFIREHOSEsecuritygroup14103283": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-KINESIS_FIREHOSE-security-group", + "GroupDescription": "farfhs-existingVpc/farfhs-existingVpc-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1488,10 +1490,10 @@ } } }, - "existingVpcECRAPIsecuritygroupB3E4A376": { + "farfhsexistingVpcECRAPIsecuritygroup51B9740B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-ECR_API-security-group", + "GroupDescription": "farfhs-existingVpc/farfhs-existingVpc-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1546,10 +1548,10 @@ } } }, - "existingVpcECRDKRsecuritygroup0500FAE6": { + "farfhsexistingVpcECRDKRsecuritygroup0940D84A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-ECR_DKR-security-group", + "GroupDescription": "farfhs-existingVpc/farfhs-existingVpc-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1663,7 +1665,7 @@ "Environment": [ { "Name": "FIREHOSE_DELIVERYSTREAM_NAME", - "Value": "KinesisFirehoseexistingVpcdestinationfirehose4FF537ED" + "Value": "KinesisFirehosefarfhsexistingVpcdestinationfirehose00DD7D12" } ], "Essential": true, @@ -1679,7 +1681,7 @@ } ], "Cpu": "256", - "Family": "existingVpctestfargatekinesisstreamstaskdefAAC2A3A2", + "Family": "farfhsexistingVpctestfargatekinesisstreamstaskdefD49AA981", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-existingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-existingVpc.ts 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.farfhs-fargateServiceFromProps.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-fargateServiceFromProps.expected.json index 45d796abc..acf544bc2 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.farfhs-fargateServiceFromProps.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosefargateServiceFroPropsdestinationfirehose67832675", + "DeliveryStreamName": "KinesisFirehosefarfhsfargateServPropsdestinationfirehose9D4304E8", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -550,7 +552,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -607,7 +609,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "farfhs-fargateServiceFromProps/Vpc" } ] } @@ -629,7 +631,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -653,7 +655,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -694,7 +696,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet1" } ] } @@ -714,7 +716,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet1" } ] }, @@ -740,7 +742,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -764,7 +766,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -805,7 +807,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet2" } ] } @@ -825,7 +827,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet2" } ] }, @@ -851,7 +853,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -875,7 +877,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -916,7 +918,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet3" } ] } @@ -936,7 +938,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farfhs-fargateServiceFromProps/Vpc/PublicSubnet3" } ] }, @@ -962,7 +964,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" + "Value": "farfhs-fargateServiceFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -976,7 +978,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" + "Value": "farfhs-fargateServiceFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1024,7 +1026,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" + "Value": "farfhs-fargateServiceFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1038,7 +1040,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" + "Value": "farfhs-fargateServiceFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1086,7 +1088,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" + "Value": "farfhs-fargateServiceFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1100,7 +1102,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" + "Value": "farfhs-fargateServiceFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1137,7 +1139,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "farfhs-fargateServiceFromProps/Vpc" } ] } @@ -1171,7 +1173,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/FlowLog" + "Value": "farfhs-fargateServiceFromProps/Vpc/FlowLog" } ] } @@ -1223,7 +1225,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/FlowLog" + "Value": "farfhs-fargateServiceFromProps/Vpc/FlowLog" } ] }, @@ -1260,7 +1262,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/FlowLog" + "Value": "farfhs-fargateServiceFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1273,7 +1275,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "fargateServiceFromPropsKINESISFIREHOSEsecuritygroupC0011304", + "farfhsfargateServiceFromPropsKINESISFIREHOSEsecuritygroupE3B668C5", "GroupId" ] } @@ -1314,7 +1316,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "fargateServiceFromPropsECRAPIsecuritygroup5784F80B", + "farfhsfargateServiceFromPropsECRAPIsecuritygroupA1B3AD3C", "GroupId" ] } @@ -1355,7 +1357,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F", + "farfhsfargateServiceFromPropsECRDKRsecuritygroup92D10A76", "GroupId" ] } @@ -1430,10 +1432,10 @@ } } }, - "fargateServiceFromPropsKINESISFIREHOSEsecuritygroupC0011304": { + "farfhsfargateServiceFromPropsKINESISFIREHOSEsecuritygroupE3B668C5": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "fargateServiceFromProps/fargateServiceFromProps-KINESIS_FIREHOSE-security-group", + "GroupDescription": "farfhs-fargateServiceFromProps/farfhs-fargateServiceFromProps-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1488,10 +1490,10 @@ } } }, - "fargateServiceFromPropsECRAPIsecuritygroup5784F80B": { + "farfhsfargateServiceFromPropsECRAPIsecuritygroupA1B3AD3C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "fargateServiceFromProps/fargateServiceFromProps-ECR_API-security-group", + "GroupDescription": "farfhs-fargateServiceFromProps/farfhs-fargateServiceFromProps-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1546,10 +1548,10 @@ } } }, - "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F": { + "farfhsfargateServiceFromPropsECRDKRsecuritygroup92D10A76": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "fargateServiceFromProps/fargateServiceFromProps-ECR_DKR-security-group", + "GroupDescription": "farfhs-fargateServiceFromProps/farfhs-fargateServiceFromProps-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1663,7 +1665,7 @@ "Environment": [ { "Name": "FIREHOSE_DELIVERYSTREAM_NAME", - "Value": "KinesisFirehosefargateServiceFroPropsdestinationfirehose67832675" + "Value": "KinesisFirehosefarfhsfargateServPropsdestinationfirehose9D4304E8" } ], "Essential": true, @@ -1679,7 +1681,7 @@ } ], "Cpu": "256", - "Family": "fargateServiceFromPropstestfargatekinesisstreamstaskdef00ED69EC", + "Family": "farfhsfargateServiceFromPropstestfargatekinesisstreamstaskdef6EEE5F31", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-fargateServiceFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-fargateServiceFromProps.ts 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.farfhs-noArguments.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-noArguments.expected.json index a9acca727..0eec2fe3a 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.farfhs-noArguments.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenoArgumentsdestinationfirehose7F26EC12", + "DeliveryStreamName": "KinesisFirehosefarfhsnoArgumentsdestinationfirehose6033CCDA", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -546,7 +548,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -603,7 +605,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "farfhs-noArguments/Vpc" } ] } @@ -625,7 +627,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farfhs-noArguments/Vpc/PublicSubnet1" } ], "VpcId": { @@ -649,7 +651,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farfhs-noArguments/Vpc/PublicSubnet1" } ], "VpcId": { @@ -690,7 +692,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farfhs-noArguments/Vpc/PublicSubnet1" } ] } @@ -710,7 +712,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farfhs-noArguments/Vpc/PublicSubnet1" } ] }, @@ -736,7 +738,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farfhs-noArguments/Vpc/PublicSubnet2" } ], "VpcId": { @@ -760,7 +762,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farfhs-noArguments/Vpc/PublicSubnet2" } ], "VpcId": { @@ -801,7 +803,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farfhs-noArguments/Vpc/PublicSubnet2" } ] } @@ -821,7 +823,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farfhs-noArguments/Vpc/PublicSubnet2" } ] }, @@ -847,7 +849,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farfhs-noArguments/Vpc/PublicSubnet3" } ], "VpcId": { @@ -871,7 +873,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farfhs-noArguments/Vpc/PublicSubnet3" } ], "VpcId": { @@ -912,7 +914,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farfhs-noArguments/Vpc/PublicSubnet3" } ] } @@ -932,7 +934,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farfhs-noArguments/Vpc/PublicSubnet3" } ] }, @@ -958,7 +960,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet1" + "Value": "farfhs-noArguments/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -972,7 +974,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet1" + "Value": "farfhs-noArguments/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1020,7 +1022,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet2" + "Value": "farfhs-noArguments/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1034,7 +1036,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet2" + "Value": "farfhs-noArguments/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1082,7 +1084,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet3" + "Value": "farfhs-noArguments/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1096,7 +1098,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet3" + "Value": "farfhs-noArguments/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1133,7 +1135,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "farfhs-noArguments/Vpc" } ] } @@ -1167,7 +1169,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/FlowLog" + "Value": "farfhs-noArguments/Vpc/FlowLog" } ] } @@ -1219,7 +1221,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/FlowLog" + "Value": "farfhs-noArguments/Vpc/FlowLog" } ] }, @@ -1256,7 +1258,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/FlowLog" + "Value": "farfhs-noArguments/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1269,7 +1271,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "noArgumentsKINESISFIREHOSEsecuritygroupBE0C0999", + "farfhsnoArgumentsKINESISFIREHOSEsecuritygroup0EB96AE5", "GroupId" ] } @@ -1299,7 +1301,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "noArgumentsECRAPIsecuritygroup70B67825", + "farfhsnoArgumentsECRAPIsecuritygroup76DA136C", "GroupId" ] } @@ -1329,7 +1331,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "noArgumentsECRDKRsecuritygroup881C3744", + "farfhsnoArgumentsECRDKRsecuritygroup1BE4BAB0", "GroupId" ] } @@ -1393,10 +1395,10 @@ } } }, - "noArgumentsKINESISFIREHOSEsecuritygroupBE0C0999": { + "farfhsnoArgumentsKINESISFIREHOSEsecuritygroup0EB96AE5": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "noArguments/noArguments-KINESIS_FIREHOSE-security-group", + "GroupDescription": "farfhs-noArguments/farfhs-noArguments-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1451,10 +1453,10 @@ } } }, - "noArgumentsECRAPIsecuritygroup70B67825": { + "farfhsnoArgumentsECRAPIsecuritygroup76DA136C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "noArguments/noArguments-ECR_API-security-group", + "GroupDescription": "farfhs-noArguments/farfhs-noArguments-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1509,10 +1511,10 @@ } } }, - "noArgumentsECRDKRsecuritygroup881C3744": { + "farfhsnoArgumentsECRDKRsecuritygroup1BE4BAB0": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "noArguments/noArguments-ECR_DKR-security-group", + "GroupDescription": "farfhs-noArguments/farfhs-noArguments-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1626,7 +1628,7 @@ "Environment": [ { "Name": "FIREHOSE_DELIVERYSTREAM_NAME", - "Value": "KinesisFirehosenoArgumentsdestinationfirehose7F26EC12" + "Value": "KinesisFirehosefarfhsnoArgumentsdestinationfirehose6033CCDA" } ], "Essential": true, @@ -1642,7 +1644,7 @@ } ], "Cpu": "256", - "Family": "noArgumentstestconstructtaskdefD800F6F2", + "Family": "farfhsnoArgumentstestconstructtaskdefC49D5E71", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-noArguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-noArguments.ts 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.farfhs-vpcFromprops.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-vpcFromprops.expected.json index 1c7b97b8e..08f33a65d 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.farfhs-vpcFromprops.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosevpcFrompropsdestinationfirehoseD15200E2", + "DeliveryStreamName": "KinesisFirehosefarfhsvpcFrompropsdestinationfirehoseE3FE1793", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -550,7 +552,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -607,7 +609,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc" + "Value": "farfhs-vpcFromprops/Vpc" } ] } @@ -629,7 +631,7 @@ }, { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet1" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet1" } ], "VpcId": { @@ -653,7 +655,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet1" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet1" } ], "VpcId": { @@ -694,7 +696,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet1" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet1" } ] } @@ -714,7 +716,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet1" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet1" } ] }, @@ -740,7 +742,7 @@ }, { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet2" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet2" } ], "VpcId": { @@ -764,7 +766,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet2" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet2" } ], "VpcId": { @@ -805,7 +807,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet2" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet2" } ] } @@ -825,7 +827,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet2" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet2" } ] }, @@ -851,7 +853,7 @@ }, { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet3" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet3" } ], "VpcId": { @@ -875,7 +877,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet3" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet3" } ], "VpcId": { @@ -916,7 +918,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet3" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet3" } ] } @@ -936,7 +938,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PublicSubnet3" + "Value": "farfhs-vpcFromprops/Vpc/PublicSubnet3" } ] }, @@ -962,7 +964,7 @@ }, { "Key": "Name", - "Value": "vpcFromprops/Vpc/PrivateSubnet1" + "Value": "farfhs-vpcFromprops/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -976,7 +978,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PrivateSubnet1" + "Value": "farfhs-vpcFromprops/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1024,7 +1026,7 @@ }, { "Key": "Name", - "Value": "vpcFromprops/Vpc/PrivateSubnet2" + "Value": "farfhs-vpcFromprops/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1038,7 +1040,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PrivateSubnet2" + "Value": "farfhs-vpcFromprops/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1086,7 +1088,7 @@ }, { "Key": "Name", - "Value": "vpcFromprops/Vpc/PrivateSubnet3" + "Value": "farfhs-vpcFromprops/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1100,7 +1102,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/PrivateSubnet3" + "Value": "farfhs-vpcFromprops/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1137,7 +1139,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc" + "Value": "farfhs-vpcFromprops/Vpc" } ] } @@ -1171,7 +1173,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/FlowLog" + "Value": "farfhs-vpcFromprops/Vpc/FlowLog" } ] } @@ -1223,7 +1225,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/FlowLog" + "Value": "farfhs-vpcFromprops/Vpc/FlowLog" } ] }, @@ -1260,7 +1262,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromprops/Vpc/FlowLog" + "Value": "farfhs-vpcFromprops/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1273,7 +1275,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "vpcFrompropsKINESISFIREHOSEsecuritygroup537BDD19", + "farfhsvpcFrompropsKINESISFIREHOSEsecuritygroupF7736351", "GroupId" ] } @@ -1314,7 +1316,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "vpcFrompropsECRAPIsecuritygroupB070D1AB", + "farfhsvpcFrompropsECRAPIsecuritygroup81441B71", "GroupId" ] } @@ -1355,7 +1357,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "vpcFrompropsECRDKRsecuritygroup4D8AFEF5", + "farfhsvpcFrompropsECRDKRsecuritygroup660BD496", "GroupId" ] } @@ -1430,10 +1432,10 @@ } } }, - "vpcFrompropsKINESISFIREHOSEsecuritygroup537BDD19": { + "farfhsvpcFrompropsKINESISFIREHOSEsecuritygroupF7736351": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpcFromprops/vpcFromprops-KINESIS_FIREHOSE-security-group", + "GroupDescription": "farfhs-vpcFromprops/farfhs-vpcFromprops-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1488,10 +1490,10 @@ } } }, - "vpcFrompropsECRAPIsecuritygroupB070D1AB": { + "farfhsvpcFrompropsECRAPIsecuritygroup81441B71": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpcFromprops/vpcFromprops-ECR_API-security-group", + "GroupDescription": "farfhs-vpcFromprops/farfhs-vpcFromprops-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1546,10 +1548,10 @@ } } }, - "vpcFrompropsECRDKRsecuritygroup4D8AFEF5": { + "farfhsvpcFrompropsECRDKRsecuritygroup660BD496": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpcFromprops/vpcFromprops-ECR_DKR-security-group", + "GroupDescription": "farfhs-vpcFromprops/farfhs-vpcFromprops-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1663,7 +1665,7 @@ "Environment": [ { "Name": "FIREHOSE_DELIVERYSTREAM_NAME", - "Value": "KinesisFirehosevpcFrompropsdestinationfirehoseD15200E2" + "Value": "KinesisFirehosefarfhsvpcFrompropsdestinationfirehoseE3FE1793" } ], "Essential": true, @@ -1679,7 +1681,7 @@ } ], "Cpu": "256", - "Family": "vpcFrompropstestfargatekinesisstreamstaskdefA9FE914A", + "Family": "farfhsvpcFrompropstestfargatekinesisstreamstaskdef8AB11D78", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-vpcFromprops.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.farfhs-vpcFromprops.ts 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.farkin-existingFargateService.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingFargateService.expected.json index 94ad4f26a..725fabc6f 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.farkin-existingFargateService.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "farkin-existingFargateService/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet1" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet2" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PublicSubnet3" + "Value": "farkin-existingFargateService/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet1" + "Value": "farkin-existingFargateService/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet1" + "Value": "farkin-existingFargateService/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet2" + "Value": "farkin-existingFargateService/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet2" + "Value": "farkin-existingFargateService/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet3" + "Value": "farkin-existingFargateService/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/PrivateSubnet3" + "Value": "farkin-existingFargateService/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc" + "Value": "farkin-existingFargateService/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/FlowLog" + "Value": "farkin-existingFargateService/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/FlowLog" + "Value": "farkin-existingFargateService/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingFargateService/Vpc/FlowLog" + "Value": "farkin-existingFargateService/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -676,7 +676,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingFargateServiceECRAPIsecuritygroup5EE2643E", + "farkinexistingFargateServiceECRAPIsecuritygroupF2455F12", "GroupId" ] } @@ -717,7 +717,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingFargateServiceECRDKRsecuritygroup41F182BE", + "farkinexistingFargateServiceECRDKRsecuritygroup449EDD78", "GroupId" ] } @@ -799,7 +799,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingFargateServiceKINESISSTREAMSsecuritygroup182A19D5", + "farkinexistingFargateServiceKINESISSTREAMSsecuritygroup21CA24CF", "GroupId" ] } @@ -833,10 +833,10 @@ } } }, - "existingFargateServiceECRAPIsecuritygroup5EE2643E": { + "farkinexistingFargateServiceECRAPIsecuritygroupF2455F12": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingFargateService/existingFargateService-ECR_API-security-group", + "GroupDescription": "farkin-existingFargateService/farkin-existingFargateService-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -891,10 +891,10 @@ } } }, - "existingFargateServiceECRDKRsecuritygroup41F182BE": { + "farkinexistingFargateServiceECRDKRsecuritygroup449EDD78": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingFargateService/existingFargateService-ECR_DKR-security-group", + "GroupDescription": "farkin-existingFargateService/farkin-existingFargateService-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1025,7 +1025,7 @@ } ], "Cpu": "256", - "Family": "existingFargateServicetesttaskdef55189A31", + "Family": "farkinexistingFargateServicetesttaskdefC5C56F23", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1158,10 +1158,10 @@ "Threshold": 0 } }, - "existingFargateServiceKINESISSTREAMSsecuritygroup182A19D5": { + "farkinexistingFargateServiceKINESISSTREAMSsecuritygroup21CA24CF": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingFargateService/existingFargateService-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-existingFargateService/farkin-existingFargateService-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingFargateService.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingFargateService.ts 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.farkin-existingStream.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingStream.expected.json index 28cff9b56..bc197bbc8 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.farkin-existingStream.expected.json @@ -49,7 +49,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc" + "Value": "farkin-existingStream/Vpc" } ] } @@ -71,7 +71,7 @@ }, { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet1" + "Value": "farkin-existingStream/Vpc/PublicSubnet1" } ], "VpcId": { @@ -95,7 +95,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet1" + "Value": "farkin-existingStream/Vpc/PublicSubnet1" } ], "VpcId": { @@ -136,7 +136,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet1" + "Value": "farkin-existingStream/Vpc/PublicSubnet1" } ] } @@ -156,7 +156,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet1" + "Value": "farkin-existingStream/Vpc/PublicSubnet1" } ] }, @@ -182,7 +182,7 @@ }, { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet2" + "Value": "farkin-existingStream/Vpc/PublicSubnet2" } ], "VpcId": { @@ -206,7 +206,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet2" + "Value": "farkin-existingStream/Vpc/PublicSubnet2" } ], "VpcId": { @@ -247,7 +247,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet2" + "Value": "farkin-existingStream/Vpc/PublicSubnet2" } ] } @@ -267,7 +267,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet2" + "Value": "farkin-existingStream/Vpc/PublicSubnet2" } ] }, @@ -293,7 +293,7 @@ }, { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet3" + "Value": "farkin-existingStream/Vpc/PublicSubnet3" } ], "VpcId": { @@ -317,7 +317,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet3" + "Value": "farkin-existingStream/Vpc/PublicSubnet3" } ], "VpcId": { @@ -358,7 +358,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet3" + "Value": "farkin-existingStream/Vpc/PublicSubnet3" } ] } @@ -378,7 +378,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PublicSubnet3" + "Value": "farkin-existingStream/Vpc/PublicSubnet3" } ] }, @@ -404,7 +404,7 @@ }, { "Key": "Name", - "Value": "existingStream/Vpc/PrivateSubnet1" + "Value": "farkin-existingStream/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -418,7 +418,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PrivateSubnet1" + "Value": "farkin-existingStream/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -466,7 +466,7 @@ }, { "Key": "Name", - "Value": "existingStream/Vpc/PrivateSubnet2" + "Value": "farkin-existingStream/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -480,7 +480,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PrivateSubnet2" + "Value": "farkin-existingStream/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -528,7 +528,7 @@ }, { "Key": "Name", - "Value": "existingStream/Vpc/PrivateSubnet3" + "Value": "farkin-existingStream/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -542,7 +542,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/PrivateSubnet3" + "Value": "farkin-existingStream/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -579,7 +579,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc" + "Value": "farkin-existingStream/Vpc" } ] } @@ -613,7 +613,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/FlowLog" + "Value": "farkin-existingStream/Vpc/FlowLog" } ] } @@ -665,7 +665,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/FlowLog" + "Value": "farkin-existingStream/Vpc/FlowLog" } ] }, @@ -702,7 +702,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingStream/Vpc/FlowLog" + "Value": "farkin-existingStream/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -715,7 +715,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingStreamKINESISSTREAMSsecuritygroup14C04A5F", + "farkinexistingStreamKINESISSTREAMSsecuritygroup2555F81B", "GroupId" ] } @@ -756,7 +756,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingStreamECRAPIsecuritygroup4E9C019E", + "farkinexistingStreamECRAPIsecuritygroup4D631094", "GroupId" ] } @@ -797,7 +797,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingStreamECRDKRsecuritygroup5C8931AB", + "farkinexistingStreamECRDKRsecuritygroup6C2FE279", "GroupId" ] } @@ -872,10 +872,10 @@ } } }, - "existingStreamKINESISSTREAMSsecuritygroup14C04A5F": { + "farkinexistingStreamKINESISSTREAMSsecuritygroup2555F81B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingStream/existingStream-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-existingStream/farkin-existingStream-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -930,10 +930,10 @@ } } }, - "existingStreamECRAPIsecuritygroup4E9C019E": { + "farkinexistingStreamECRAPIsecuritygroup4D631094": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingStream/existingStream-ECR_API-security-group", + "GroupDescription": "farkin-existingStream/farkin-existingStream-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -988,10 +988,10 @@ } } }, - "existingStreamECRDKRsecuritygroup5C8931AB": { + "farkinexistingStreamECRDKRsecuritygroup6C2FE279": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingStream/existingStream-ECR_DKR-security-group", + "GroupDescription": "farkin-existingStream/farkin-existingStream-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1122,7 +1122,7 @@ } ], "Cpu": "256", - "Family": "existingStreamtestfargatekinesisstreamstaskdefD159DB28", + "Family": "farkinexistingStreamtestfargatekinesisstreamstaskdef3D866938", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingStream.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingStream.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingStream.ts 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.farkin-existingVpc.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingVpc.expected.json index b5492ad94..7e8c373e1 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.farkin-existingVpc.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "farkin-existingVpc/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farkin-existingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farkin-existingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farkin-existingVpc/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "farkin-existingVpc/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farkin-existingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farkin-existingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farkin-existingVpc/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "farkin-existingVpc/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farkin-existingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farkin-existingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farkin-existingVpc/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "farkin-existingVpc/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet1" + "Value": "farkin-existingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet1" + "Value": "farkin-existingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet2" + "Value": "farkin-existingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet2" + "Value": "farkin-existingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet3" + "Value": "farkin-existingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet3" + "Value": "farkin-existingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "farkin-existingVpc/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "farkin-existingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "farkin-existingVpc/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "farkin-existingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -676,7 +676,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9", + "farkinexistingVpcKINESISSTREAMSsecuritygroupB4DB27F8", "GroupId" ] } @@ -717,7 +717,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcECRAPIsecuritygroupB3E4A376", + "farkinexistingVpcECRAPIsecuritygroupFF0E68D3", "GroupId" ] } @@ -758,7 +758,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcECRDKRsecuritygroup0500FAE6", + "farkinexistingVpcECRDKRsecuritygroup5D9945D5", "GroupId" ] } @@ -870,10 +870,10 @@ "Threshold": 0 } }, - "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9": { + "farkinexistingVpcKINESISSTREAMSsecuritygroupB4DB27F8": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-existingVpc/farkin-existingVpc-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -928,10 +928,10 @@ } } }, - "existingVpcECRAPIsecuritygroupB3E4A376": { + "farkinexistingVpcECRAPIsecuritygroupFF0E68D3": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-ECR_API-security-group", + "GroupDescription": "farkin-existingVpc/farkin-existingVpc-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -986,10 +986,10 @@ } } }, - "existingVpcECRDKRsecuritygroup0500FAE6": { + "farkinexistingVpcECRDKRsecuritygroup5D9945D5": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-ECR_DKR-security-group", + "GroupDescription": "farkin-existingVpc/farkin-existingVpc-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1120,7 +1120,7 @@ } ], "Cpu": "256", - "Family": "existingVpctestfargatekinesisstreamstaskdefAAC2A3A2", + "Family": "farkinexistingVpctestfargatekinesisstreamstaskdefA4B32618", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-existingVpc.ts 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.farkin-fargateServiceFromProps.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-fargateServiceFromProps.expected.json index c5d5c91b5..a31e3f2f3 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.farkin-fargateServiceFromProps.expected.json @@ -47,7 +47,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "farkin-fargateServiceFromProps/Vpc" } ] } @@ -69,7 +69,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -93,7 +93,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -134,7 +134,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet1" } ] } @@ -154,7 +154,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet1" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet1" } ] }, @@ -180,7 +180,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -204,7 +204,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -245,7 +245,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet2" } ] } @@ -265,7 +265,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet2" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet2" } ] }, @@ -291,7 +291,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -315,7 +315,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -356,7 +356,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet3" } ] } @@ -376,7 +376,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PublicSubnet3" + "Value": "farkin-fargateServiceFromProps/Vpc/PublicSubnet3" } ] }, @@ -402,7 +402,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" + "Value": "farkin-fargateServiceFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -416,7 +416,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet1" + "Value": "farkin-fargateServiceFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -464,7 +464,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" + "Value": "farkin-fargateServiceFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -478,7 +478,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet2" + "Value": "farkin-fargateServiceFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -526,7 +526,7 @@ }, { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" + "Value": "farkin-fargateServiceFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/PrivateSubnet3" + "Value": "farkin-fargateServiceFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -577,7 +577,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc" + "Value": "farkin-fargateServiceFromProps/Vpc" } ] } @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/FlowLog" + "Value": "farkin-fargateServiceFromProps/Vpc/FlowLog" } ] } @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/FlowLog" + "Value": "farkin-fargateServiceFromProps/Vpc/FlowLog" } ] }, @@ -700,7 +700,7 @@ "Tags": [ { "Key": "Name", - "Value": "fargateServiceFromProps/Vpc/FlowLog" + "Value": "farkin-fargateServiceFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -713,7 +713,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "fargateServiceFromPropsKINESISSTREAMSsecuritygroup6FD7F225", + "farkinfargateServiceFromPropsKINESISSTREAMSsecuritygroupCB85FA0B", "GroupId" ] } @@ -754,7 +754,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "fargateServiceFromPropsECRAPIsecuritygroup5784F80B", + "farkinfargateServiceFromPropsECRAPIsecuritygroup9D2C3426", "GroupId" ] } @@ -795,7 +795,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F", + "farkinfargateServiceFromPropsECRDKRsecuritygroupB0FEA175", "GroupId" ] } @@ -870,10 +870,10 @@ } } }, - "fargateServiceFromPropsKINESISSTREAMSsecuritygroup6FD7F225": { + "farkinfargateServiceFromPropsKINESISSTREAMSsecuritygroupCB85FA0B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "fargateServiceFromProps/fargateServiceFromProps-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-fargateServiceFromProps/farkin-fargateServiceFromProps-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -928,10 +928,10 @@ } } }, - "fargateServiceFromPropsECRAPIsecuritygroup5784F80B": { + "farkinfargateServiceFromPropsECRAPIsecuritygroup9D2C3426": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "fargateServiceFromProps/fargateServiceFromProps-ECR_API-security-group", + "GroupDescription": "farkin-fargateServiceFromProps/farkin-fargateServiceFromProps-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -986,10 +986,10 @@ } } }, - "fargateServiceFromPropsECRDKRsecuritygroup9E1C301F": { + "farkinfargateServiceFromPropsECRDKRsecuritygroupB0FEA175": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "fargateServiceFromProps/fargateServiceFromProps-ECR_DKR-security-group", + "GroupDescription": "farkin-fargateServiceFromProps/farkin-fargateServiceFromProps-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1120,7 +1120,7 @@ } ], "Cpu": "256", - "Family": "fargateServiceFromPropstestfargatekinesisstreamstaskdef00ED69EC", + "Family": "farkinfargateServiceFromPropstestfargatekinesisstreamstaskdef2D7B0207", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-fargateServiceFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-fargateServiceFromProps.ts 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.farkin-noArguments.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-noArguments.expected.json index 6b84aee7b..ff1a55045 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.farkin-noArguments.expected.json @@ -47,7 +47,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "farkin-noArguments/Vpc" } ] } @@ -69,7 +69,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farkin-noArguments/Vpc/PublicSubnet1" } ], "VpcId": { @@ -93,7 +93,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farkin-noArguments/Vpc/PublicSubnet1" } ], "VpcId": { @@ -134,7 +134,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farkin-noArguments/Vpc/PublicSubnet1" } ] } @@ -154,7 +154,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet1" + "Value": "farkin-noArguments/Vpc/PublicSubnet1" } ] }, @@ -180,7 +180,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farkin-noArguments/Vpc/PublicSubnet2" } ], "VpcId": { @@ -204,7 +204,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farkin-noArguments/Vpc/PublicSubnet2" } ], "VpcId": { @@ -245,7 +245,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farkin-noArguments/Vpc/PublicSubnet2" } ] } @@ -265,7 +265,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet2" + "Value": "farkin-noArguments/Vpc/PublicSubnet2" } ] }, @@ -291,7 +291,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farkin-noArguments/Vpc/PublicSubnet3" } ], "VpcId": { @@ -315,7 +315,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farkin-noArguments/Vpc/PublicSubnet3" } ], "VpcId": { @@ -356,7 +356,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farkin-noArguments/Vpc/PublicSubnet3" } ] } @@ -376,7 +376,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PublicSubnet3" + "Value": "farkin-noArguments/Vpc/PublicSubnet3" } ] }, @@ -402,7 +402,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet1" + "Value": "farkin-noArguments/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -416,7 +416,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet1" + "Value": "farkin-noArguments/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -464,7 +464,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet2" + "Value": "farkin-noArguments/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -478,7 +478,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet2" + "Value": "farkin-noArguments/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -526,7 +526,7 @@ }, { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet3" + "Value": "farkin-noArguments/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/PrivateSubnet3" + "Value": "farkin-noArguments/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -577,7 +577,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc" + "Value": "farkin-noArguments/Vpc" } ] } @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/FlowLog" + "Value": "farkin-noArguments/Vpc/FlowLog" } ] } @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/FlowLog" + "Value": "farkin-noArguments/Vpc/FlowLog" } ] }, @@ -700,7 +700,7 @@ "Tags": [ { "Key": "Name", - "Value": "noArguments/Vpc/FlowLog" + "Value": "farkin-noArguments/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -713,7 +713,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "noArgumentsKINESISSTREAMSsecuritygroupA5FDBE79", + "farkinnoArgumentsKINESISSTREAMSsecuritygroup96006AA6", "GroupId" ] } @@ -754,7 +754,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "noArgumentsECRAPIsecuritygroup70B67825", + "farkinnoArgumentsECRAPIsecuritygroupC89CB01F", "GroupId" ] } @@ -795,7 +795,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "noArgumentsECRDKRsecuritygroup881C3744", + "farkinnoArgumentsECRDKRsecuritygroupC8F0FF04", "GroupId" ] } @@ -870,10 +870,10 @@ } } }, - "noArgumentsKINESISSTREAMSsecuritygroupA5FDBE79": { + "farkinnoArgumentsKINESISSTREAMSsecuritygroup96006AA6": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "noArguments/noArguments-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-noArguments/farkin-noArguments-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -928,10 +928,10 @@ } } }, - "noArgumentsECRAPIsecuritygroup70B67825": { + "farkinnoArgumentsECRAPIsecuritygroupC89CB01F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "noArguments/noArguments-ECR_API-security-group", + "GroupDescription": "farkin-noArguments/farkin-noArguments-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -986,10 +986,10 @@ } } }, - "noArgumentsECRDKRsecuritygroup881C3744": { + "farkinnoArgumentsECRDKRsecuritygroupC8F0FF04": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "noArguments/noArguments-ECR_DKR-security-group", + "GroupDescription": "farkin-noArguments/farkin-noArguments-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1120,7 +1120,7 @@ } ], "Cpu": "256", - "Family": "noArgumentstestfargatekinesisstreamstaskdef80D83FB4", + "Family": "farkinnoArgumentstestfargatekinesisstreamstaskdefE3913C8B", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-noArguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-noArguments.ts 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.farkin-streamFromProps.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-streamFromProps.expected.json index 1e6781fb8..a05be9cee 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.farkin-streamFromProps.expected.json @@ -49,7 +49,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc" + "Value": "farkin-streamFromProps/Vpc" } ] } @@ -71,7 +71,7 @@ }, { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet1" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -95,7 +95,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet1" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -136,7 +136,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet1" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet1" } ] } @@ -156,7 +156,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet1" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet1" } ] }, @@ -182,7 +182,7 @@ }, { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet2" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -206,7 +206,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet2" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -247,7 +247,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet2" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet2" } ] } @@ -267,7 +267,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet2" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet2" } ] }, @@ -293,7 +293,7 @@ }, { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet3" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -317,7 +317,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet3" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -358,7 +358,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet3" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet3" } ] } @@ -378,7 +378,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PublicSubnet3" + "Value": "farkin-streamFromProps/Vpc/PublicSubnet3" } ] }, @@ -404,7 +404,7 @@ }, { "Key": "Name", - "Value": "streamFromProps/Vpc/PrivateSubnet1" + "Value": "farkin-streamFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -418,7 +418,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PrivateSubnet1" + "Value": "farkin-streamFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -466,7 +466,7 @@ }, { "Key": "Name", - "Value": "streamFromProps/Vpc/PrivateSubnet2" + "Value": "farkin-streamFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -480,7 +480,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PrivateSubnet2" + "Value": "farkin-streamFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -528,7 +528,7 @@ }, { "Key": "Name", - "Value": "streamFromProps/Vpc/PrivateSubnet3" + "Value": "farkin-streamFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -542,7 +542,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/PrivateSubnet3" + "Value": "farkin-streamFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -579,7 +579,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc" + "Value": "farkin-streamFromProps/Vpc" } ] } @@ -613,7 +613,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/FlowLog" + "Value": "farkin-streamFromProps/Vpc/FlowLog" } ] } @@ -665,7 +665,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/FlowLog" + "Value": "farkin-streamFromProps/Vpc/FlowLog" } ] }, @@ -702,7 +702,7 @@ "Tags": [ { "Key": "Name", - "Value": "streamFromProps/Vpc/FlowLog" + "Value": "farkin-streamFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -715,7 +715,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "streamFromPropsKINESISSTREAMSsecuritygroup68986EDF", + "farkinstreamFromPropsKINESISSTREAMSsecuritygroup17D52D6E", "GroupId" ] } @@ -756,7 +756,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "streamFromPropsECRAPIsecuritygroupFDB580C0", + "farkinstreamFromPropsECRAPIsecuritygroup9B78C16A", "GroupId" ] } @@ -797,7 +797,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "streamFromPropsECRDKRsecuritygroupEB1BC2F0", + "farkinstreamFromPropsECRDKRsecuritygroup153D1633", "GroupId" ] } @@ -872,10 +872,10 @@ } } }, - "streamFromPropsKINESISSTREAMSsecuritygroup68986EDF": { + "farkinstreamFromPropsKINESISSTREAMSsecuritygroup17D52D6E": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "streamFromProps/streamFromProps-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-streamFromProps/farkin-streamFromProps-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -930,10 +930,10 @@ } } }, - "streamFromPropsECRAPIsecuritygroupFDB580C0": { + "farkinstreamFromPropsECRAPIsecuritygroup9B78C16A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "streamFromProps/streamFromProps-ECR_API-security-group", + "GroupDescription": "farkin-streamFromProps/farkin-streamFromProps-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -988,10 +988,10 @@ } } }, - "streamFromPropsECRDKRsecuritygroupEB1BC2F0": { + "farkinstreamFromPropsECRDKRsecuritygroup153D1633": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "streamFromProps/streamFromProps-ECR_DKR-security-group", + "GroupDescription": "farkin-streamFromProps/farkin-streamFromProps-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1122,7 +1122,7 @@ } ], "Cpu": "256", - "Family": "streamFromPropstestfargatekinesisstreamstaskdef639261D4", + "Family": "farkinstreamFromPropstestfargatekinesisstreamstaskdef47CE87EA", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-streamFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.streamFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-streamFromProps.ts 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.farkin-vpcFromProps.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-vpcFromProps.expected.json index 9532f7b9d..a0ae90072 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.farkin-vpcFromProps.expected.json @@ -47,7 +47,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc" + "Value": "farkin-vpcFromProps/Vpc" } ] } @@ -69,7 +69,7 @@ }, { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet1" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -93,7 +93,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet1" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet1" } ], "VpcId": { @@ -134,7 +134,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet1" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet1" } ] } @@ -154,7 +154,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet1" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet1" } ] }, @@ -180,7 +180,7 @@ }, { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet2" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -204,7 +204,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet2" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet2" } ], "VpcId": { @@ -245,7 +245,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet2" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet2" } ] } @@ -265,7 +265,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet2" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet2" } ] }, @@ -291,7 +291,7 @@ }, { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet3" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -315,7 +315,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet3" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet3" } ], "VpcId": { @@ -356,7 +356,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet3" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet3" } ] } @@ -376,7 +376,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PublicSubnet3" + "Value": "farkin-vpcFromProps/Vpc/PublicSubnet3" } ] }, @@ -402,7 +402,7 @@ }, { "Key": "Name", - "Value": "vpcFromProps/Vpc/PrivateSubnet1" + "Value": "farkin-vpcFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -416,7 +416,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PrivateSubnet1" + "Value": "farkin-vpcFromProps/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -464,7 +464,7 @@ }, { "Key": "Name", - "Value": "vpcFromProps/Vpc/PrivateSubnet2" + "Value": "farkin-vpcFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -478,7 +478,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PrivateSubnet2" + "Value": "farkin-vpcFromProps/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -526,7 +526,7 @@ }, { "Key": "Name", - "Value": "vpcFromProps/Vpc/PrivateSubnet3" + "Value": "farkin-vpcFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/PrivateSubnet3" + "Value": "farkin-vpcFromProps/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -577,7 +577,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc" + "Value": "farkin-vpcFromProps/Vpc" } ] } @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/FlowLog" + "Value": "farkin-vpcFromProps/Vpc/FlowLog" } ] } @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/FlowLog" + "Value": "farkin-vpcFromProps/Vpc/FlowLog" } ] }, @@ -700,7 +700,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpcFromProps/Vpc/FlowLog" + "Value": "farkin-vpcFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -713,7 +713,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "vpcFromPropsKINESISSTREAMSsecuritygroupB4A9EE00", + "farkinvpcFromPropsKINESISSTREAMSsecuritygroup89119531", "GroupId" ] } @@ -754,7 +754,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "vpcFromPropsECRAPIsecuritygroup5AF6C0C4", + "farkinvpcFromPropsECRAPIsecuritygroup60FDBCC4", "GroupId" ] } @@ -795,7 +795,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "vpcFromPropsECRDKRsecuritygroup822718EC", + "farkinvpcFromPropsECRDKRsecuritygroup32D87A6D", "GroupId" ] } @@ -870,10 +870,10 @@ } } }, - "vpcFromPropsKINESISSTREAMSsecuritygroupB4A9EE00": { + "farkinvpcFromPropsKINESISSTREAMSsecuritygroup89119531": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpcFromProps/vpcFromProps-KINESIS_STREAMS-security-group", + "GroupDescription": "farkin-vpcFromProps/farkin-vpcFromProps-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -928,10 +928,10 @@ } } }, - "vpcFromPropsECRAPIsecuritygroup5AF6C0C4": { + "farkinvpcFromPropsECRAPIsecuritygroup60FDBCC4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpcFromProps/vpcFromProps-ECR_API-security-group", + "GroupDescription": "farkin-vpcFromProps/farkin-vpcFromProps-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -986,10 +986,10 @@ } } }, - "vpcFromPropsECRDKRsecuritygroup822718EC": { + "farkinvpcFromPropsECRDKRsecuritygroup32D87A6D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpcFromProps/vpcFromProps-ECR_DKR-security-group", + "GroupDescription": "farkin-vpcFromProps/farkin-vpcFromProps-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1120,7 +1120,7 @@ } ], "Cpu": "256", - "Family": "vpcFromPropstestfargatekinesisstreamstaskdef222FE29E", + "Family": "farkinvpcFromPropstestfargatekinesisstreamstaskdef1CE5A89B", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-vpcFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.farkin-vpcFromProps.ts 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.faropn-existing-resources.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-existing-resources.expected.json index 4e43f850b..469ccbc84 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.faropn-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "faropn-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "faropn-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "faropn-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "faropn-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "faropn-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "faropn-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "faropn-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "faropn-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "faropn-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "faropn-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "faropn-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "faropn-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "faropn-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "faropn-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "faropn-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "faropn-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "faropn-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "faropn-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "faropn-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "faropn-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "faropn-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "faropn-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "faropn-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "faropnexistingresourcesECRAPIsecuritygroup9E21D9FB", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "faropnexistingresourcesECRDKRsecuritygroupCF68611A", "GroupId" ] } @@ -771,10 +771,10 @@ } } }, - "existingresourcesECRAPIsecuritygroup78294485": { + "faropnexistingresourcesECRAPIsecuritygroup9E21D9FB": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "faropn-existing-resources/faropn-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -829,10 +829,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "faropnexistingresourcesECRDKRsecuritygroupCF68611A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "faropn-existing-resources/faropn-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -936,7 +936,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "faropnexistingresourcestesttaskdefE1B083DB", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-existing-resources.ts 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.faropn-new-resources.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-new-resources.expected.json index 1887e8c57..f554a190b 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.faropn-new-resources.expected.json @@ -84,7 +84,7 @@ "testconstructUserPoolDomain6B64F32F": { "Type": "AWS::Cognito::UserPoolDomain", "Properties": { - "Domain": "solution-constructs", + "Domain": "faropn-new-resources", "UserPoolId": { "Ref": "testconstructCognitoUserPoolA4991355" } @@ -141,7 +141,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/solution-constructs/*" + ":domain/faropn-new-resources/*" ] ] } @@ -254,7 +254,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/solution-constructs" + ":domain/faropn-new-resources" ] ] } @@ -318,7 +318,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/solution-constructs/*" + ":domain/faropn-new-resources/*" ] ] } @@ -354,7 +354,7 @@ "EnforceHTTPS": true, "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07" }, - "DomainName": "solution-constructs", + "DomainName": "faropn-new-resources", "EBSOptions": { "EBSEnabled": true, "VolumeSize": 10 @@ -533,7 +533,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "faropn-new-resources/Vpc" } ] } @@ -555,7 +555,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "faropn-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -579,7 +579,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "faropn-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -620,7 +620,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "faropn-new-resources/Vpc/PublicSubnet1" } ] } @@ -640,7 +640,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "faropn-new-resources/Vpc/PublicSubnet1" } ] }, @@ -666,7 +666,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "faropn-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -690,7 +690,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "faropn-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -731,7 +731,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "faropn-new-resources/Vpc/PublicSubnet2" } ] } @@ -751,7 +751,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "faropn-new-resources/Vpc/PublicSubnet2" } ] }, @@ -777,7 +777,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "faropn-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -801,7 +801,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "faropn-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -842,7 +842,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "faropn-new-resources/Vpc/PublicSubnet3" } ] } @@ -862,7 +862,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "faropn-new-resources/Vpc/PublicSubnet3" } ] }, @@ -888,7 +888,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "faropn-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -902,7 +902,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "faropn-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -950,7 +950,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "faropn-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -964,7 +964,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "faropn-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1012,7 +1012,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "faropn-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1026,7 +1026,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "faropn-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1063,7 +1063,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "faropn-new-resources/Vpc" } ] } @@ -1097,7 +1097,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "faropn-new-resources/Vpc/FlowLog" } ] } @@ -1149,7 +1149,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "faropn-new-resources/Vpc/FlowLog" } ] }, @@ -1186,7 +1186,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "faropn-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1199,7 +1199,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "faropnnewresourcesECRAPIsecuritygroup518CB3F4", "GroupId" ] } @@ -1229,7 +1229,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "faropnnewresourcesECRDKRsecuritygroup12106D60", "GroupId" ] } @@ -1293,10 +1293,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "faropnnewresourcesECRAPIsecuritygroup518CB3F4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "faropn-new-resources/faropn-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1351,10 +1351,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "faropnnewresourcesECRDKRsecuritygroup12106D60": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "faropn-new-resources/faropn-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1458,7 +1458,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "faropnnewresourcestestconstructtaskdefA180857F", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-new-resources.ts similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-new-resources.ts index 864905f47..916c87b7c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.faropn-new-resources.ts @@ -31,7 +31,7 @@ const testProps: FargateToOpenSearchProps = { containerDefinitionProps: { image }, - openSearchDomainName: 'solution-constructs', + openSearchDomainName: `${generateIntegStackName(__filename)}`, }; new FargateToOpenSearch(stack, 'test-construct', testProps); 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.fars3-existing-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.fars3-existing-resources.expected.json index 60e51ad86..adf6b6827 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.fars3-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "fars3-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "fars3-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "fars3-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "fars3-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "fars3-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "fars3-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "fars3-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "fars3-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "fars3-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "fars3-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "fars3-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "fars3-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "fars3-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "fars3-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "fars3-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "fars3-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "fars3-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "fars3-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "fars3-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "fars3-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "fars3-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "fars3-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "fars3-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "fars3existingresourcesECRAPIsecuritygroup62B31B6C", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "fars3existingresourcesECRDKRsecuritygroupDA08F372", "GroupId" ] } @@ -824,6 +824,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -913,7 +914,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -960,10 +961,10 @@ } } }, - "existingresourcesECRAPIsecuritygroup78294485": { + "fars3existingresourcesECRAPIsecuritygroup62B31B6C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "fars3-existing-resources/fars3-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1018,10 +1019,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "fars3existingresourcesECRDKRsecuritygroupDA08F372": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "fars3-existing-resources/fars3-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1225,7 +1226,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "fars3existingresourcestesttaskdef84DD1421", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.fars3-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.fars3-existing-resources.ts 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.fars3-new-resources.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.fars3-new-resources.expected.json index df29641ff..aab3d48e4 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.fars3-new-resources.expected.json @@ -212,6 +212,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -282,7 +283,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "fars3-new-resources/Vpc" } ] } @@ -304,7 +305,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "fars3-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -328,7 +329,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "fars3-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -369,7 +370,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "fars3-new-resources/Vpc/PublicSubnet1" } ] } @@ -389,7 +390,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "fars3-new-resources/Vpc/PublicSubnet1" } ] }, @@ -415,7 +416,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "fars3-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -439,7 +440,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "fars3-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -480,7 +481,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "fars3-new-resources/Vpc/PublicSubnet2" } ] } @@ -500,7 +501,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "fars3-new-resources/Vpc/PublicSubnet2" } ] }, @@ -526,7 +527,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "fars3-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -550,7 +551,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "fars3-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -591,7 +592,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "fars3-new-resources/Vpc/PublicSubnet3" } ] } @@ -611,7 +612,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "fars3-new-resources/Vpc/PublicSubnet3" } ] }, @@ -637,7 +638,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "fars3-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -651,7 +652,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "fars3-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -699,7 +700,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "fars3-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -713,7 +714,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "fars3-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -761,7 +762,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "fars3-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -775,7 +776,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "fars3-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -812,7 +813,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "fars3-new-resources/Vpc" } ] } @@ -846,7 +847,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "fars3-new-resources/Vpc/FlowLog" } ] } @@ -898,7 +899,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "fars3-new-resources/Vpc/FlowLog" } ] }, @@ -935,7 +936,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "fars3-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -989,7 +990,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "fars3newresourcesECRAPIsecuritygroupD131A26F", "GroupId" ] } @@ -1019,7 +1020,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "fars3newresourcesECRDKRsecuritygroupEB0E4C34", "GroupId" ] } @@ -1042,10 +1043,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "fars3newresourcesECRAPIsecuritygroupD131A26F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "fars3-new-resources/fars3-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1100,10 +1101,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "fars3newresourcesECRDKRsecuritygroupEB0E4C34": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "fars3-new-resources/fars3-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1262,7 +1263,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "fars3newresourcestestconstructtaskdef85494902", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1387,7 +1388,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.fars3-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.fars3-new-resources.ts 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.farsec-existing-resources.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.farsec-existing-resources.expected.json index 9355051e6..1e206557a 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.farsec-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farsec-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsec-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsec-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsec-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsec-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsec-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsec-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsec-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsec-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsec-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsec-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsec-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsec-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farsec-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farsec-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farsec-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farsec-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farsec-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farsec-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farsec-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsec-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsec-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsec-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "farsecexistingresourcesECRAPIsecuritygroupC53896E0", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "farsecexistingresourcesECRDKRsecuritygroupF8F7815B", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesSECRETSMANAGERsecuritygroup8010FC5B", + "farsecexistingresourcesSECRETSMANAGERsecuritygroup6E143135", "GroupId" ] } @@ -819,10 +819,10 @@ } } }, - "existingresourcesECRAPIsecuritygroup78294485": { + "farsecexistingresourcesECRAPIsecuritygroupC53896E0": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "farsec-existing-resources/farsec-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -877,10 +877,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "farsecexistingresourcesECRDKRsecuritygroupF8F7815B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "farsec-existing-resources/farsec-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1007,7 +1007,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "farsecexistingresourcestesttaskdefDDA81A95", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1103,10 +1103,10 @@ "testtaskdefTaskRoleB2DEF113" ] }, - "existingresourcesSECRETSMANAGERsecuritygroup8010FC5B": { + "farsecexistingresourcesSECRETSMANAGERsecuritygroup6E143135": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-SECRETS_MANAGER-security-group", + "GroupDescription": "farsec-existing-resources/farsec-existing-resources-SECRETS_MANAGER-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.farsec-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.farsec-existing-resources.ts 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.farsec-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.farsec-new-resources.expected.json index f893bb048..df696de8b 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.farsec-new-resources.expected.json @@ -29,7 +29,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farsec-new-resources/Vpc" } ] } @@ -51,7 +51,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsec-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -75,7 +75,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsec-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -116,7 +116,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsec-new-resources/Vpc/PublicSubnet1" } ] } @@ -136,7 +136,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsec-new-resources/Vpc/PublicSubnet1" } ] }, @@ -162,7 +162,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsec-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -186,7 +186,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsec-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -227,7 +227,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsec-new-resources/Vpc/PublicSubnet2" } ] } @@ -247,7 +247,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsec-new-resources/Vpc/PublicSubnet2" } ] }, @@ -273,7 +273,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsec-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -297,7 +297,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsec-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -338,7 +338,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsec-new-resources/Vpc/PublicSubnet3" } ] } @@ -358,7 +358,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsec-new-resources/Vpc/PublicSubnet3" } ] }, @@ -384,7 +384,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farsec-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -398,7 +398,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farsec-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -446,7 +446,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farsec-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -460,7 +460,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farsec-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -508,7 +508,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farsec-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -522,7 +522,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farsec-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -559,7 +559,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farsec-new-resources/Vpc" } ] } @@ -593,7 +593,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsec-new-resources/Vpc/FlowLog" } ] } @@ -645,7 +645,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsec-new-resources/Vpc/FlowLog" } ] }, @@ -682,7 +682,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsec-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -695,7 +695,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesSECRETSMANAGERsecuritygroupD22DA6BC", + "farsecnewresourcesSECRETSMANAGERsecuritygroup34AF6546", "GroupId" ] } @@ -725,7 +725,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farsecnewresourcesECRAPIsecuritygroupBD14F246", "GroupId" ] } @@ -755,7 +755,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farsecnewresourcesECRDKRsecuritygroupB185D03F", "GroupId" ] } @@ -819,10 +819,10 @@ } } }, - "newresourcesSECRETSMANAGERsecuritygroupD22DA6BC": { + "farsecnewresourcesSECRETSMANAGERsecuritygroup34AF6546": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-SECRETS_MANAGER-security-group", + "GroupDescription": "farsec-new-resources/farsec-new-resources-SECRETS_MANAGER-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -877,10 +877,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farsecnewresourcesECRAPIsecuritygroupBD14F246": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farsec-new-resources/farsec-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -935,10 +935,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farsecnewresourcesECRDKRsecuritygroupB185D03F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farsec-new-resources/farsec-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1075,7 +1075,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "farsecnewresourcestestconstructtaskdef92BB4D49", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.farsec-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.farsec-new-resources.ts 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.farsns-existing-resources.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.farsns-existing-resources.expected.json index 1f5c9d097..7b77dcf23 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.farsns-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farsns-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsns-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsns-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsns-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsns-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsns-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsns-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsns-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsns-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsns-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsns-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsns-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsns-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farsns-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farsns-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farsns-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farsns-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farsns-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farsns-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farsns-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsns-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsns-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsns-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "farsnsexistingresourcesECRAPIsecuritygroup5505C2BB", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "farsnsexistingresourcesECRDKRsecuritygroupEB894942", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesSNSsecuritygroup2696BE98", + "farsnsexistingresourcesSNSsecuritygroupAD8D8BB6", "GroupId" ] } @@ -814,10 +814,10 @@ } } }, - "existingresourcesECRAPIsecuritygroup78294485": { + "farsnsexistingresourcesECRAPIsecuritygroup5505C2BB": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "farsns-existing-resources/farsns-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -872,10 +872,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "farsnsexistingresourcesECRDKRsecuritygroupEB894942": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "farsns-existing-resources/farsns-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1008,7 +1008,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "farsnsexistingresourcestesttaskdef28AC3B24", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1104,10 +1104,10 @@ "testtaskdefTaskRoleB2DEF113" ] }, - "existingresourcesSNSsecuritygroup2696BE98": { + "farsnsexistingresourcesSNSsecuritygroupAD8D8BB6": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-SNS-security-group", + "GroupDescription": "farsns-existing-resources/farsns-existing-resources-SNS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.farsns-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.farsns-existing-resources.ts 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.farsns-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.farsns-new-resources.expected.json index ee0a2e6b2..a48048163 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.farsns-new-resources.expected.json @@ -116,7 +116,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farsns-new-resources/Vpc" } ] } @@ -138,7 +138,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsns-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -162,7 +162,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsns-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -203,7 +203,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsns-new-resources/Vpc/PublicSubnet1" } ] } @@ -223,7 +223,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsns-new-resources/Vpc/PublicSubnet1" } ] }, @@ -249,7 +249,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsns-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -273,7 +273,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsns-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -314,7 +314,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsns-new-resources/Vpc/PublicSubnet2" } ] } @@ -334,7 +334,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsns-new-resources/Vpc/PublicSubnet2" } ] }, @@ -360,7 +360,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsns-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -384,7 +384,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsns-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -425,7 +425,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsns-new-resources/Vpc/PublicSubnet3" } ] } @@ -445,7 +445,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsns-new-resources/Vpc/PublicSubnet3" } ] }, @@ -471,7 +471,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farsns-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -485,7 +485,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farsns-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -533,7 +533,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farsns-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -547,7 +547,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farsns-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -595,7 +595,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farsns-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -609,7 +609,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farsns-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -646,7 +646,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farsns-new-resources/Vpc" } ] } @@ -680,7 +680,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsns-new-resources/Vpc/FlowLog" } ] } @@ -732,7 +732,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsns-new-resources/Vpc/FlowLog" } ] }, @@ -769,7 +769,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsns-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -782,7 +782,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesSNSsecuritygroup4422F7B8", + "farsnsnewresourcesSNSsecuritygroup3AD224ED", "GroupId" ] } @@ -812,7 +812,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farsnsnewresourcesECRAPIsecuritygroup7385C115", "GroupId" ] } @@ -842,7 +842,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farsnsnewresourcesECRDKRsecuritygroup4A4713E3", "GroupId" ] } @@ -906,10 +906,10 @@ } } }, - "newresourcesSNSsecuritygroup4422F7B8": { + "farsnsnewresourcesSNSsecuritygroup3AD224ED": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-SNS-security-group", + "GroupDescription": "farsns-new-resources/farsns-new-resources-SNS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -964,10 +964,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farsnsnewresourcesECRAPIsecuritygroup7385C115": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farsns-new-resources/farsns-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1022,10 +1022,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farsnsnewresourcesECRDKRsecuritygroup4A4713E3": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farsns-new-resources/farsns-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1158,7 +1158,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "farsnsnewresourcestestconstructtaskdef6E33E3AB", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.farsns-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.farsns-new-resources.ts 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.farsqs-existing-resources.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.farsqs-existing-resources.expected.json index 3e6aae42c..c239e5791 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.farsqs-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farsqs-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farsqs-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farsqs-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farsqs-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farsqs-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farsqs-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farsqs-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farsqs-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farsqs-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsqs-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsqs-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farsqs-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "farsqsexistingresourcesECRAPIsecuritygroupBDA6C0CF", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "farsqsexistingresourcesECRDKRsecuritygroup002DCA16", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesSQSsecuritygroup0C9178B2", + "farsqsexistingresourcesSQSsecuritygroup5F0F5188", "GroupId" ] } @@ -810,10 +810,10 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "existingresourcesECRAPIsecuritygroup78294485": { + "farsqsexistingresourcesECRAPIsecuritygroupBDA6C0CF": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "farsqs-existing-resources/farsqs-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -868,10 +868,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "farsqsexistingresourcesECRDKRsecuritygroup002DCA16": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "farsqs-existing-resources/farsqs-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1027,7 +1027,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "farsqsexistingresourcestesttaskdef5378145E", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1123,10 +1123,10 @@ "testtaskdefTaskRoleB2DEF113" ] }, - "existingresourcesSQSsecuritygroup0C9178B2": { + "farsqsexistingresourcesSQSsecuritygroup5F0F5188": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-SQS-security-group", + "GroupDescription": "farsqs-existing-resources/farsqs-existing-resources-SQS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.farsqs-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.farsqs-existing-resources.ts 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.farsqs-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.farsqs-new-resources.expected.json index b2fe8831d..f695ef797 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.farsqs-new-resources.expected.json @@ -91,7 +91,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farsqs-new-resources/Vpc" } ] } @@ -113,7 +113,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsqs-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -137,7 +137,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsqs-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -178,7 +178,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsqs-new-resources/Vpc/PublicSubnet1" } ] } @@ -198,7 +198,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farsqs-new-resources/Vpc/PublicSubnet1" } ] }, @@ -224,7 +224,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsqs-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -248,7 +248,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsqs-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -289,7 +289,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsqs-new-resources/Vpc/PublicSubnet2" } ] } @@ -309,7 +309,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farsqs-new-resources/Vpc/PublicSubnet2" } ] }, @@ -335,7 +335,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsqs-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -359,7 +359,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsqs-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -400,7 +400,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsqs-new-resources/Vpc/PublicSubnet3" } ] } @@ -420,7 +420,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farsqs-new-resources/Vpc/PublicSubnet3" } ] }, @@ -446,7 +446,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farsqs-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -460,7 +460,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farsqs-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -508,7 +508,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farsqs-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -522,7 +522,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farsqs-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -570,7 +570,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farsqs-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -584,7 +584,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farsqs-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -621,7 +621,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farsqs-new-resources/Vpc" } ] } @@ -655,7 +655,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsqs-new-resources/Vpc/FlowLog" } ] } @@ -707,7 +707,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsqs-new-resources/Vpc/FlowLog" } ] }, @@ -744,7 +744,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farsqs-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -757,7 +757,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesSQSsecuritygroup1D95FDB1", + "farsqsnewresourcesSQSsecuritygroup0DC24AA4", "GroupId" ] } @@ -787,7 +787,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farsqsnewresourcesECRAPIsecuritygroup878D9CD4", "GroupId" ] } @@ -817,7 +817,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farsqsnewresourcesECRDKRsecuritygroupBEF9541D", "GroupId" ] } @@ -881,10 +881,10 @@ } } }, - "newresourcesSQSsecuritygroup1D95FDB1": { + "farsqsnewresourcesSQSsecuritygroup0DC24AA4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-SQS-security-group", + "GroupDescription": "farsqs-new-resources/farsqs-new-resources-SQS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -939,10 +939,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farsqsnewresourcesECRAPIsecuritygroup878D9CD4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farsqs-new-resources/farsqs-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -997,10 +997,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farsqsnewresourcesECRDKRsecuritygroupBEF9541D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farsqs-new-resources/farsqs-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1140,7 +1140,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "farsqsnewresourcestestconstructtaskdefA4068A25", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.farsqs-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.farsqs-new-resources.ts 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.farssm-existing-resources.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.farssm-existing-resources.expected.json index a02651ced..176e69118 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.farssm-existing-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farssm-existing-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farssm-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farssm-existing-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farssm-existing-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet1" + "Value": "farssm-existing-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farssm-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farssm-existing-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farssm-existing-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet2" + "Value": "farssm-existing-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farssm-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farssm-existing-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farssm-existing-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PublicSubnet3" + "Value": "farssm-existing-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farssm-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet1" + "Value": "farssm-existing-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farssm-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet2" + "Value": "farssm-existing-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farssm-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/PrivateSubnet3" + "Value": "farssm-existing-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc" + "Value": "farssm-existing-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farssm-existing-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farssm-existing-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-resources/Vpc/FlowLog" + "Value": "farssm-existing-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRAPIsecuritygroup78294485", + "farssmexistingresourcesECRAPIsecuritygroupCE2D79D9", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesECRDKRsecuritygroup598BA37E", + "farssmexistingresourcesECRDKRsecuritygroup966112D7", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingresourcesSSMsecuritygroup5CE82B38", + "farssmexistingresourcesSSMsecuritygroup12F6DFE9", "GroupId" ] } @@ -811,10 +811,10 @@ "Value": "Foo" } }, - "existingresourcesECRAPIsecuritygroup78294485": { + "farssmexistingresourcesECRAPIsecuritygroupCE2D79D9": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_API-security-group", + "GroupDescription": "farssm-existing-resources/farssm-existing-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -869,10 +869,10 @@ } } }, - "existingresourcesECRDKRsecuritygroup598BA37E": { + "farssmexistingresourcesECRDKRsecuritygroup966112D7": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-ECR_DKR-security-group", + "GroupDescription": "farssm-existing-resources/farssm-existing-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1040,7 +1040,7 @@ } ], "Cpu": "256", - "Family": "existingresourcestesttaskdef88B214A2", + "Family": "farssmexistingresourcestesttaskdef1F702A7D", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1136,10 +1136,10 @@ "testtaskdefTaskRoleB2DEF113" ] }, - "existingresourcesSSMsecuritygroup5CE82B38": { + "farssmexistingresourcesSSMsecuritygroup12F6DFE9": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-resources/existing-resources-SSM-security-group", + "GroupDescription": "farssm-existing-resources/farssm-existing-resources-SSM-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.farssm-existing-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.farssm-existing-resources.ts 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.farssm-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.farssm-new-resources.expected.json index 8b5a629be..d958f5906 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.farssm-new-resources.expected.json @@ -19,7 +19,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farssm-new-resources/Vpc" } ] } @@ -41,7 +41,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farssm-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -65,7 +65,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farssm-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -106,7 +106,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farssm-new-resources/Vpc/PublicSubnet1" } ] } @@ -126,7 +126,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farssm-new-resources/Vpc/PublicSubnet1" } ] }, @@ -152,7 +152,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farssm-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -176,7 +176,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farssm-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -217,7 +217,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farssm-new-resources/Vpc/PublicSubnet2" } ] } @@ -237,7 +237,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farssm-new-resources/Vpc/PublicSubnet2" } ] }, @@ -263,7 +263,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farssm-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -287,7 +287,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farssm-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -328,7 +328,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farssm-new-resources/Vpc/PublicSubnet3" } ] } @@ -348,7 +348,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farssm-new-resources/Vpc/PublicSubnet3" } ] }, @@ -374,7 +374,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farssm-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -388,7 +388,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farssm-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -436,7 +436,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farssm-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -450,7 +450,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farssm-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -498,7 +498,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farssm-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -512,7 +512,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farssm-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -549,7 +549,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farssm-new-resources/Vpc" } ] } @@ -583,7 +583,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farssm-new-resources/Vpc/FlowLog" } ] } @@ -635,7 +635,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farssm-new-resources/Vpc/FlowLog" } ] }, @@ -672,7 +672,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farssm-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -685,7 +685,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesSSMsecuritygroupBA8A3B0D", + "farssmnewresourcesSSMsecuritygroup972ACD83", "GroupId" ] } @@ -715,7 +715,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farssmnewresourcesECRAPIsecuritygroup2AD84172", "GroupId" ] } @@ -745,7 +745,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farssmnewresourcesECRDKRsecuritygroupC6E70ADA", "GroupId" ] } @@ -809,10 +809,10 @@ } } }, - "newresourcesSSMsecuritygroupBA8A3B0D": { + "farssmnewresourcesSSMsecuritygroup972ACD83": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-SSM-security-group", + "GroupDescription": "farssm-new-resources/farssm-new-resources-SSM-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -867,10 +867,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farssmnewresourcesECRAPIsecuritygroup2AD84172": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farssm-new-resources/farssm-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -925,10 +925,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farssmnewresourcesECRDKRsecuritygroupC6E70ADA": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farssm-new-resources/farssm-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1073,7 +1073,7 @@ } ], "Cpu": "256", - "Family": "newresourcestestconstructtaskdefE4616A0D", + "Family": "farssmnewresourcestestconstructtaskdef38E6FA0E", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.farssm-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.farssm-new-resources.ts 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.farstp-new-resources.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.farstp-new-resources.expected.json index b220c2404..896457618 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.farstp-new-resources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farstp-new-resources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farstp-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farstp-new-resources/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farstp-new-resources/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet1" + "Value": "farstp-new-resources/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farstp-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farstp-new-resources/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farstp-new-resources/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet2" + "Value": "farstp-new-resources/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farstp-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farstp-new-resources/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farstp-new-resources/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PublicSubnet3" + "Value": "farstp-new-resources/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farstp-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet1" + "Value": "farstp-new-resources/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farstp-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet2" + "Value": "farstp-new-resources/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farstp-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/PrivateSubnet3" + "Value": "farstp-new-resources/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc" + "Value": "farstp-new-resources/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farstp-new-resources/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farstp-new-resources/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-resources/Vpc/FlowLog" + "Value": "farstp-new-resources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRAPIsecuritygroupE52BAE3F", + "farstpnewresourcesECRAPIsecuritygroup378EBA64", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesECRDKRsecuritygroupBA34F94F", + "farstpnewresourcesECRDKRsecuritygroup6175912D", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newresourcesSTEPFUNCTIONSsecuritygroupFB5E4F76", + "farstpnewresourcesSTEPFUNCTIONSsecuritygroup05F71CC8", "GroupId" ] } @@ -801,10 +801,10 @@ } } }, - "newresourcesECRAPIsecuritygroupE52BAE3F": { + "farstpnewresourcesECRAPIsecuritygroup378EBA64": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_API-security-group", + "GroupDescription": "farstp-new-resources/farstp-new-resources-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -859,10 +859,10 @@ } } }, - "newresourcesECRDKRsecuritygroupBA34F94F": { + "farstpnewresourcesECRDKRsecuritygroup6175912D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-ECR_DKR-security-group", + "GroupDescription": "farstp-new-resources/farstp-new-resources-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -986,7 +986,7 @@ } ], "Cpu": "256", - "Family": "newresourcestesttaskdef75720C83", + "Family": "farstpnewresourcestesttaskdefAC23A4B2", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1089,7 +1089,7 @@ "Fn::Join": [ "", [ - "/aws/vendedlogs/states/constructs/new-resourcestest-constructStateMachineLog-", + "/aws/vendedlogs/states/constructs/farstp-new-resourcestest-constructStateMachineLog-", { "Fn::Select": [ 2, @@ -1302,10 +1302,10 @@ "Threshold": 1 } }, - "newresourcesSTEPFUNCTIONSsecuritygroupFB5E4F76": { + "farstpnewresourcesSTEPFUNCTIONSsecuritygroup05F71CC8": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-resources/new-resources-STEP_FUNCTIONS-security-group", + "GroupDescription": "farstp-new-resources/farstp-new-resources-STEP_FUNCTIONS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.farstp-new-resources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.farstp-new-resources.ts 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.farstp-no-cloudwatch-alarms.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json rename to source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.farstp-no-cloudwatch-alarms.expected.json index 2d6f8627b..86cfc4810 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.farstp-no-cloudwatch-alarms.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc" + "Value": "farstp-no-cloudwatch-alarms/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet1" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet1" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet1" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet1" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet2" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet2" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet2" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet2" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet3" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet3" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet3" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PublicSubnet3" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet1" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet1" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet2" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet2" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet3" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/PrivateSubnet3" + "Value": "farstp-no-cloudwatch-alarms/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc" + "Value": "farstp-no-cloudwatch-alarms/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/FlowLog" + "Value": "farstp-no-cloudwatch-alarms/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/FlowLog" + "Value": "farstp-no-cloudwatch-alarms/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-cloudwatch-alarms/Vpc/FlowLog" + "Value": "farstp-no-cloudwatch-alarms/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "nocloudwatchalarmsECRAPIsecuritygroupA72029F8", + "farstpnocloudwatchalarmsECRAPIsecuritygroup82DA60D3", "GroupId" ] } @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "nocloudwatchalarmsECRDKRsecuritygroup11863825", + "farstpnocloudwatchalarmsECRDKRsecuritygroup230C35AF", "GroupId" ] } @@ -778,7 +778,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "nocloudwatchalarmsSTEPFUNCTIONSsecuritygroupE67433DC", + "farstpnocloudwatchalarmsSTEPFUNCTIONSsecuritygroup08C40421", "GroupId" ] } @@ -801,10 +801,10 @@ } } }, - "nocloudwatchalarmsECRAPIsecuritygroupA72029F8": { + "farstpnocloudwatchalarmsECRAPIsecuritygroup82DA60D3": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "no-cloudwatch-alarms/no-cloudwatch-alarms-ECR_API-security-group", + "GroupDescription": "farstp-no-cloudwatch-alarms/farstp-no-cloudwatch-alarms-ECR_API-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -859,10 +859,10 @@ } } }, - "nocloudwatchalarmsECRDKRsecuritygroup11863825": { + "farstpnocloudwatchalarmsECRDKRsecuritygroup230C35AF": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "no-cloudwatch-alarms/no-cloudwatch-alarms-ECR_DKR-security-group", + "GroupDescription": "farstp-no-cloudwatch-alarms/farstp-no-cloudwatch-alarms-ECR_DKR-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -986,7 +986,7 @@ } ], "Cpu": "256", - "Family": "nocloudwatchalarmstesttaskdef18D90B7C", + "Family": "farstpnocloudwatchalarmstesttaskdef4B93DE32", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -1219,10 +1219,10 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "nocloudwatchalarmsSTEPFUNCTIONSsecuritygroupE67433DC": { + "farstpnocloudwatchalarmsSTEPFUNCTIONSsecuritygroup08C40421": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "no-cloudwatch-alarms/no-cloudwatch-alarms-STEP_FUNCTIONS-security-group", + "GroupDescription": "farstp-no-cloudwatch-alarms/farstp-no-cloudwatch-alarms-STEP_FUNCTIONS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.farstp-no-cloudwatch-alarms.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.ts rename to source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.farstp-no-cloudwatch-alarms.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-customLoggingBucket.expected.json similarity index 77% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-customLoggingBucket.expected.json index f141a4769..6be801e71 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-customLoggingBucket.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testiotkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucket03F0BA8E", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testiotkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucket03F0BA8E", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "testiotkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketAutoDeleteObjectsCustomResourceF627CC0C": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testiotkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucket03F0BA8E" + } + }, + "DependsOn": [ + "testiotkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketPolicyCCE58825" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testiotkinesisfirehoses3KinesisFirehoseToS3S3BucketAEE2D91B": { "Type": "AWS::S3::Bucket", "Properties": { @@ -341,7 +405,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosecustomLoggingBuckoses3KinesisFirehoseToS356855CD4", + "DeliveryStreamName": "KinesisFirehoseiotfhss3customLogoses3KinesisFirehoseToS3841E0830", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -463,6 +527,82 @@ "Sql": "SELECT * FROM 'connectedcar/telemetry/#'" } } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testiotkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucket03F0BA8E" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-customLoggingBucket.ts similarity index 88% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-customLoggingBucket.ts index 7fac7082a..8d1d2754e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-customLoggingBucket.ts @@ -15,7 +15,7 @@ import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; import { IotToKinesisFirehoseToS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); @@ -36,9 +36,12 @@ new IotToKinesisFirehoseToS3(stack, 'test-iot-kinesisfirehose-s3', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: BucketEncryption.S3_MANAGED, versioned: true } }); + +suppressAutoDeleteHandlerWarnings(stack); app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-no-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-no-arguments.expected.json index b1b5c1364..394bd18c2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-no-arguments.expected.json @@ -341,7 +341,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenoargumentstestiooses3KinesisFirehoseToS300C2E381", + "DeliveryStreamName": "KinesisFirehoseiotfhss3noargumenoses3KinesisFirehoseToS31B695E75", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-no-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.noLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-noLoggingBucket.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.noLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-noLoggingBucket.expected.json index b326c655f..93b903875 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.noLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-noLoggingBucket.expected.json @@ -227,7 +227,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenoLoggingBucketteoses3KinesisFirehoseToS3D5D4755A", + "DeliveryStreamName": "KinesisFirehoseiotfhss3noLoggingoses3KinesisFirehoseToS3C179A840", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.noLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-noLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.noLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.iotfhss3-noLoggingBucket.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.existing-kinesisstream.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-existing-kinesisstream.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.existing-kinesisstream.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-existing-kinesisstream.expected.json index 2486dfc92..0951a2607 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.existing-kinesisstream.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-existing-kinesisstream.expected.json @@ -83,9 +83,9 @@ "testiotkinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmD446A9D0": { "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, @@ -96,9 +96,9 @@ "testiotkinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm45349C37": { "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-iot-kinesisstreams/test/integ.existing-kinesisstream.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-existing-kinesisstream.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.existing-kinesisstream.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-existing-kinesisstream.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.new-kinesisstream.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-new-kinesisstream.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.new-kinesisstream.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-new-kinesisstream.expected.json index c2e180e81..f7d69c29d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.new-kinesisstream.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-new-kinesisstream.expected.json @@ -83,9 +83,9 @@ "testiotkinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmD446A9D0": { "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, @@ -96,9 +96,9 @@ "testiotkinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm45349C37": { "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-iot-kinesisstreams/test/integ.new-kinesisstream.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-new-kinesisstream.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.new-kinesisstream.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-new-kinesisstream.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-no-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-no-arguments.expected.json index cecdc54ec..d0c8687a9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-no-arguments.expected.json @@ -83,9 +83,9 @@ "testiotkinesisstreamsKinesisStreamGetRecordsIteratorAgeAlarmD446A9D0": { "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, @@ -96,9 +96,9 @@ "testiotkinesisstreamsKinesisStreamReadProvisionedThroughputExceededAlarm45349C37": { "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-iot-kinesisstreams/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.iotkin-no-arguments.ts 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.iotlamddb-iot-lambda-dynamodb.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iotlamddb-iot-lambda-dynamodb.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iotlamddb-iot-lambda-dynamodb.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iotlamddb-iot-lambda-dynamodb.ts 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.iotlamddb-with-vpc.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iotlamddb-with-vpc.expected.json index 5b46748dc..e862fd194 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.iotlamddb-with-vpc.expected.json @@ -131,7 +131,7 @@ "testiotlambdadynamodbstackLambdaToDynamoDBReplaceDefaultSecurityGroupsecuritygroup7D851D3B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "with-vpc/test-iot-lambda-dynamodb-stack/LambdaToDynamoDB/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/LambdaToDynamoDB/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -294,7 +294,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc" } ] } @@ -316,7 +316,7 @@ }, { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet1" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -330,7 +330,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet1" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet2" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet2" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -416,7 +416,7 @@ }, { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet3" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -430,7 +430,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet3" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -467,7 +467,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" + "Value": "iotlamddb-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/FlowLog" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" } ] }, @@ -556,7 +556,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" + "Value": "iotlamddb-with-vpc/test-iot-lambda-dynamodb-stack/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iotlamddb-with-vpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.with-vpc.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iotlamddb-with-vpc.ts 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.iotlam-iot-lambda-new-func.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iotlam-iot-lambda-new-func.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iotlam-iot-lambda-new-func.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iotlam-iot-lambda-new-func.ts 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.iotlam-iot-lambda-use-existing-func.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iotlam-iot-lambda-use-existing-func.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iotlam-iot-lambda-use-existing-func.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iotlam-iot-lambda-use-existing-func.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-defaultprops.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-defaultprops.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-defaultprops.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-defaultprops.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-defaultprops.ts b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-defaultprops.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-defaultprops.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-defaultprops.ts 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.iots3-iot-s3-existing-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-existing-bucket.expected.json index 423e55a0f..5b981057c 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.iots3-iot-s3-existing-bucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -142,7 +143,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-existing-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-existing-bucket.ts 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.iots3-iot-s3-new-encrypted-bucket.expected.json similarity index 73% rename from source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-new-encrypted-bucket.expected.json index c447bea63..6613131c2 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.iots3-iot-s3-new-encrypted-bucket.expected.json @@ -54,6 +54,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -113,6 +119,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testiots3integrationS3LoggingBucket606446CC", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testiots3integrationS3LoggingBucket606446CC", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -154,6 +199,25 @@ } } }, + "testiots3integrationS3LoggingBucketAutoDeleteObjectsCustomResource98F8BDFE": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testiots3integrationS3LoggingBucket606446CC" + } + }, + "DependsOn": [ + "testiots3integrationS3LoggingBucketPolicy2DB45D12" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testiots3integrationS3Bucket9B8B180C": { "Type": "AWS::S3::Bucket", "Properties": { @@ -371,6 +435,82 @@ "Sql": "SELECT * FROM 'solutions/constructs'" } } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testiots3integrationS3LoggingBucket606446CC" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-new-encrypted-bucket.ts similarity index 89% rename from source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-new-encrypted-bucket.ts index 97cb13dfa..1147ee0ba 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-new-encrypted-bucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iots3-iot-s3-new-encrypted-bucket.ts @@ -15,7 +15,7 @@ import { App, RemovalPolicy, Stack } from "aws-cdk-lib"; import * as kms from 'aws-cdk-lib/aws-kms'; import { IotToS3, IotToS3Props } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; const app = new App(); @@ -41,10 +41,12 @@ const props: IotToS3Props = { }, loggingBucketProps: { encryption: BucketEncryption.KMS_MANAGED, + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY } }; new IotToS3(stack, 'test-iot-s3-integration', props); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.custom-max-receive-count.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-custom-max-receive-count.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.custom-max-receive-count.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-custom-max-receive-count.expected.json index 2b7d9b0de..ffd86de4a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.custom-max-receive-count.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-custom-max-receive-count.expected.json @@ -84,6 +84,7 @@ "testiotsqsstackEncryptionKeyAB09201B": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -137,8 +138,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.custom-max-receive-count.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-custom-max-receive-count.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.custom-max-receive-count.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-custom-max-receive-count.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.dead-letter-queue-off.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-dead-letter-queue-off.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.dead-letter-queue-off.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-dead-letter-queue-off.expected.json index c4721aa34..601118de3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.dead-letter-queue-off.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-dead-letter-queue-off.expected.json @@ -4,6 +4,7 @@ "testiotsqsstackEncryptionKeyAB09201B": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -57,8 +58,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.dead-letter-queue-off.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-dead-letter-queue-off.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.dead-letter-queue-off.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-dead-letter-queue-off.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.default-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-default-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.default-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-default-arguments.expected.json index dbd77e6aa..85ce627f5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.default-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-default-arguments.expected.json @@ -83,6 +83,7 @@ "testiotsqsstackEncryptionKeyAB09201B": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -136,8 +137,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.default-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-default-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.default-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-default-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.existing-queue.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-existing-queue.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.existing-queue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-existing-queue.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.existing-queue.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-existing-queue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.existing-queue.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-existing-queue.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-kms-key-props.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-kms-key-props.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-kms-key-props.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-kms-key-props.expected.json index e50357dbf..44a66441b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-kms-key-props.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-kms-key-props.expected.json @@ -83,6 +83,7 @@ "testiotsqsstackEncryptionKeyAB09201B": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -136,8 +137,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-kms-key-props.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-kms-key-props.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-kms-key-props.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-kms-key-props.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-queue-props.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-queue-props.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-queue-props.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-queue-props.expected.json index d05377618..ad2a1ba1a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-queue-props.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-queue-props.expected.json @@ -84,6 +84,7 @@ "testiotsqsstackEncryptionKeyAB09201B": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -137,8 +138,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-queue-props.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-queue-props.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.use-queue-props.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-use-queue-props.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.with-existing-key.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-with-existing-key.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.with-existing-key.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-with-existing-key.expected.json index 0c20c7a16..59a6f0a87 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.with-existing-key.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-with-existing-key.expected.json @@ -4,6 +4,7 @@ "existingkey205DFC01": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -57,8 +58,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.with-existing-key.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-with-existing-key.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.with-existing-key.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-with-existing-key.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.without-create-kms-key.expected.json b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-without-create-kms-key.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.without-create-kms-key.expected.json rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-without-create-kms-key.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.without-create-kms-key.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-without-create-kms-key.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.without-create-kms-key.ts rename to source/patterns/@aws-solutions-constructs/aws-iot-sqs/test/integ.iotsqs-without-create-kms-key.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.eslintignore b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.eslintignore deleted file mode 100644 index 0819e2e65..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.eslintignore +++ /dev/null @@ -1,5 +0,0 @@ -lib/*.js -test/*.js -*.d.ts -coverage -test/lambda/index.js \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.gitignore b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.gitignore deleted file mode 100644 index 6773cabd2..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -lib/*.js -test/*.js -*.js.map -*.d.ts -node_modules -*.generated.ts -dist -.jsii - -.LAST_BUILD -.nyc_output -coverage -.nycrc -.LAST_PACKAGE -*.snk \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.npmignore b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.npmignore deleted file mode 100644 index f66791629..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/.npmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Exclude typescript source and config -*.ts -tsconfig.json -coverage -.nyc_output -*.tgz -*.snk -*.tsbuildinfo - -# Include javascript files and typescript declarations -!*.js -!*.d.ts - -# Exclude jsii outdir -dist - -# Include .jsii -!.jsii - -# Include .jsii -!.jsii \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/README.md b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/README.md deleted file mode 100755 index ffce80da8..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/README.md +++ /dev/null @@ -1,205 +0,0 @@ -# aws-kinesisfirehose-s3-and-kinesisanalytics module - - ---- - -![Stability: Experimental](https://img.shields.io/badge/stability-Experimental-important.svg?style=for-the-badge) - -> All classes are under active development and subject to non-backward compatible changes or removal in any -> future version. These are not subject to the [Semantic Versioning](https://semver.org/) model. -> This means that while you may use them, you may need to update your source code when upgrading to a newer version of this package. - ---- - - -| **Reference Documentation**:| https://docs.aws.amazon.com/solutions/latest/constructs/| -|:-------------|:-------------| -
- -| **Language** | **Package** | -|:-------------|-----------------| -|![Python Logo](https://docs.aws.amazon.com/cdk/api/latest/img/python32.png) Python|`aws_solutions_constructs.aws_kinesisfirehose_s3_and_kinesisanalytics`| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics`| -|![Java Logo](https://docs.aws.amazon.com/cdk/api/latest/img/java32.png) Java|`software.amazon.awsconstructs.services.kinesisfirehoses3kinesisanalytics`| - -## Overview -This AWS Solutions Construct implements an Amazon Kinesis Firehose delivery stream connected to an Amazon S3 bucket, and an Amazon Kinesis Analytics application. - -Here is a minimal deployable pattern definition: - -Typescript -``` typescript -import { Construct } from 'constructs'; -import { Stack, StackProps } from 'aws-cdk-lib'; -import { KinesisFirehoseToAnalyticsAndS3 } from '@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics'; - -new KinesisFirehoseToAnalyticsAndS3(this, 'FirehoseToS3AndAnalyticsPattern', { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ticker_symbol', - sqlType: 'VARCHAR(4)', - mapping: '$.ticker_symbol' - }, { - name: 'sector', - sqlType: 'VARCHAR(16)', - mapping: '$.sector' - }, { - name: 'change', - sqlType: 'REAL', - mapping: '$.change' - }, { - name: 'price', - sqlType: 'REAL', - mapping: '$.price' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - } -}); -``` - -Python -```python -from aws_solutions_constructs.aws_kinesis_firehose_s3_kinesis_analytics import KinesisFirehoseToAnalyticsAndS3 -from aws_cdk import ( - aws_kinesisanalytics as kinesisanalytics, - Stack -) -from constructs import Construct - -KinesisFirehoseToAnalyticsAndS3(self, 'FirehoseToS3AndAnalyticsPattern', - kinesis_analytics_props=kinesisanalytics.CfnApplicationProps( - inputs=[kinesisanalytics.CfnApplication.InputProperty( - input_schema=kinesisanalytics.CfnApplication.InputSchemaProperty( - record_columns=[kinesisanalytics.CfnApplication.RecordColumnProperty( - name='ticker_symbol', - sql_type='VARCHAR(4)', - mapping='$.ticker_symbol' - ), kinesisanalytics.CfnApplication.RecordColumnProperty( - name='sector', - sql_type='VARCHAR(16)', - mapping='$.sector' - ), kinesisanalytics.CfnApplication.RecordColumnProperty( - name='change', - sql_type='REAL', - mapping='$.change' - ), kinesisanalytics.CfnApplication.RecordColumnProperty( - name='price', - sql_type='REAL', - mapping='$.price' - )], - record_format=kinesisanalytics.CfnApplication.RecordFormatProperty( - record_format_type='JSON' - ), - record_encoding='UTF-8' - ), - name_prefix='SOURCE_SQL_STREAM' - )] - ) - ) -``` - -Java -``` java -import software.constructs.Construct; -import java.util.List; - -import software.amazon.awscdk.Stack; -import software.amazon.awscdk.StackProps; -import software.amazon.awscdk.services.kinesisanalytics.*; -import software.amazon.awscdk.services.kinesisanalytics.CfnApplication.*; -import software.amazon.awsconstructs.services.kinesisfirehoses3kinesisanalytics.*; - -new KinesisFirehoseToAnalyticsAndS3(this, "FirehoseToS3AndAnalyticsPattern", - new KinesisFirehoseToAnalyticsAndS3Props.Builder() - .kinesisAnalyticsProps(new CfnApplicationProps.Builder() - .inputs(List.of(new InputProperty.Builder() - .inputSchema(new InputSchemaProperty.Builder() - .recordColumns(List.of( - new RecordColumnProperty.Builder() - .name("ticker_symbol") - .sqlType("VARCHAR(4)") - .mapping("$.ticker_symbol") - .build(), - new RecordColumnProperty.Builder() - .name("sector") - .sqlType("VARCHAR(16)") - .mapping("$.sector") - .build(), - new RecordColumnProperty.Builder() - .name("change") - .sqlType("REAL") - .mapping("$.change") - .build(), - new RecordColumnProperty.Builder() - .name("price") - .sqlType("REAL") - .mapping("$.price") - .build())) - .recordFormat(new RecordFormatProperty.Builder() - .recordFormatType("JSON") - .build()) - .recordEncoding("UTF-8") - .build()) - .namePrefix("SOURCE_SQL_STREAM") - .build())) - .build()) - .build()); -``` - -## Pattern Construct Props - -| **Name** | **Type** | **Description** | -|:-------------|:----------------|-----------------| -|kinesisFirehoseProps?|[`kinesisFirehose.CfnDeliveryStreamProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_kinesisfirehose.CfnDeliveryStreamProps.html)|Optional user-provided props to override the default props for the Kinesis Firehose delivery stream.| -|kinesisAnalyticsProps?|[`kinesisAnalytics.CfnApplicationProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_kinesisanalytics.CfnApplicationProps.html)|Optional user-provided props to override the default props for the Kinesis Analytics application.| -|existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Existing instance of S3 Bucket object. If this is provided, then also providing bucketProps is an error. | -|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|User provided props to override the default props for the S3 Bucket.| -|logGroupProps?|[`logs.LogGroupProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_logs.LogGroupProps.html)|User provided props to override the default props for for the CloudWatchLogs LogGroup.| -|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.| -|logS3AccessLogs?| boolean|Whether to turn on Access Logging for the S3 bucket. Creates an S3 bucket with associated storage costs for the logs. Enabling Access Logging is a best practice. default - true| - -## Pattern Properties - -| **Name** | **Type** | **Description** | -|:-------------|:----------------|-----------------| -|kinesisAnalytics|[`kinesisAnalytics.CfnApplication`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_kinesisanalytics.CfnApplication.html)|Returns an instance of the Kinesis Analytics application created by the pattern.| -|kinesisFirehose|[`kinesisFirehose.CfnDeliveryStream`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_kinesisfirehose.CfnDeliveryStream.html)|Returns an instance of the Kinesis Firehose delivery stream created by the pattern.| -|kinesisFirehoseRole|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_iam.Role.html)|Returns an instance of the iam.Role created by the construct for Kinesis Data Firehose delivery stream.| -|kinesisFirehoseLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for Kinesis Data Firehose delivery stream| -|s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of the S3 bucket created by the pattern.| -|s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.| -|s3BucketInterface|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.IBucket.html)|Returns an instance of s3.IBucket created by the construct.| - -## Default settings - -Out of the box implementation of the Construct without any override will set the following defaults: - -### Amazon Kinesis Firehose -* Enable CloudWatch logging for Kinesis Firehose -* Configure least privilege access IAM role for Amazon Kinesis Firehose - -### Amazon S3 Bucket -* Configure Access logging for S3 Bucket -* Enable server-side encryption for S3 Bucket using AWS managed KMS Key -* Enforce encryption of data in transit -* Turn on the versioning for S3 Bucket -* Don't allow public access for S3 Bucket -* Retain the S3 Bucket when deleting the CloudFormation stack -* Applies Lifecycle rule to move noncurrent object versions to Glacier storage after 90 days - -### Amazon Kinesis Data Analytics -* Configure least privilege access IAM role for Amazon Kinesis Analytics - -## Architecture -![Architecture Diagram](architecture.png) - -*** -© Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/architecture.png b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/architecture.png deleted file mode 100644 index 9f9e472d8..000000000 Binary files a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/architecture.png and /dev/null differ diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts deleted file mode 100644 index 7c144a724..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts +++ /dev/null @@ -1,127 +0,0 @@ -/** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance - * with the License. A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions - * and limitations under the License. - */ - -// Imports -import * as kinesisFirehose from 'aws-cdk-lib/aws-kinesisfirehose'; -import * as kinesisAnalytics from 'aws-cdk-lib/aws-kinesisanalytics'; -import { KinesisFirehoseToS3, KinesisFirehoseToS3Props } from '@aws-solutions-constructs/aws-kinesisfirehose-s3'; -import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as logs from 'aws-cdk-lib/aws-logs'; -import * as iam from 'aws-cdk-lib/aws-iam'; -import * as defaults from '@aws-solutions-constructs/core'; -// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate -import { Construct } from 'constructs'; - -/** - * The properties for the KinesisFirehoseToAnalyticsAndS3 class. - */ -export interface KinesisFirehoseToAnalyticsAndS3Props { - /** - * Optional user-provided props to override the default props for the Kinesis Firehose delivery stream. - * - * @default - Default props are used. - */ - readonly kinesisFirehoseProps?: kinesisFirehose.CfnDeliveryStreamProps | any, - /** - * Optional user-provided props to override the default props for the Kinesis Analytics application. - * - * @default - Default props are used. - */ - readonly kinesisAnalyticsProps?: kinesisAnalytics.CfnApplicationProps, - /** - * Existing instance of S3 Bucket object, providing both this and `bucketProps` will cause an error. - * - * @default - None - */ - readonly existingBucketObj?: s3.IBucket, - /** - * User provided props to override the default props for the S3 Bucket. - * - * @default - Default props are used - */ - readonly bucketProps?: s3.BucketProps, - /** - * User provided props to override the default props for the CloudWatchLogs LogGroup. - * - * @default - Default props are used - */ - readonly logGroupProps?: logs.LogGroupProps - /** - * Optional user provided props to override the default props for the S3 Logging Bucket. - * - * @default - Default props are used - */ - readonly loggingBucketProps?: s3.BucketProps; - /** - * Whether to turn on Access Logs for the S3 bucket with the associated storage costs. - * Enabling Access Logging is a best practice. - * - * @default - true - */ - readonly logS3AccessLogs?: boolean; -} - -/** - * @summary The KinesisFirehoseToAnalyticsAndS3 class. - */ -export class KinesisFirehoseToAnalyticsAndS3 extends Construct { - public readonly kinesisAnalytics: kinesisAnalytics.CfnApplication; - public readonly kinesisFirehose: kinesisFirehose.CfnDeliveryStream; - public readonly kinesisFirehoseRole: iam.Role; - public readonly kinesisFirehoseLogGroup: logs.LogGroup; - public readonly s3Bucket?: s3.Bucket; - public readonly s3LoggingBucket?: s3.Bucket; - public readonly s3BucketInterface: s3.IBucket; - - /** - * @summary Constructs a new instance of the KinesisFirehoseToAnalyticsAndS3 class. - * @param {cdk.App} scope - represents the scope for all the resources. - * @param {string} id - this is a a scope-unique id. - * @param {KinesisFirehoseToAnalyticsAndS3Props} props - user provided props for the construct - * @since 0.8.0 - * @access public - */ - constructor(scope: Construct, id: string, props: KinesisFirehoseToAnalyticsAndS3Props) { - super(scope, id); - - // All our tests are based upon this behavior being on, so we're setting - // context here rather than assuming the client will set it - this.node.setContext("@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy", true); - - // Setup the kinesisfirehose-s3 pattern - const kinesisFirehoseToS3Props: KinesisFirehoseToS3Props = { - kinesisFirehoseProps: props.kinesisFirehoseProps, - existingBucketObj: props.existingBucketObj, - bucketProps: props.bucketProps, - logGroupProps: props.logGroupProps, - loggingBucketProps: props.loggingBucketProps, - logS3AccessLogs: props.logS3AccessLogs - }; - - // Add the kinesisfirehose-s3 pattern - const kfs = new KinesisFirehoseToS3(this, 'KinesisFirehoseToS3', kinesisFirehoseToS3Props); - - // Add the Kinesis Analytics application - this.kinesisAnalytics = defaults.buildKinesisAnalyticsApp(this, { - kinesisFirehose: kfs.kinesisFirehose, - kinesisAnalyticsProps: props.kinesisAnalyticsProps - }); - - this.kinesisFirehose = kfs.kinesisFirehose; - this.kinesisFirehoseLogGroup = kfs.kinesisFirehoseLogGroup; - this.kinesisFirehoseRole = kfs.kinesisFirehoseRole; - this.s3Bucket = kfs.s3Bucket; - this.s3LoggingBucket = kfs.s3LoggingBucket; - this.s3BucketInterface = kfs.s3BucketInterface; - } -} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json deleted file mode 100644 index 21cde97d4..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics", - "version": "0.0.0", - "description": "CDK constructs for defining an interaction between an Amazon Kinesis Data Firehose delivery stream and (1) an Amazon S3 bucket, and (2) an Amazon Kinesis Data Analytics application.", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "repository": { - "type": "git", - "url": "https://github.com/awslabs/aws-solutions-constructs.git", - "directory": "source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics" - }, - "author": { - "name": "Amazon Web Services", - "url": "https://aws.amazon.com", - "organization": true - }, - "license": "Apache-2.0", - "scripts": { - "build": "tsc -b .", - "lint": "eslint -c ../eslintrc.yml --ext=.js,.ts . && tslint --project .", - "lint-fix": "eslint -c ../eslintrc.yml --ext=.js,.ts --fix .", - "test": "jest --coverage", - "clean": "tsc -b --clean", - "watch": "tsc -b -w", - "integ": "cdk-integ", - "integ-assert": "cdk-integ-assert-v2", - "integ-no-clean": "cdk-integ --no-clean", - "jsii": "jsii", - "jsii-pacmak": "jsii-pacmak", - "build+lint+test": "npm run jsii && npm run lint && npm test && npm run integ-assert", - "snapshot-update": "npm run jsii && npm test -- -u && npm run integ-assert" - }, - "jsii": { - "outdir": "dist", - "targets": { - "java": { - "package": "software.amazon.awsconstructs.services.kinesisfirehoses3kinesisanalytics", - "maven": { - "groupId": "software.amazon.awsconstructs", - "artifactId": "kinesisfirehoses3kinesisanalytics" - } - }, - "dotnet": { - "namespace": "Amazon.SolutionsConstructs.AWS.KinesisFirehoseS3KinesisAnalytics", - "packageId": "Amazon.SolutionsConstructs.AWS.KinesisFirehoseS3KinesisAnalytics", - "signAssembly": true, - "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png" - }, - "python": { - "distName": "aws-solutions-constructs.aws-kinesis-firehose-s3-kinesis-analytics", - "module": "aws_solutions_constructs.aws_kinesis_firehose_s3_kinesis_analytics" - } - } - }, - "dependencies": { - "@aws-cdk/aws-iam": "0.0.0", - "@aws-cdk/aws-kinesis": "0.0.0", - "@aws-cdk/aws-kinesisanalytics": "0.0.0", - "@aws-cdk/aws-kinesisfirehose": "0.0.0", - "@aws-cdk/aws-s3": "0.0.0", - "@aws-cdk/aws-logs": "0.0.0", - "@aws-cdk/core": "0.0.0", - "@aws-solutions-constructs/core": "0.0.0", - "@aws-solutions-constructs/aws-kinesisfirehose-s3": "0.0.0", - "constructs": "^3.2.0" - }, - "devDependencies": { - "@types/jest": "^27.4.0", - "@types/node": "^10.3.0" - }, - "jest": { - "moduleFileExtensions": [ - "js" - ], - "coverageReporters": [ - "text", - [ - "lcov", - { - "projectRoot": "../../../../" - } - ] - ] - }, - "peerDependencies": { - "@aws-cdk/aws-iam": "0.0.0", - "@aws-cdk/aws-kinesis": "0.0.0", - "@aws-cdk/aws-kinesisanalytics": "0.0.0", - "@aws-cdk/aws-kinesisfirehose": "0.0.0", - "@aws-cdk/aws-s3": "0.0.0", - "@aws-cdk/core": "0.0.0", - "@aws-solutions-constructs/core": "0.0.0", - "@aws-solutions-constructs/aws-kinesisfirehose-s3": "0.0.0", - "constructs": "^3.2.0", - "@aws-cdk/aws-logs": "0.0.0" - }, - "keywords": [ - "aws", - "cdk", - "awscdk", - "AWS Solutions Constructs", - "Amazon S3", - "Amazon Kinesis Data Firehose", - "Amazon Kinesis Data Analytics" - ] -} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.customLoggingBucket.expected.json deleted file mode 100644 index c57d17329..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.customLoggingBucket.expected.json +++ /dev/null @@ -1,535 +0,0 @@ -{ - "Resources": { - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketE14ECC0A": { - "Type": "AWS::S3::Bucket", - "Properties": { - "BucketEncryption": { - "ServerSideEncryptionConfiguration": [ - { - "ServerSideEncryptionByDefault": { - "SSEAlgorithm": "AES256" - } - } - ] - }, - "BucketName": "custom-logging-bucket", - "PublicAccessBlockConfiguration": { - "BlockPublicAcls": true, - "BlockPublicPolicy": true, - "IgnorePublicAcls": true, - "RestrictPublicBuckets": true - }, - "VersioningConfiguration": { - "Status": "Enabled" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete", - "Metadata": { - "cfn_nag": { - "rules_to_suppress": [ - { - "id": "W35", - "reason": "This S3 bucket is used as the access logging bucket for another bucket" - } - ] - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketPolicy7DF00567": { - "Type": "AWS::S3::BucketPolicy", - "Properties": { - "Bucket": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketE14ECC0A" - }, - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketE14ECC0A", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketE14ECC0A", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - }, - { - "Action": "s3:PutObject", - "Condition": { - "ArnLike": { - "aws:SourceArn": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - } - }, - "StringEquals": { - "aws:SourceAccount": { - "Ref": "AWS::AccountId" - } - } - }, - "Effect": "Allow", - "Principal": { - "Service": "logging.s3.amazonaws.com" - }, - "Resource": { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketE14ECC0A", - "Arn" - ] - }, - "/*" - ] - ] - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56": { - "Type": "AWS::S3::Bucket", - "Properties": { - "BucketEncryption": { - "ServerSideEncryptionConfiguration": [ - { - "ServerSideEncryptionByDefault": { - "SSEAlgorithm": "AES256" - } - } - ] - }, - "LifecycleConfiguration": { - "Rules": [ - { - "NoncurrentVersionTransitions": [ - { - "StorageClass": "GLACIER", - "TransitionInDays": 90 - } - ], - "Status": "Enabled" - } - ] - }, - "LoggingConfiguration": { - "DestinationBucketName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3LoggingBucketE14ECC0A" - } - }, - "PublicAccessBlockConfiguration": { - "BlockPublicAcls": true, - "BlockPublicPolicy": true, - "IgnorePublicAcls": true, - "RestrictPublicBuckets": true - }, - "VersioningConfiguration": { - "Status": "Enabled" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketPolicy55E9C081": { - "Type": "AWS::S3::BucketPolicy", - "Properties": { - "Bucket": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56" - }, - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F": { - "Type": "AWS::Logs::LogGroup", - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain", - "Metadata": { - "cfn_nag": { - "rules_to_suppress": [ - { - "id": "W86", - "reason": "Retention period for CloudWatchLogs LogGroups are set to 'Never Expire' to preserve customer data indefinitely" - }, - { - "id": "W84", - "reason": "By default CloudWatchLogs LogGroups data is encrypted using the CloudWatch server-side encryption keys (AWS Managed Keys)" - } - ] - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupfirehoselogstream508B1DD2": { - "Type": "AWS::Logs::LogStream", - "Properties": { - "LogGroupName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F" - } - }, - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain" - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehoseRoleD36244BC": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "firehose.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehosePolicy9CE17DCF": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "s3:AbortMultipartUpload", - "s3:GetBucketLocation", - "s3:GetObject", - "s3:ListBucket", - "s3:ListBucketMultipartUploads", - "s3:PutObject" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - }, - { - "Action": "logs:PutLogEvents", - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":logs:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":log-group:", - { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F" - }, - ":log-stream:", - { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupfirehoselogstream508B1DD2" - } - ] - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehosePolicy9CE17DCF", - "Roles": [ - { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehoseRoleD36244BC" - } - ] - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehose9D683007": { - "Type": "AWS::KinesisFirehose::DeliveryStream", - "Properties": { - "DeliveryStreamEncryptionConfigurationInput": { - "KeyType": "AWS_OWNED_CMK" - }, - "DeliveryStreamName": "KinesisFirehosecustomLoggingBuckicss3KinesisFirehoseToS3E91CB2F9", - "ExtendedS3DestinationConfiguration": { - "BucketARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - "BufferingHints": { - "IntervalInSeconds": 300, - "SizeInMBs": 5 - }, - "CloudWatchLoggingOptions": { - "Enabled": true, - "LogGroupName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F" - }, - "LogStreamName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupfirehoselogstream508B1DD2" - } - }, - "CompressionFormat": "GZIP", - "EncryptionConfiguration": { - "KMSEncryptionConfig": { - "AWSKMSKeyARN": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":kms:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":alias/aws/s3" - ] - ] - } - } - }, - "RoleARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehoseRoleD36244BC", - "Arn" - ] - } - } - } - }, - "testkinesisfirehoseanalyticss3KinesisAnalyticsRoleB66D81BD": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "kinesisanalytics.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisAnalyticsPolicy9CAEA1BF": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "firehose:DescribeDeliveryStream", - "firehose:Get*" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehose9D683007", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "testkinesisfirehoseanalyticss3KinesisAnalyticsPolicy9CAEA1BF", - "Roles": [ - { - "Ref": "testkinesisfirehoseanalyticss3KinesisAnalyticsRoleB66D81BD" - } - ] - } - }, - "testkinesisfirehoseanalyticss3KinesisAnalytics0C0663D4": { - "Type": "AWS::KinesisAnalytics::Application", - "Properties": { - "Inputs": [ - { - "InputSchema": { - "RecordColumns": [ - { - "Mapping": "$.ticker_symbol", - "Name": "ticker_symbol", - "SqlType": "VARCHAR(4)" - }, - { - "Mapping": "$.sector", - "Name": "sector", - "SqlType": "VARCHAR(16)" - }, - { - "Mapping": "$.change", - "Name": "change", - "SqlType": "REAL" - }, - { - "Mapping": "$.price", - "Name": "price", - "SqlType": "REAL" - } - ], - "RecordEncoding": "UTF-8", - "RecordFormat": { - "RecordFormatType": "JSON" - } - }, - "KinesisFirehoseInput": { - "ResourceARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehose9D683007", - "Arn" - ] - }, - "RoleARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisAnalyticsRoleB66D81BD", - "Arn" - ] - } - }, - "NamePrefix": "SOURCE_SQL_STREAM" - } - ] - }, - "DependsOn": [ - "testkinesisfirehoseanalyticss3KinesisAnalyticsPolicy9CAEA1BF" - ] - } - }, - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.customLoggingBucket.ts deleted file mode 100644 index 1256be540..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.customLoggingBucket.ts +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance - * with the License. A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions - * and limitations under the License. - */ - -/// !cdk-integ * -import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; -import { BucketEncryption } from "aws-cdk-lib/aws-s3"; -import { KinesisFirehoseToAnalyticsAndS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; - -const app = new App(); - -// Empty arguments -const stack = new Stack(app, generateIntegStackName(__filename)); - -new KinesisFirehoseToAnalyticsAndS3(stack, 'test-kinesisfirehose-analytics-s3', { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ticker_symbol', - sqlType: 'VARCHAR(4)', - mapping: '$.ticker_symbol' - }, { - name: 'sector', - sqlType: 'VARCHAR(16)', - mapping: '$.sector' - }, { - name: 'change', - sqlType: 'REAL', - mapping: '$.change' - }, { - name: 'price', - sqlType: 'REAL', - mapping: '$.price' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - }, - bucketProps: { - removalPolicy: RemovalPolicy.DESTROY, - }, - loggingBucketProps: { - removalPolicy: RemovalPolicy.DESTROY, - bucketName: 'custom-logging-bucket', - encryption: BucketEncryption.S3_MANAGED, - versioned: true - } -}); - -app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.expected.json deleted file mode 100644 index b7f3ed208..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.expected.json +++ /dev/null @@ -1,534 +0,0 @@ -{ - "Resources": { - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucket887A5000": { - "Type": "AWS::S3::Bucket", - "Properties": { - "BucketEncryption": { - "ServerSideEncryptionConfiguration": [ - { - "ServerSideEncryptionByDefault": { - "SSEAlgorithm": "AES256" - } - } - ] - }, - "PublicAccessBlockConfiguration": { - "BlockPublicAcls": true, - "BlockPublicPolicy": true, - "IgnorePublicAcls": true, - "RestrictPublicBuckets": true - }, - "VersioningConfiguration": { - "Status": "Enabled" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete", - "Metadata": { - "cfn_nag": { - "rules_to_suppress": [ - { - "id": "W35", - "reason": "This S3 bucket is used as the access logging bucket for another bucket" - } - ] - } - } - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucketPolicy2D8B2B71": { - "Type": "AWS::S3::BucketPolicy", - "Properties": { - "Bucket": { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucket887A5000" - }, - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucket887A5000", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucket887A5000", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - }, - { - "Action": "s3:PutObject", - "Condition": { - "ArnLike": { - "aws:SourceArn": { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354", - "Arn" - ] - } - }, - "StringEquals": { - "aws:SourceAccount": { - "Ref": "AWS::AccountId" - } - } - }, - "Effect": "Allow", - "Principal": { - "Service": "logging.s3.amazonaws.com" - }, - "Resource": { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucket887A5000", - "Arn" - ] - }, - "/*" - ] - ] - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354": { - "Type": "AWS::S3::Bucket", - "Properties": { - "BucketEncryption": { - "ServerSideEncryptionConfiguration": [ - { - "ServerSideEncryptionByDefault": { - "SSEAlgorithm": "AES256" - } - } - ] - }, - "LifecycleConfiguration": { - "Rules": [ - { - "NoncurrentVersionTransitions": [ - { - "StorageClass": "GLACIER", - "TransitionInDays": 90 - } - ], - "Status": "Enabled" - } - ] - }, - "LoggingConfiguration": { - "DestinationBucketName": { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3LoggingBucket887A5000" - } - }, - "PublicAccessBlockConfiguration": { - "BlockPublicAcls": true, - "BlockPublicPolicy": true, - "IgnorePublicAcls": true, - "RestrictPublicBuckets": true - }, - "VersioningConfiguration": { - "Status": "Enabled" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketPolicyAD03F319": { - "Type": "AWS::S3::BucketPolicy", - "Properties": { - "Bucket": { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354" - }, - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - } - ], - "Version": "2012-10-17" - } - } - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroup7E569B76": { - "Type": "AWS::Logs::LogGroup", - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain", - "Metadata": { - "cfn_nag": { - "rules_to_suppress": [ - { - "id": "W86", - "reason": "Retention period for CloudWatchLogs LogGroups are set to 'Never Expire' to preserve customer data indefinitely" - }, - { - "id": "W84", - "reason": "By default CloudWatchLogs LogGroups data is encrypted using the CloudWatch server-side encryption keys (AWS Managed Keys)" - } - ] - } - } - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroupfirehoselogstream98C70102": { - "Type": "AWS::Logs::LogStream", - "Properties": { - "LogGroupName": { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroup7E569B76" - } - }, - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain" - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehoseRoleE7F8ADDA": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "firehose.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehosePolicy8E134001": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "s3:AbortMultipartUpload", - "s3:GetBucketLocation", - "s3:GetObject", - "s3:ListBucket", - "s3:ListBucketMultipartUploads", - "s3:PutObject" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - }, - { - "Action": "logs:PutLogEvents", - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":logs:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":log-group:", - { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroup7E569B76" - }, - ":log-stream:", - { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroupfirehoselogstream98C70102" - } - ] - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehosePolicy8E134001", - "Roles": [ - { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehoseRoleE7F8ADDA" - } - ] - } - }, - "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehose86F339C4": { - "Type": "AWS::KinesisFirehose::DeliveryStream", - "Properties": { - "DeliveryStreamEncryptionConfigurationInput": { - "KeyType": "AWS_OWNED_CMK" - }, - "DeliveryStreamName": "KinesisFirehosenoargumentstestfistackKinesisFirehoseToS38B072B5E", - "ExtendedS3DestinationConfiguration": { - "BucketARN": { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3S3BucketAE659354", - "Arn" - ] - }, - "BufferingHints": { - "IntervalInSeconds": 300, - "SizeInMBs": 5 - }, - "CloudWatchLoggingOptions": { - "Enabled": true, - "LogGroupName": { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroup7E569B76" - }, - "LogStreamName": { - "Ref": "testfirehoses3andanalyticsstackKinesisFirehoseToS3firehoseloggroupfirehoselogstream98C70102" - } - }, - "CompressionFormat": "GZIP", - "EncryptionConfiguration": { - "KMSEncryptionConfig": { - "AWSKMSKeyARN": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":kms:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":alias/aws/s3" - ] - ] - } - } - }, - "RoleARN": { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehoseRoleE7F8ADDA", - "Arn" - ] - } - } - } - }, - "testfirehoses3andanalyticsstackKinesisAnalyticsRole7217C4CC": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "kinesisanalytics.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testfirehoses3andanalyticsstackKinesisAnalyticsPolicy2594304F": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "firehose:DescribeDeliveryStream", - "firehose:Get*" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehose86F339C4", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "testfirehoses3andanalyticsstackKinesisAnalyticsPolicy2594304F", - "Roles": [ - { - "Ref": "testfirehoses3andanalyticsstackKinesisAnalyticsRole7217C4CC" - } - ] - } - }, - "testfirehoses3andanalyticsstackKinesisAnalytics20F3845E": { - "Type": "AWS::KinesisAnalytics::Application", - "Properties": { - "Inputs": [ - { - "InputSchema": { - "RecordColumns": [ - { - "Mapping": "$.ticker_symbol", - "Name": "ticker_symbol", - "SqlType": "VARCHAR(4)" - }, - { - "Mapping": "$.sector", - "Name": "sector", - "SqlType": "VARCHAR(16)" - }, - { - "Mapping": "$.change", - "Name": "change", - "SqlType": "REAL" - }, - { - "Mapping": "$.price", - "Name": "price", - "SqlType": "REAL" - } - ], - "RecordEncoding": "UTF-8", - "RecordFormat": { - "RecordFormatType": "JSON" - } - }, - "KinesisFirehoseInput": { - "ResourceARN": { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisFirehoseToS3KinesisFirehose86F339C4", - "Arn" - ] - }, - "RoleARN": { - "Fn::GetAtt": [ - "testfirehoses3andanalyticsstackKinesisAnalyticsRole7217C4CC", - "Arn" - ] - } - }, - "NamePrefix": "SOURCE_SQL_STREAM" - } - ] - }, - "DependsOn": [ - "testfirehoses3andanalyticsstackKinesisAnalyticsPolicy2594304F" - ] - } - }, - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts deleted file mode 100644 index e1d327d7d..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance - * with the License. A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions - * and limitations under the License. - */ - -// Imports -import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; -import { KinesisFirehoseToAnalyticsAndS3, KinesisFirehoseToAnalyticsAndS3Props } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; - -// Setup -const app = new App(); -const stack = new Stack(app, generateIntegStackName(__filename)); - -// Definitions -const props: KinesisFirehoseToAnalyticsAndS3Props = { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ticker_symbol', - sqlType: 'VARCHAR(4)', - mapping: '$.ticker_symbol' - }, { - name: 'sector', - sqlType: 'VARCHAR(16)', - mapping: '$.sector' - }, { - name: 'change', - sqlType: 'REAL', - mapping: '$.change' - }, { - name: 'price', - sqlType: 'REAL', - mapping: '$.price' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - }, - bucketProps: { - removalPolicy: RemovalPolicy.DESTROY, - } -}; - -new KinesisFirehoseToAnalyticsAndS3(stack, 'test-firehose-s3-and-analytics-stack', props); - -// Synth -app.synth(); diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.noLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.noLoggingBucket.expected.json deleted file mode 100644 index ad316b46d..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.noLoggingBucket.expected.json +++ /dev/null @@ -1,421 +0,0 @@ -{ - "Resources": { - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56": { - "Type": "AWS::S3::Bucket", - "Properties": { - "BucketEncryption": { - "ServerSideEncryptionConfiguration": [ - { - "ServerSideEncryptionByDefault": { - "SSEAlgorithm": "AES256" - } - } - ] - }, - "LifecycleConfiguration": { - "Rules": [ - { - "NoncurrentVersionTransitions": [ - { - "StorageClass": "GLACIER", - "TransitionInDays": 90 - } - ], - "Status": "Enabled" - } - ] - }, - "PublicAccessBlockConfiguration": { - "BlockPublicAcls": true, - "BlockPublicPolicy": true, - "IgnorePublicAcls": true, - "RestrictPublicBuckets": true - }, - "VersioningConfiguration": { - "Status": "Enabled" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete", - "Metadata": { - "cfn_nag": { - "rules_to_suppress": [ - { - "id": "W35", - "reason": "This S3 bucket is created for unit/ integration testing purposes only." - } - ] - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketPolicy55E9C081": { - "Type": "AWS::S3::BucketPolicy", - "Properties": { - "Bucket": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56" - }, - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F": { - "Type": "AWS::Logs::LogGroup", - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain", - "Metadata": { - "cfn_nag": { - "rules_to_suppress": [ - { - "id": "W86", - "reason": "Retention period for CloudWatchLogs LogGroups are set to 'Never Expire' to preserve customer data indefinitely" - }, - { - "id": "W84", - "reason": "By default CloudWatchLogs LogGroups data is encrypted using the CloudWatch server-side encryption keys (AWS Managed Keys)" - } - ] - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupfirehoselogstream508B1DD2": { - "Type": "AWS::Logs::LogStream", - "Properties": { - "LogGroupName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F" - } - }, - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain" - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehoseRoleD36244BC": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "firehose.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehosePolicy9CE17DCF": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "s3:AbortMultipartUpload", - "s3:GetBucketLocation", - "s3:GetObject", - "s3:ListBucket", - "s3:ListBucketMultipartUploads", - "s3:PutObject" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - }, - { - "Action": "logs:PutLogEvents", - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":logs:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":log-group:", - { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F" - }, - ":log-stream:", - { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupfirehoselogstream508B1DD2" - } - ] - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehosePolicy9CE17DCF", - "Roles": [ - { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehoseRoleD36244BC" - } - ] - } - }, - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehose9D683007": { - "Type": "AWS::KinesisFirehose::DeliveryStream", - "Properties": { - "DeliveryStreamEncryptionConfigurationInput": { - "KeyType": "AWS_OWNED_CMK" - }, - "DeliveryStreamName": "KinesisFirehosenoLoggingBucketteicss3KinesisFirehoseToS3EAC1AA77", - "ExtendedS3DestinationConfiguration": { - "BucketARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3S3BucketA83D2E56", - "Arn" - ] - }, - "BufferingHints": { - "IntervalInSeconds": 300, - "SizeInMBs": 5 - }, - "CloudWatchLoggingOptions": { - "Enabled": true, - "LogGroupName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupA3650D3F" - }, - "LogStreamName": { - "Ref": "testkinesisfirehoseanalyticss3KinesisFirehoseToS3firehoseloggroupfirehoselogstream508B1DD2" - } - }, - "CompressionFormat": "GZIP", - "EncryptionConfiguration": { - "KMSEncryptionConfig": { - "AWSKMSKeyARN": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":kms:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":alias/aws/s3" - ] - ] - } - } - }, - "RoleARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehoseRoleD36244BC", - "Arn" - ] - } - } - } - }, - "testkinesisfirehoseanalyticss3KinesisAnalyticsRoleB66D81BD": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "kinesisanalytics.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "testkinesisfirehoseanalyticss3KinesisAnalyticsPolicy9CAEA1BF": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "firehose:DescribeDeliveryStream", - "firehose:Get*" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehose9D683007", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "testkinesisfirehoseanalyticss3KinesisAnalyticsPolicy9CAEA1BF", - "Roles": [ - { - "Ref": "testkinesisfirehoseanalyticss3KinesisAnalyticsRoleB66D81BD" - } - ] - } - }, - "testkinesisfirehoseanalyticss3KinesisAnalytics0C0663D4": { - "Type": "AWS::KinesisAnalytics::Application", - "Properties": { - "Inputs": [ - { - "InputSchema": { - "RecordColumns": [ - { - "Mapping": "$.ticker_symbol", - "Name": "ticker_symbol", - "SqlType": "VARCHAR(4)" - }, - { - "Mapping": "$.sector", - "Name": "sector", - "SqlType": "VARCHAR(16)" - }, - { - "Mapping": "$.change", - "Name": "change", - "SqlType": "REAL" - }, - { - "Mapping": "$.price", - "Name": "price", - "SqlType": "REAL" - } - ], - "RecordEncoding": "UTF-8", - "RecordFormat": { - "RecordFormatType": "JSON" - } - }, - "KinesisFirehoseInput": { - "ResourceARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisFirehoseToS3KinesisFirehose9D683007", - "Arn" - ] - }, - "RoleARN": { - "Fn::GetAtt": [ - "testkinesisfirehoseanalyticss3KinesisAnalyticsRoleB66D81BD", - "Arn" - ] - } - }, - "NamePrefix": "SOURCE_SQL_STREAM" - } - ] - }, - "DependsOn": [ - "testkinesisfirehoseanalyticss3KinesisAnalyticsPolicy9CAEA1BF" - ] - } - }, - "Parameters": { - "BootstrapVersion": { - "Type": "AWS::SSM::Parameter::Value", - "Default": "/cdk-bootstrap/hnb659fds/version", - "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" - } - }, - "Rules": { - "CheckBootstrapVersion": { - "Assertions": [ - { - "Assert": { - "Fn::Not": [ - { - "Fn::Contains": [ - [ - "1", - "2", - "3", - "4", - "5" - ], - { - "Ref": "BootstrapVersion" - } - ] - } - ] - }, - "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." - } - ] - } - } -} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.noLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.noLoggingBucket.ts deleted file mode 100644 index 143883d58..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.noLoggingBucket.ts +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance - * with the License. A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions - * and limitations under the License. - */ - -/// !cdk-integ * -import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; -import { KinesisFirehoseToAnalyticsAndS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; -import * as s3 from "aws-cdk-lib/aws-s3"; -import * as defaults from '@aws-solutions-constructs/core'; - -const app = new App(); - -// Empty arguments -const stack = new Stack(app, generateIntegStackName(__filename)); - -const construct = new KinesisFirehoseToAnalyticsAndS3(stack, 'test-kinesisfirehose-analytics-s3', { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ticker_symbol', - sqlType: 'VARCHAR(4)', - mapping: '$.ticker_symbol' - }, { - name: 'sector', - sqlType: 'VARCHAR(16)', - mapping: '$.sector' - }, { - name: 'change', - sqlType: 'REAL', - mapping: '$.change' - }, { - name: 'price', - sqlType: 'REAL', - mapping: '$.price' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - }, - bucketProps: { - removalPolicy: RemovalPolicy.DESTROY, - }, - logS3AccessLogs: false -}); - -const s3Bucket = construct.s3Bucket as s3.Bucket; - -defaults.addCfnSuppressRules(s3Bucket, [ - { id: 'W35', - reason: 'This S3 bucket is created for unit/ integration testing purposes only.' }, -]); - -app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/kinesisfirehose-s3-and-kinesisanalytics.test.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/kinesisfirehose-s3-and-kinesisanalytics.test.ts deleted file mode 100644 index 89adcdd84..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/kinesisfirehose-s3-and-kinesisanalytics.test.ts +++ /dev/null @@ -1,215 +0,0 @@ -/** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance - * with the License. A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions - * and limitations under the License. - */ - -// Imports -import { Stack, RemovalPolicy } from 'aws-cdk-lib'; -import * as s3 from 'aws-cdk-lib/aws-s3'; -import { KinesisFirehoseToAnalyticsAndS3, KinesisFirehoseToAnalyticsAndS3Props } from '../lib'; -import { Template } from 'aws-cdk-lib/assertions'; - -// -------------------------------------------------------------- -// Test Case 2 - Test the getter methods -// -------------------------------------------------------------- -test('Test properties', () => { - // Initial Setup - const stack = new Stack(); - const props: KinesisFirehoseToAnalyticsAndS3Props = { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ts', - sqlType: 'TIMESTAMP', - mapping: '$.timestamp' - }, { - name: 'trip_id', - sqlType: 'VARCHAR(64)', - mapping: '$.trip_id' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - } - }; - const app = new KinesisFirehoseToAnalyticsAndS3(stack, 'test-kinesis-firehose-kinesis-analytics', props); - // Assertions - expect(app.kinesisAnalytics).toBeDefined(); - expect(app.kinesisFirehose).toBeDefined(); - expect(app.kinesisFirehoseRole).toBeDefined(); - expect(app.kinesisFirehoseLogGroup).toBeDefined(); - expect(app.s3Bucket).toBeDefined(); - expect(app.s3LoggingBucket).toBeDefined(); -}); - -// -------------------------------------------------------------- -// Test Case 3 - Override kinesisFirehose props -// -------------------------------------------------------------- -test('test kinesisFirehose override ', () => { - const stack = new Stack(); - - new KinesisFirehoseToAnalyticsAndS3(stack, 'test-firehose-s3', { - kinesisFirehoseProps: { - extendedS3DestinationConfiguration: { - bufferingHints: { - intervalInSeconds: 600, - sizeInMBs: 55 - }, - } - }, - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ts', - sqlType: 'TIMESTAMP', - mapping: '$.timestamp' - }, { - name: 'trip_id', - sqlType: 'VARCHAR(64)', - mapping: '$.trip_id' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - } - }); - - const template = Template.fromStack(stack); - template.hasResourceProperties("AWS::KinesisFirehose::DeliveryStream", { - ExtendedS3DestinationConfiguration: { - BufferingHints: { - IntervalInSeconds: 600, - SizeInMBs: 55 - } - } - }); -}); - -// -------------------------------------------------------------- -// Test bad call with existingBucket and bucketProps -// -------------------------------------------------------------- -test("Confirm CheckS3Props is being called", () => { - // Stack - const stack = new Stack(); - - const testBucket = new s3.Bucket(stack, 'test-bucket', {}); - - const app = () => { - // Helper declaration - new KinesisFirehoseToAnalyticsAndS3(stack, "bad-s3-args", { - existingBucketObj: testBucket, - bucketProps: { - removalPolicy: RemovalPolicy.DESTROY - }, - }); - }; - // Assertion - expect(app).toThrowError("Error - Either provide bucketProps or existingBucketObj, but not both.\n"); -}); - -// -------------------------------------------------------------- -// s3 bucket with bucket, loggingBucket, and auto delete objects -// -------------------------------------------------------------- -test('s3 bucket with bucket, loggingBucket, and auto delete objects', () => { - const stack = new Stack(); - - new KinesisFirehoseToAnalyticsAndS3(stack, 'kinsisfirehose-s3-analytics', { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ts', - sqlType: 'TIMESTAMP', - mapping: '$.timestamp' - }, { - name: 'trip_id', - sqlType: 'VARCHAR(64)', - mapping: '$.trip_id' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - }, - loggingBucketProps: { - removalPolicy: RemovalPolicy.DESTROY, - autoDeleteObjects: true - } - }); - - const template = Template.fromStack(stack); - template.resourceCountIs("AWS::S3::Bucket", 2); - - template.hasResourceProperties("Custom::S3AutoDeleteObjects", { - ServiceToken: { - "Fn::GetAtt": [ - "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", - "Arn" - ] - }, - BucketName: { - Ref: "kinsisfirehoses3analyticsKinesisFirehoseToS3S3LoggingBucket6EE455EF" - } - }); -}); - -// -------------------------------------------------------------- -// s3 bucket with one content bucket and no logging bucket -// -------------------------------------------------------------- -test('s3 bucket with one content bucket and no logging bucket', () => { - const stack = new Stack(); - - new KinesisFirehoseToAnalyticsAndS3(stack, 'kinsisfirehose-s3-analytics', { - kinesisAnalyticsProps: { - inputs: [{ - inputSchema: { - recordColumns: [{ - name: 'ts', - sqlType: 'TIMESTAMP', - mapping: '$.timestamp' - }, { - name: 'trip_id', - sqlType: 'VARCHAR(64)', - mapping: '$.trip_id' - }], - recordFormat: { - recordFormatType: 'JSON' - }, - recordEncoding: 'UTF-8' - }, - namePrefix: 'SOURCE_SQL_STREAM' - }] - }, - kinesisFirehoseProps: { - deliveryStreamType: 'KinesisStreamAsSource' - }, - bucketProps: { - removalPolicy: RemovalPolicy.DESTROY, - }, - logS3AccessLogs: false - }); - - const template = Template.fromStack(stack); - template.resourceCountIs("AWS::S3::Bucket", 1); -}); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/lambda/index.js b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/lambda/index.js deleted file mode 100644 index 5844e65a2..000000000 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/lambda/index.js +++ /dev/null @@ -1,8 +0,0 @@ -exports.handler = async function(event) { - console.log('request:', JSON.stringify(event, undefined, 2)); - return { - statusCode: 200, - headers: { 'Content-Type': 'text/plain' }, - body: `//stub//` - }; - }; \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-customLoggingBucket.expected.json similarity index 75% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-customLoggingBucket.expected.json index 8863865ec..bf9cb8c7f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-customLoggingBucket.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testkinesisfirehoses3S3LoggingBucketDD0F9F56", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testkinesisfirehoses3S3LoggingBucketDD0F9F56", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "testkinesisfirehoses3S3LoggingBucketAutoDeleteObjectsCustomResource043732C2": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testkinesisfirehoses3S3LoggingBucketDD0F9F56" + } + }, + "DependsOn": [ + "testkinesisfirehoses3S3LoggingBucketPolicyE1990698" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testkinesisfirehoses3S3BucketA8942735": { "Type": "AWS::S3::Bucket", "Properties": { @@ -341,7 +405,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosecustomLoggingBuckettestkinesisfirehoses3BC7D2654", + "DeliveryStreamName": "KinesisFirehosefhss3customLogginkettestkinesisfirehoses3C47A3354", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -395,6 +459,82 @@ } } } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testkinesisfirehoses3S3LoggingBucketDD0F9F56" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-customLoggingBucket.ts similarity index 86% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-customLoggingBucket.ts index a3faa198a..1457e1ae7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-customLoggingBucket.ts @@ -15,7 +15,7 @@ import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; import { KinesisFirehoseToS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); @@ -28,9 +28,11 @@ new KinesisFirehoseToS3(stack, 'test-kinesisfirehose-s3', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: BucketEncryption.S3_MANAGED, versioned: true } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-no-arguments.expected.json similarity index 67% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-no-arguments.expected.json index f321ef9d2..fd1419390 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-no-arguments.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testfirehoses3S3LoggingBucket31BFDC22", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testfirehoses3S3LoggingBucket31BFDC22", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "testfirehoses3S3LoggingBucketAutoDeleteObjectsCustomResource98E2B981": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testfirehoses3S3LoggingBucket31BFDC22" + } + }, + "DependsOn": [ + "testfirehoses3S3LoggingBucketPolicyA41D0380" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testfirehoses3S3Bucket93480488": { "Type": "AWS::S3::Bucket", "Properties": { @@ -155,6 +219,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -203,12 +273,70 @@ ] } ] + }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testfirehoses3S3Bucket93480488", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testfirehoses3S3Bucket93480488", + "Arn" + ] + }, + "/*" + ] + ] + } + ] } ], "Version": "2012-10-17" } } }, + "testfirehoses3S3BucketAutoDeleteObjectsCustomResourceC06077EE": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testfirehoses3S3Bucket93480488" + } + }, + "DependsOn": [ + "testfirehoses3S3BucketPolicyF01906C0" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testfirehoses3firehoseloggroup8067C3EC": { "Type": "AWS::Logs::LogGroup", "UpdateReplacePolicy": "Retain", @@ -341,7 +469,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenoargumentstestfirehoses3B5E26CE6", + "DeliveryStreamName": "KinesisFirehosefhss3noargumentstestfirehoses3E5198CCB", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -395,6 +523,82 @@ } } } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testfirehoses3S3LoggingBucket31BFDC22" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-no-arguments.ts similarity index 80% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-no-arguments.ts index 379c01c8d..835266eb9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-no-arguments.ts @@ -14,7 +14,7 @@ // Imports import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { KinesisFirehoseToS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; // Setup const app = new App(); @@ -23,12 +23,15 @@ stack.templateOptions.description = 'Integration Test for aws-cdk-apl-kinesisfir new KinesisFirehoseToS3(stack, 'test-firehose-s3', { bucketProps: { + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY, }, loggingBucketProps: { - removalPolicy: RemovalPolicy.DESTROY + removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, } }); +suppressAutoDeleteHandlerWarnings(stack); // Synth app.synth(); diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.noLoggingBucket.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-noLoggingBucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.noLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-noLoggingBucket.expected.json index 37bdeb95e..7a7b81af7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.noLoggingBucket.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-noLoggingBucket.expected.json @@ -227,7 +227,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenoLoggingBuckettestkinesisfirehoses35D36368E", + "DeliveryStreamName": "KinesisFirehosefhss3noLoggingBuckettestkinesisfirehoses33B5B3D4F", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.noLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-noLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.noLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-noLoggingBucket.ts 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.fhss3-pre-existing-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-pre-existing-bucket.expected.json index ffb38796f..541e92ccb 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.fhss3-pre-existing-bucket.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -333,7 +334,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosepreexistingbuckets3preexistingbucketstack85DF91B4", + "DeliveryStreamName": "KinesisFirehosefhss3preexistingbs3preexistingbucketstackBC2A3EB1", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::Join": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-pre-existing-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-pre-existing-bucket.ts 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.fhss3-pre-existing-logging-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-pre-existing-logging-bucket.expected.json index cd3ca176d..9bf4ae7dd 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.fhss3-pre-existing-logging-bucket.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -179,7 +180,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -319,6 +320,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -511,7 +513,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosepreexistinglogginistingloggingbucketstack932A73CD", + "DeliveryStreamName": "KinesisFirehosefhss3preexistinglistingloggingbucketstackE08C8853", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-pre-existing-logging-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-logging-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-pre-existing-logging-bucket.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.two-instances.expected.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-two-instances.expected.json similarity index 74% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.two-instances.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-two-instances.expected.json index 16ee3aed5..e417e124b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.two-instances.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-two-instances.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "firstconstructS3LoggingBucket7A5DAF91", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "firstconstructS3LoggingBucket7A5DAF91", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "firstconstructS3LoggingBucketAutoDeleteObjectsCustomResourceF1551A63": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "firstconstructS3LoggingBucket7A5DAF91" + } + }, + "DependsOn": [ + "firstconstructS3LoggingBucketPolicy14219998" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "firstconstructS3Bucket58522C24": { "Type": "AWS::S3::Bucket", "Properties": { @@ -341,7 +405,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosetwoinstancesfirstconstructC62A83C0", + "DeliveryStreamName": "KinesisFirehosefhss3twoinstancesfirstconstructDCFDB833", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -396,6 +460,82 @@ } } }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "firstconstructS3LoggingBucket7A5DAF91" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } + }, "secondconstructS3LoggingBucketBB57C475": { "Type": "AWS::S3::Bucket", "Properties": { @@ -414,6 +554,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -473,6 +619,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "secondconstructS3LoggingBucketBB57C475", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "secondconstructS3LoggingBucketBB57C475", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -514,6 +699,25 @@ } } }, + "secondconstructS3LoggingBucketAutoDeleteObjectsCustomResource11E44F47": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "secondconstructS3LoggingBucketBB57C475" + } + }, + "DependsOn": [ + "secondconstructS3LoggingBucketPolicy88BAA4BE" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "secondconstructS3Bucket6D7D46A0": { "Type": "AWS::S3::Bucket", "Properties": { @@ -550,6 +754,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -598,12 +808,70 @@ ] } ] + }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "secondconstructS3Bucket6D7D46A0", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "secondconstructS3Bucket6D7D46A0", + "Arn" + ] + }, + "/*" + ] + ] + } + ] } ], "Version": "2012-10-17" } } }, + "secondconstructS3BucketAutoDeleteObjectsCustomResource02D988EB": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "secondconstructS3Bucket6D7D46A0" + } + }, + "DependsOn": [ + "secondconstructS3BucketPolicy4B404A49" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "secondconstructfirehoseloggroupB59EDD4C": { "Type": "AWS::Logs::LogGroup", "UpdateReplacePolicy": "Retain", @@ -736,7 +1004,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosetwoinstancessecondconstruct96E71AB7", + "DeliveryStreamName": "KinesisFirehosefhss3twoinstancessecondconstructB86AFB63", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.two-instances.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-two-instances.ts similarity index 84% rename from source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.two-instances.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-two-instances.ts index 0f32b7ea7..a2b99fefb 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.two-instances.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.fhss3-two-instances.ts @@ -14,7 +14,7 @@ // Imports import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { KinesisFirehoseToS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; // Setup const app = new App(); @@ -26,18 +26,22 @@ new KinesisFirehoseToS3(stack, 'first-construct', { removalPolicy: RemovalPolicy.DESTROY, }, loggingBucketProps: { + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY } }); new KinesisFirehoseToS3(stack, 'second-construct', { bucketProps: { + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY, }, loggingBucketProps: { + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY } }); +suppressAutoDeleteHandlerWarnings(stack); // Synth app.synth(); 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.kinglu-code-asset-job.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-code-asset-job.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-code-asset-job.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-code-asset-job.ts 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.kinglu-existing-job.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-existing-job.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-existing-job.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-existing-job.ts 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.kinglu-no-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-no-arguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.kinglu-no-arguments.ts 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.kinfhss3-customLoggingBucket.expected.json similarity index 78% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-customLoggingBucket.expected.json index 5f138e5ae..483facbd8 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.kinfhss3-customLoggingBucket.expected.json @@ -30,6 +30,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -89,6 +95,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -130,6 +175,25 @@ } } }, + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketAutoDeleteObjectsCustomResourceB808B0FC": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C" + } + }, + "DependsOn": [ + "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketPolicyCF0D71BD" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testkinesisfirehoses3KinesisFirehoseToS3S3Bucket303877FF": { "Type": "AWS::S3::Bucket", "Properties": { @@ -349,7 +413,7 @@ "testkinesisfirehoses3KinesisFirehoseToS3KinesisFirehoseEB65C83D": { "Type": "AWS::KinesisFirehose::DeliveryStream", "Properties": { - "DeliveryStreamName": "KinesisFirehosecustomLoggingBuckoses3KinesisFirehoseToS38ABD91BB", + "DeliveryStreamName": "KinesisFirehosekinfhss3customLogoses3KinesisFirehoseToS397A96F65", "DeliveryStreamType": "KinesisStreamAsSource", "ExtendedS3DestinationConfiguration": { "BucketARN": { @@ -486,6 +550,82 @@ } ] } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testkinesisfirehoses3KinesisFirehoseToS3S3LoggingBucketCF5B8A5C" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-customLoggingBucket.ts similarity index 87% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-customLoggingBucket.ts index 6d44b7bdc..35468edf7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-customLoggingBucket.ts @@ -15,7 +15,7 @@ import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; import { KinesisStreamsToKinesisFirehoseToS3 } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); @@ -28,6 +28,7 @@ new KinesisStreamsToKinesisFirehoseToS3(stack, 'test-kinesisfirehose-s3', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: BucketEncryption.S3_MANAGED, versioned: true @@ -36,4 +37,5 @@ new KinesisStreamsToKinesisFirehoseToS3(stack, 'test-kinesisfirehose-s3', { removalPolicy: RemovalPolicy.DESTROY } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); \ No newline at end of file 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.kinfhss3-existing-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existing-bucket.expected.json index df0c49758..7dc7b46c3 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.kinfhss3-existing-bucket.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -341,7 +342,7 @@ "testexistingbucketfirehoses3stackKinesisFirehoseToS3KinesisFirehose46614BF6": { "Type": "AWS::KinesisFirehose::DeliveryStream", "Properties": { - "DeliveryStreamName": "KinesisFirehoseexistingbuckettesstackKinesisFirehoseToS3E85D23B4", + "DeliveryStreamName": "KinesisFirehosekinfhss3existingbstackKinesisFirehoseToS3129F8DDB", "DeliveryStreamType": "KinesisStreamAsSource", "ExtendedS3DestinationConfiguration": { "BucketARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existing-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existing-bucket.ts 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.kinfhss3-existing-logging-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existing-logging-bucket.expected.json index 7a92b2333..8dca0cfcf 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.kinfhss3-existing-logging-bucket.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -420,7 +421,7 @@ "testexistingloggingbucketstreamsfirehoses3stackKinesisFirehoseToS3KinesisFirehose5F6EDEF6": { "Type": "AWS::KinesisFirehose::DeliveryStream", "Properties": { - "DeliveryStreamName": "KinesisFirehoseexistingloggingbustackKinesisFirehoseToS316B2A519", + "DeliveryStreamName": "KinesisFirehosekinfhss3existinglstackKinesisFirehoseToS35F3A1FB9", "DeliveryStreamType": "KinesisStreamAsSource", "ExtendedS3DestinationConfiguration": { "BucketARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existing-logging-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existing-logging-bucket.ts 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.kinfhss3-existingStreamObj.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existingStreamObj.expected.json index 93eda755b..3326ca21f 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.kinfhss3-existingStreamObj.expected.json @@ -193,7 +193,7 @@ } } }, - "testkinesislambdaLambdaFunctionKinesisEventSourceexistingStreamObjtestkinesislambdaKinesisStreamA54D0C79BE6AA8BC": { + "testkinesislambdaLambdaFunctionKinesisEventSourcekinfhss3existingStreamObjtestkinesislambdaKinesisStream06A6475B85130EBE": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "BatchSize": 100, @@ -551,7 +551,7 @@ "testexistingstreamfirehoses3stackKinesisFirehoseToS3KinesisFirehose0834A7FB": { "Type": "AWS::KinesisFirehose::DeliveryStream", "Properties": { - "DeliveryStreamName": "KinesisFirehoseexistingStreamObjstackKinesisFirehoseToS36519FC08", + "DeliveryStreamName": "KinesisFirehosekinfhss3existingSstackKinesisFirehoseToS3A84F50F0", "DeliveryStreamType": "KinesisStreamAsSource", "ExtendedS3DestinationConfiguration": { "BucketARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existingStreamObj.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-existingStreamObj.ts 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.kinfhss3-no-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-no-arguments.expected.json index 97ed031e5..ee1895cbd 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.kinfhss3-no-arguments.expected.json @@ -349,7 +349,7 @@ "teststreamfirehoses3KinesisFirehoseToS3KinesisFirehose7303FF77": { "Type": "AWS::KinesisFirehose::DeliveryStream", "Properties": { - "DeliveryStreamName": "KinesisFirehosenoargumentsteststoses3KinesisFirehoseToS3288D7D36", + "DeliveryStreamName": "KinesisFirehosekinfhss3noargumenoses3KinesisFirehoseToS339497FE1", "DeliveryStreamType": "KinesisStreamAsSource", "ExtendedS3DestinationConfiguration": { "BucketARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.kinfhss3-no-arguments.ts 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.kinlam-existing.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.kinlam-existing.expected.json index 674cf8651..0815a5af7 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.kinlam-existing.expected.json @@ -152,7 +152,7 @@ } } }, - "testfnKinesisEventSourceexistingteststream96164F11F0EBC1A4": { + "testfnKinesisEventSourcekinlamexistingteststream6B91D22533D472A8": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "BatchSize": 1, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.kinlam-existing.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.kinlam-existing.ts 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.kinlam-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.kinlam-no-arguments.expected.json index 3988a597e..a8739f8ac 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.kinlam-no-arguments.expected.json @@ -193,7 +193,7 @@ } } }, - "testkinesisstreamslambdaLambdaFunctionKinesisEventSourcenoargumentstestkinesisstreamslambdaKinesisStream697B4A2015E59078": { + "testkinesisstreamslambdaLambdaFunctionKinesisEventSourcekinlamnoargumentstestkinesisstreamslambdaKinesisStreamB15C5952638E81E3": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "BatchSize": 100, diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.kinlam-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.kinlam-no-arguments.ts 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.lamddb-add-secondary-index.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-add-secondary-index.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-add-secondary-index.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-add-secondary-index.ts 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.lamddb-deployFunctionWithExistingVpc.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-deployFunctionWithExistingVpc.expected.json index f0a2aa527..393dea3ca 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.lamddb-deployFunctionWithExistingVpc.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamddb-deployFunctionWithExistingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -842,7 +842,7 @@ "testlambdadynamodbstackReplaceDefaultSecurityGroupsecuritygroup15025C82": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithExistingVpc/test-lambda-dynamodb-stack/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamddb-deployFunctionWithExistingVpc/test-lambda-dynamodb-stack/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-deployFunctionWithExistingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithExistingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-deployFunctionWithExistingVpc.ts 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.lamddb-deployFunctionWithVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-deployFunctionWithVpc.expected.json index 17fcd590c..1d10739ad 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.lamddb-deployFunctionWithVpc.expected.json @@ -132,7 +132,7 @@ "testlambdadynamodbstackReplaceDefaultSecurityGroupsecuritygroup15025C82": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-dynamodb-stack/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamddb-deployFunctionWithVpc/test-lambda-dynamodb-stack/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -271,7 +271,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamddb-deployFunctionWithVpc/Vpc" } ] } @@ -293,7 +293,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamddb-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -307,7 +307,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamddb-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -343,7 +343,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamddb-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -357,7 +357,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamddb-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -393,7 +393,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamddb-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -407,7 +407,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamddb-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -444,7 +444,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamddb-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -496,7 +496,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamddb-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -533,7 +533,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamddb-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-deployFunctionWithVpc.ts 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.lamddb-no-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-no-arguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-no-arguments.ts 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.lamddb-set-billing-mode.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-set-billing-mode.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-set-billing-mode.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-set-billing-mode.ts 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.lamddb-use-existing-func.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-use-existing-func.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-use-existing-func.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.lamddb-use-existing-func.ts 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.lammem-existingResources.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-existingResources.expected.json index 4d18bbc39..677ccfe7e 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.lammem-existingResources.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc" + "Value": "lammem-existingResources/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "existingResources/Vpc/isolatedSubnet1" + "Value": "lammem-existingResources/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -47,7 +47,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc/isolatedSubnet1" + "Value": "lammem-existingResources/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -83,7 +83,7 @@ }, { "Key": "Name", - "Value": "existingResources/Vpc/isolatedSubnet2" + "Value": "lammem-existingResources/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc/isolatedSubnet2" + "Value": "lammem-existingResources/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -133,7 +133,7 @@ }, { "Key": "Name", - "Value": "existingResources/Vpc/isolatedSubnet3" + "Value": "lammem-existingResources/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -147,7 +147,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc/isolatedSubnet3" + "Value": "lammem-existingResources/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -184,7 +184,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc/FlowLog" + "Value": "lammem-existingResources/Vpc/FlowLog" } ] } @@ -236,7 +236,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc/FlowLog" + "Value": "lammem-existingResources/Vpc/FlowLog" } ] }, @@ -273,7 +273,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingResources/Vpc/FlowLog" + "Value": "lammem-existingResources/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -282,7 +282,7 @@ "testsgsecuritygroup89DCF621": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingResources/test-sg-security-group", + "GroupDescription": "lammem-existingResources/test-sg-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -468,7 +468,7 @@ "testcachecachesg7265880E": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingResources/test-cache-cachesg", + "GroupDescription": "lammem-existingResources/test-cache-cachesg", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -531,7 +531,7 @@ "testtestcachesg9F6CF9E2": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingResources/test/test-cachesg", + "GroupDescription": "lammem-existingResources/test/test-cachesg", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-existingResources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-existingResources.ts 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.lammem-newResources.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-newResources.expected.json index 6c53c8f4c..ef433e887 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.lammem-newResources.expected.json @@ -4,7 +4,7 @@ "testtestcachesg9F6CF9E2": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "newResources/test/test-cachesg", + "GroupDescription": "lammem-newResources/test/test-cachesg", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -199,7 +199,7 @@ "testReplaceDefaultSecurityGroupsecuritygroupAC4F969B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "newResources/test/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lammem-newResources/test/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -335,7 +335,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc" + "Value": "lammem-newResources/Vpc" } ] } @@ -357,7 +357,7 @@ }, { "Key": "Name", - "Value": "newResources/Vpc/isolatedSubnet1" + "Value": "lammem-newResources/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -371,7 +371,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc/isolatedSubnet1" + "Value": "lammem-newResources/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -407,7 +407,7 @@ }, { "Key": "Name", - "Value": "newResources/Vpc/isolatedSubnet2" + "Value": "lammem-newResources/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -421,7 +421,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc/isolatedSubnet2" + "Value": "lammem-newResources/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -457,7 +457,7 @@ }, { "Key": "Name", - "Value": "newResources/Vpc/isolatedSubnet3" + "Value": "lammem-newResources/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -471,7 +471,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc/isolatedSubnet3" + "Value": "lammem-newResources/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -508,7 +508,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc/FlowLog" + "Value": "lammem-newResources/Vpc/FlowLog" } ] } @@ -560,7 +560,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc/FlowLog" + "Value": "lammem-newResources/Vpc/FlowLog" } ] }, @@ -597,7 +597,7 @@ "Tags": [ { "Key": "Name", - "Value": "newResources/Vpc/FlowLog" + "Value": "lammem-newResources/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-newResources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.newResources.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-newResources.ts 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.lammem-withClientProps.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-withClientProps.expected.json index cc0020c2e..5372ad2bb 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.lammem-withClientProps.expected.json @@ -4,7 +4,7 @@ "testtestcachesg9F6CF9E2": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "withClientProps/test/test-cachesg", + "GroupDescription": "lammem-withClientProps/test/test-cachesg", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -199,7 +199,7 @@ "testReplaceDefaultSecurityGroupsecuritygroupAC4F969B": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "withClientProps/test/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lammem-withClientProps/test/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -335,7 +335,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc" + "Value": "lammem-withClientProps/Vpc" } ] } @@ -357,7 +357,7 @@ }, { "Key": "Name", - "Value": "withClientProps/Vpc/isolatedSubnet1" + "Value": "lammem-withClientProps/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -371,7 +371,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc/isolatedSubnet1" + "Value": "lammem-withClientProps/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -407,7 +407,7 @@ }, { "Key": "Name", - "Value": "withClientProps/Vpc/isolatedSubnet2" + "Value": "lammem-withClientProps/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -421,7 +421,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc/isolatedSubnet2" + "Value": "lammem-withClientProps/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -457,7 +457,7 @@ }, { "Key": "Name", - "Value": "withClientProps/Vpc/isolatedSubnet3" + "Value": "lammem-withClientProps/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -471,7 +471,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc/isolatedSubnet3" + "Value": "lammem-withClientProps/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -508,7 +508,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc/FlowLog" + "Value": "lammem-withClientProps/Vpc/FlowLog" } ] } @@ -560,7 +560,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc/FlowLog" + "Value": "lammem-withClientProps/Vpc/FlowLog" } ] }, @@ -597,7 +597,7 @@ "Tags": [ { "Key": "Name", - "Value": "withClientProps/Vpc/FlowLog" + "Value": "lammem-withClientProps/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-withClientProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.withClientProps.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.lammem-withClientProps.ts 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.lamels-deployFunctionWithClusterConfig.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithClusterConfig.expected.json index ea01e758f..bc1b69f2c 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.lamels-deployFunctionWithClusterConfig.expected.json @@ -103,7 +103,7 @@ "testlambdaelasticsearchkibana5ReplaceDefaultSecurityGroupsecuritygroup375DBE67": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithClusterConfig/test-lambda-elasticsearch-kibana5/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamels-deployFunctionWithClusterConfig/test-lambda-elasticsearch-kibana5/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -742,7 +742,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc" } ] } @@ -764,7 +764,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet1" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -778,7 +778,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet1" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -814,7 +814,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet2" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -828,7 +828,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/isolatedSubnet2" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -865,7 +865,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/FlowLog" } ] } @@ -917,7 +917,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/FlowLog" } ] }, @@ -954,7 +954,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithClusterConfig/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithClusterConfig/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithClusterConfig.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithClusterConfig.ts 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.lamels-deployFunctionWithExistingVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithExistingVpc.expected.json index 0e5f2100c..13c66593b 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.lamels-deployFunctionWithExistingVpc.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithExistingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -772,7 +772,7 @@ "testlambdaelasticsearchkibana4ReplaceDefaultSecurityGroupsecuritygroupA79E2B92": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithExistingVpc/test-lambda-elasticsearch-kibana4/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamels-deployFunctionWithExistingVpc/test-lambda-elasticsearch-kibana4/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithExistingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithExistingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithExistingVpc.ts 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.lamels-deployFunctionWithVpcProps.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithVpcProps.expected.json index ca661cffd..9d673ea62 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.lamels-deployFunctionWithVpcProps.expected.json @@ -103,7 +103,7 @@ "testlambdaelasticsearchkibana3ReplaceDefaultSecurityGroupsecuritygroupEB497E1A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpcProps/test-lambda-elasticsearch-kibana3/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamels-deployFunctionWithVpcProps/test-lambda-elasticsearch-kibana3/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -747,7 +747,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc" + "Value": "lamels-deployFunctionWithVpcProps/Vpc" } ] } @@ -769,7 +769,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet1" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -783,7 +783,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet1" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -819,7 +819,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet2" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -833,7 +833,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet2" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -869,7 +869,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet3" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -883,7 +883,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/isolatedSubnet3" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -920,7 +920,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/FlowLog" } ] } @@ -972,7 +972,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/FlowLog" } ] }, @@ -1009,7 +1009,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpcProps/Vpc/FlowLog" + "Value": "lamels-deployFunctionWithVpcProps/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithVpcProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithVpcProps.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployFunctionWithVpcProps.ts 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.lamels-deployToFiveZones.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployToFiveZones.expected.json index 17ec407e2..1c61216cc 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.lamels-deployToFiveZones.expected.json @@ -103,7 +103,7 @@ "testlambdaelasticsearchkibanaReplaceDefaultSecurityGroupsecuritygroup9C517245": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployToFiveZones/test-lambda-elasticsearch-kibana/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamels-deployToFiveZones/test-lambda-elasticsearch-kibana/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -749,7 +749,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc" + "Value": "lamels-deployToFiveZones/Vpc" } ] } @@ -771,7 +771,7 @@ }, { "Key": "Name", - "Value": "deployToFiveZones/Vpc/isolatedSubnet1" + "Value": "lamels-deployToFiveZones/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -785,7 +785,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc/isolatedSubnet1" + "Value": "lamels-deployToFiveZones/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -821,7 +821,7 @@ }, { "Key": "Name", - "Value": "deployToFiveZones/Vpc/isolatedSubnet2" + "Value": "lamels-deployToFiveZones/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -835,7 +835,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc/isolatedSubnet2" + "Value": "lamels-deployToFiveZones/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -871,7 +871,7 @@ }, { "Key": "Name", - "Value": "deployToFiveZones/Vpc/isolatedSubnet3" + "Value": "lamels-deployToFiveZones/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -885,7 +885,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc/isolatedSubnet3" + "Value": "lamels-deployToFiveZones/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -922,7 +922,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc/FlowLog" + "Value": "lamels-deployToFiveZones/Vpc/FlowLog" } ] } @@ -974,7 +974,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc/FlowLog" + "Value": "lamels-deployToFiveZones/Vpc/FlowLog" } ] }, @@ -1011,7 +1011,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployToFiveZones/Vpc/FlowLog" + "Value": "lamels-deployToFiveZones/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployToFiveZones.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployToFiveZones.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-deployToFiveZones.ts 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.lamels-disabledZoneAwareness.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-disabledZoneAwareness.expected.json index cff23b60c..2d56aedbb 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.lamels-disabledZoneAwareness.expected.json @@ -103,7 +103,7 @@ "testlambdaelasticsearchkibanaReplaceDefaultSecurityGroupsecuritygroup9C517245": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "disabledZoneAwareness/test-lambda-elasticsearch-kibana/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamels-disabledZoneAwareness/test-lambda-elasticsearch-kibana/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -732,7 +732,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc" + "Value": "lamels-disabledZoneAwareness/Vpc" } ] } @@ -754,7 +754,7 @@ }, { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc/isolatedSubnet1" + "Value": "lamels-disabledZoneAwareness/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -768,7 +768,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc/isolatedSubnet1" + "Value": "lamels-disabledZoneAwareness/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -805,7 +805,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc/FlowLog" + "Value": "lamels-disabledZoneAwareness/Vpc/FlowLog" } ] } @@ -857,7 +857,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc/FlowLog" + "Value": "lamels-disabledZoneAwareness/Vpc/FlowLog" } ] }, @@ -894,7 +894,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabledZoneAwareness/Vpc/FlowLog" + "Value": "lamels-disabledZoneAwareness/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-disabledZoneAwareness.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.disabledZoneAwareness.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-disabledZoneAwareness.ts 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.lamels-domain-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-domain-arguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-domain-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-domain-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-no-arguments.expected.json index 0bc0190a8..12fc8a8e0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-no-arguments.expected.json @@ -98,12 +98,6 @@ }, "S3Key": "35bbbc7b04b21f225891f139adf234188f348ebad5f4bbc2c06edf8aa3784c97.zip" }, - "Role": { - "Fn::GetAtt": [ - "testlambdaelasticsearchkibanaLambdaFunctionServiceRole3AFFEAA2", - "Arn" - ] - }, "Environment": { "Variables": { "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1", @@ -116,6 +110,12 @@ } }, "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "testlambdaelasticsearchkibanaLambdaFunctionServiceRole3AFFEAA2", + "Arn" + ] + }, "Runtime": "nodejs16.x", "TracingConfig": { "Mode": "Active" @@ -181,9 +181,6 @@ "testlambdaelasticsearchkibanaCognitoUserPoolClient8F70A2AA": { "Type": "AWS::Cognito::UserPoolClient", "Properties": { - "UserPoolId": { - "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" - }, "AllowedOAuthFlows": [ "implicit", "code" @@ -201,7 +198,10 @@ ], "SupportedIdentityProviders": [ "COGNITO" - ] + ], + "UserPoolId": { + "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" + } } }, "testlambdaelasticsearchkibanaCognitoIdentityPoolC48068F0": { @@ -227,7 +227,7 @@ "testlambdaelasticsearchkibanaUserPoolDomainB9BDF063": { "Type": "AWS::Cognito::UserPoolDomain", "Properties": { - "Domain": "domain-args-cogn-9e5", + "Domain": "domain-args-cogn-23e", "UserPoolId": { "Ref": "testlambdaelasticsearchkibanaCognitoUserPool9537802B" } @@ -284,7 +284,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domain-args-cogn-9e5/*" + ":domain/domain-args-cogn-23e/*" ] ] } @@ -397,7 +397,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domain-args-9e54" + ":domain/domain-args-23e2" ] ] } @@ -469,7 +469,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/domain-args-9e54/*" + ":domain/domain-args-23e2/*" ] ] } @@ -496,7 +496,7 @@ "EnforceHTTPS": true, "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07" }, - "DomainName": "domain-args-9e54", + "DomainName": "domain-args-23e2", "EBSOptions": { "EBSEnabled": true, "VolumeSize": 10 @@ -539,9 +539,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, @@ -552,9 +552,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, @@ -565,9 +565,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, @@ -578,9 +578,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, @@ -591,9 +591,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, @@ -604,9 +604,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, @@ -617,9 +617,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, @@ -630,9 +630,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, @@ -643,9 +643,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, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-no-arguments.ts similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-no-arguments.ts index 9663113ff..2a353276f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.lamels-no-arguments.ts @@ -27,8 +27,8 @@ const lambdaProps: lambda.FunctionProps = { handler: 'index.handler' }; -const esDomain = 'domain-args-9e54'; -const cognitoDomain = 'domain-args-cogn-9e5'; +const esDomain = 'domain-args-23e2'; +const cognitoDomain = 'domain-args-cogn-23e'; new LambdaToElasticSearchAndKibana(stack, 'test-lambda-elasticsearch-kibana', { lambdaFunctionProps: lambdaProps, 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.lamevt-deployFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunction.ts 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.lamevt-deployFunctionWithNewEventBus.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithNewEventBus.expected.json index e44ac5c83..939de6d5f 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.lamevt-deployFunctionWithNewEventBus.expected.json @@ -114,7 +114,7 @@ "testlambdaeventbridgeReplaceDefaultSecurityGroupsecuritygroup11BC24F6": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithNewEventBus/test-lambda-eventbridge/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamevt-deployFunctionWithNewEventBus/test-lambda-eventbridge/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -233,7 +233,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc" } ] } @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet1" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -269,7 +269,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet1" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -305,7 +305,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet2" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet2" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -355,7 +355,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet3" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -369,7 +369,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/isolatedSubnet3" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -406,7 +406,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/FlowLog" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/FlowLog" } ] } @@ -458,7 +458,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/FlowLog" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/FlowLog" } ] }, @@ -495,7 +495,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithNewEventBus/Vpc/FlowLog" + "Value": "lamevt-deployFunctionWithNewEventBus/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -508,7 +508,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroupD8A263BF", + "lamevtdeployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroup53EAC818", "GroupId" ] } @@ -542,10 +542,10 @@ } } }, - "deployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroupD8A263BF": { + "lamevtdeployFunctionWithNewEventBusCLOUDWATCHEVENTSsecuritygroup53EAC818": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithNewEventBus/deployFunctionWithNewEventBus-CLOUDWATCH_EVENTS-security-group", + "GroupDescription": "lamevt-deployFunctionWithNewEventBus/lamevt-deployFunctionWithNewEventBus-CLOUDWATCH_EVENTS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithNewEventBus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithNewEventBus.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithNewEventBus.ts 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.lamevt-deployFunctionWithVpc.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithVpc.expected.json index 916504c1e..cb9a267e9 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.lamevt-deployFunctionWithVpc.expected.json @@ -128,7 +128,7 @@ "testlambdaeventbridgeReplaceDefaultSecurityGroupsecuritygroup11BC24F6": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-eventbridge/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamevt-deployFunctionWithVpc/test-lambda-eventbridge/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -239,7 +239,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamevt-deployFunctionWithVpc/Vpc" } ] } @@ -261,7 +261,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamevt-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -275,7 +275,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamevt-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -311,7 +311,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamevt-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -325,7 +325,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamevt-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -361,7 +361,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamevt-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -375,7 +375,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamevt-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -412,7 +412,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamevt-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -464,7 +464,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamevt-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -501,7 +501,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamevt-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -514,7 +514,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupB8797C76", + "lamevtdeployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupE6014B35", "GroupId" ] } @@ -548,10 +548,10 @@ } } }, - "deployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupB8797C76": { + "lamevtdeployFunctionWithVpcCLOUDWATCHEVENTSsecuritygroupE6014B35": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/deployFunctionWithVpc-CLOUDWATCH_EVENTS-security-group", + "GroupDescription": "lamevt-deployFunctionWithVpc/lamevt-deployFunctionWithVpc-CLOUDWATCH_EVENTS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-deployFunctionWithVpc.ts 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.lamevt-existingEventBus.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingEventBus.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingEventBus.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingEventBus.ts 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.lamevt-existingFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.lamevt-existingFunction.ts 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.lamken-minimal-arguments.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-minimal-arguments.expected.json index 95121ec2e..59e2e4791 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.lamken-minimal-arguments.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-minimal-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.minimal-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-minimal-arguments.ts 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.lamken-multiple-sources.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-multiple-sources.expected.json index 3850d7547..ca73db9b8 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.lamken-multiple-sources.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-multiple-sources.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.multiple-sources.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-multiple-sources.ts 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.lamken-with-vpc.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-with-vpc.expected.json index 0bc0c7c64..0e39ea284 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.lamken-with-vpc.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -320,7 +321,7 @@ "minimalargumentsReplaceDefaultSecurityGroupsecuritygroupFDD71705": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "with-vpc/minimal-arguments/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamken-with-vpc/minimal-arguments/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -713,7 +714,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc" + "Value": "lamken-with-vpc/Vpc" } ] } @@ -735,7 +736,7 @@ }, { "Key": "Name", - "Value": "with-vpc/Vpc/isolatedSubnet1" + "Value": "lamken-with-vpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -749,7 +750,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc/isolatedSubnet1" + "Value": "lamken-with-vpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -785,7 +786,7 @@ }, { "Key": "Name", - "Value": "with-vpc/Vpc/isolatedSubnet2" + "Value": "lamken-with-vpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -799,7 +800,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc/isolatedSubnet2" + "Value": "lamken-with-vpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -835,7 +836,7 @@ }, { "Key": "Name", - "Value": "with-vpc/Vpc/isolatedSubnet3" + "Value": "lamken-with-vpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -849,7 +850,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc/isolatedSubnet3" + "Value": "lamken-with-vpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -886,7 +887,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc/FlowLog" + "Value": "lamken-with-vpc/Vpc/FlowLog" } ] } @@ -938,7 +939,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc/FlowLog" + "Value": "lamken-with-vpc/Vpc/FlowLog" } ] }, @@ -975,7 +976,7 @@ "Tags": [ { "Key": "Name", - "Value": "with-vpc/Vpc/FlowLog" + "Value": "lamken-with-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -988,7 +989,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "withvpcKENDRAsecuritygroup6E04E691", + "lamkenwithvpcKENDRAsecuritygroup1395B6D2", "GroupId" ] } @@ -1022,10 +1023,10 @@ } } }, - "withvpcKENDRAsecuritygroup6E04E691": { + "lamkenwithvpcKENDRAsecuritygroup1395B6D2": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "with-vpc/with-vpc-KENDRA-security-group", + "GroupDescription": "lamken-with-vpc/lamken-with-vpc-KENDRA-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-with-vpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.with-vpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kendra/test/integ.lamken-with-vpc.ts 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.lamfhs-existing-function.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-existing-function.expected.json index 00be5feb3..7a642190b 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.lamfhs-existing-function.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseexistingfunctiondestinationfirehoseE53928C2", + "DeliveryStreamName": "KinesisFirehoselamfhsexistingfunctiondestinationfirehose3D67ADFF", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -550,7 +552,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -670,7 +672,7 @@ }, "Environment": { "Variables": { - "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoseexistingfunctiondestinationfirehoseE53928C2" + "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoselamfhsexistingfunctiondestinationfirehose3D67ADFF" } }, "Handler": "index.handler", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-existing-function.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-existing-function.ts 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.lamfhs-existing-vpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-existing-vpc.expected.json index 624ba79bd..92d962deb 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.lamfhs-existing-vpc.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehoseexistingvpcdestinationfirehoseFCC6BBF7", + "DeliveryStreamName": "KinesisFirehoselamfhsexistingvpcdestinationfirehose623CCD9C", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -550,7 +552,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -607,7 +609,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "lamfhs-existing-vpc/Vpc" } ] } @@ -629,7 +631,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -653,7 +655,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -694,7 +696,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet1" } ] } @@ -714,7 +716,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet1" } ] }, @@ -740,7 +742,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -764,7 +766,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -805,7 +807,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet2" } ] } @@ -825,7 +827,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet2" } ] }, @@ -851,7 +853,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -875,7 +877,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -916,7 +918,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet3" } ] } @@ -936,7 +938,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamfhs-existing-vpc/Vpc/PublicSubnet3" } ] }, @@ -962,7 +964,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet1" + "Value": "lamfhs-existing-vpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -976,7 +978,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet1" + "Value": "lamfhs-existing-vpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -1024,7 +1026,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet2" + "Value": "lamfhs-existing-vpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1038,7 +1040,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet2" + "Value": "lamfhs-existing-vpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -1086,7 +1088,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet3" + "Value": "lamfhs-existing-vpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1100,7 +1102,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet3" + "Value": "lamfhs-existing-vpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -1137,7 +1139,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "lamfhs-existing-vpc/Vpc" } ] } @@ -1171,7 +1173,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/FlowLog" + "Value": "lamfhs-existing-vpc/Vpc/FlowLog" } ] } @@ -1223,7 +1225,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/FlowLog" + "Value": "lamfhs-existing-vpc/Vpc/FlowLog" } ] }, @@ -1260,7 +1262,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/FlowLog" + "Value": "lamfhs-existing-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1273,7 +1275,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingvpcKINESISFIREHOSEsecuritygroupF123580F", + "lamfhsexistingvpcKINESISFIREHOSEsecuritygroup18F0C673", "GroupId" ] } @@ -1425,7 +1427,7 @@ "testconstructReplaceDefaultSecurityGroupsecuritygroup05665D84": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-vpc/test-construct/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamfhs-existing-vpc/test-construct/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -1463,7 +1465,7 @@ }, "Environment": { "Variables": { - "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoseexistingvpcdestinationfirehoseFCC6BBF7" + "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoselamfhsexistingvpcdestinationfirehose623CCD9C" } }, "Handler": "index.handler", @@ -1528,10 +1530,10 @@ } } }, - "existingvpcKINESISFIREHOSEsecuritygroupF123580F": { + "lamfhsexistingvpcKINESISFIREHOSEsecuritygroup18F0C673": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-vpc/existing-vpc-KINESIS_FIREHOSE-security-group", + "GroupDescription": "lamfhs-existing-vpc/lamfhs-existing-vpc-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-existing-vpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-vpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-existing-vpc.ts 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.lamfhs-new-vpc.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-new-vpc.expected.json index 77af4c7da..2fc62c689 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.lamfhs-new-vpc.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenewvpcdestinationfirehoseEC1F5A2C", + "DeliveryStreamName": "KinesisFirehoselamfhsnewvpcdestinationfirehoseF2428936", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -550,7 +552,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -715,7 +717,7 @@ "testconstructReplaceDefaultSecurityGroupsecuritygroup05665D84": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-vpc/test-construct/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamfhs-new-vpc/test-construct/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -753,7 +755,7 @@ }, "Environment": { "Variables": { - "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehosenewvpcdestinationfirehoseEC1F5A2C" + "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoselamfhsnewvpcdestinationfirehoseF2428936" } }, "Handler": "index.handler", @@ -825,7 +827,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc" + "Value": "lamfhs-new-vpc/Vpc" } ] } @@ -847,7 +849,7 @@ }, { "Key": "Name", - "Value": "new-vpc/Vpc/isolatedSubnet1" + "Value": "lamfhs-new-vpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -861,7 +863,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc/isolatedSubnet1" + "Value": "lamfhs-new-vpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -897,7 +899,7 @@ }, { "Key": "Name", - "Value": "new-vpc/Vpc/isolatedSubnet2" + "Value": "lamfhs-new-vpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -911,7 +913,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc/isolatedSubnet2" + "Value": "lamfhs-new-vpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -947,7 +949,7 @@ }, { "Key": "Name", - "Value": "new-vpc/Vpc/isolatedSubnet3" + "Value": "lamfhs-new-vpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -961,7 +963,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc/isolatedSubnet3" + "Value": "lamfhs-new-vpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -998,7 +1000,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc/FlowLog" + "Value": "lamfhs-new-vpc/Vpc/FlowLog" } ] } @@ -1050,7 +1052,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc/FlowLog" + "Value": "lamfhs-new-vpc/Vpc/FlowLog" } ] }, @@ -1087,7 +1089,7 @@ "Tags": [ { "Key": "Name", - "Value": "new-vpc/Vpc/FlowLog" + "Value": "lamfhs-new-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1100,7 +1102,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newvpcKINESISFIREHOSEsecuritygroup3F345517", + "lamfhsnewvpcKINESISFIREHOSEsecuritygroupDF50B55F", "GroupId" ] } @@ -1134,10 +1136,10 @@ } } }, - "newvpcKINESISFIREHOSEsecuritygroup3F345517": { + "lamfhsnewvpcKINESISFIREHOSEsecuritygroupDF50B55F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "new-vpc/new-vpc-KINESIS_FIREHOSE-security-group", + "GroupDescription": "lamfhs-new-vpc/lamfhs-new-vpc-KINESIS_FIREHOSE-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-new-vpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.new-vpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-new-vpc.ts 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.lamfhs-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-no-arguments.expected.json index 688ddcad6..090b8c134 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.lamfhs-no-arguments.expected.json @@ -85,6 +85,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -274,6 +275,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -466,7 +468,7 @@ "DeliveryStreamEncryptionConfigurationInput": { "KeyType": "AWS_OWNED_CMK" }, - "DeliveryStreamName": "KinesisFirehosenoargumentsdestinationfirehose5454CC08", + "DeliveryStreamName": "KinesisFirehoselamfhsnoargumentsdestinationfirehoseC6583242", "ExtendedS3DestinationConfiguration": { "BucketARN": { "Fn::GetAtt": [ @@ -550,7 +552,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -712,7 +714,7 @@ }, "Environment": { "Variables": { - "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehosenoargumentsdestinationfirehose5454CC08" + "FIREHOSE_DELIVERYSTREAM_NAME": "KinesisFirehoselamfhsnoargumentsdestinationfirehoseC6583242" } }, "Handler": "index.handler", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisfirehose/test/integ.lamfhs-no-arguments.ts 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.lamkin-existingLambda.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingLambda.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingLambda.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingLambda.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingLambda.ts 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.lamkin-existingStream.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingStream.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingStream.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStream.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingStream.ts 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.lamkin-existingStreamWithCmk.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingStreamWithCmk.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingStreamWithCmk.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingStreamWithCmk.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingStreamWithCmk.ts 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.lamkin-existingVpc.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingVpc.expected.json index bba6b14da..4561f899a 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.lamkin-existingVpc.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "lamkin-existingVpc/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet1" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet2" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PublicSubnet3" + "Value": "lamkin-existingVpc/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet1" + "Value": "lamkin-existingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet1" + "Value": "lamkin-existingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet2" + "Value": "lamkin-existingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet2" + "Value": "lamkin-existingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet3" + "Value": "lamkin-existingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/PrivateSubnet3" + "Value": "lamkin-existingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc" + "Value": "lamkin-existingVpc/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "lamkin-existingVpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "lamkin-existingVpc/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "existingVpc/Vpc/FlowLog" + "Value": "lamkin-existingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -676,7 +676,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9", + "lamkinexistingVpcKINESISSTREAMSsecuritygroupC307369A", "GroupId" ] } @@ -827,7 +827,7 @@ "testlambdakinesisstreamsReplaceDefaultSecurityGroupsecuritygroupFB22266C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/test-lambda-kinesisstreams/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamkin-existingVpc/test-lambda-kinesisstreams/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -969,10 +969,10 @@ "Threshold": 0 } }, - "existingVpcKINESISSTREAMSsecuritygroupDE0E9DB9": { + "lamkinexistingVpcKINESISSTREAMSsecuritygroupC307369A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existingVpc/existingVpc-KINESIS_STREAMS-security-group", + "GroupDescription": "lamkin-existingVpc/lamkin-existingVpc-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.existingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-existingVpc.ts 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.lamkin-newStreamFromProps.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newStreamFromProps.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newStreamFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newStreamFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newStreamFromProps.ts 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.lamkin-newVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newVpc.expected.json index 1eddf3e1e..4ff81e82c 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.lamkin-newVpc.expected.json @@ -117,7 +117,7 @@ "testlambdakinesisstreamsReplaceDefaultSecurityGroupsecuritygroupFB22266C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "newVpc/test-lambda-kinesisstreams/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamkin-newVpc/test-lambda-kinesisstreams/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -266,7 +266,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc" + "Value": "lamkin-newVpc/Vpc" } ] } @@ -288,7 +288,7 @@ }, { "Key": "Name", - "Value": "newVpc/Vpc/isolatedSubnet1" + "Value": "lamkin-newVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -302,7 +302,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc/isolatedSubnet1" + "Value": "lamkin-newVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -338,7 +338,7 @@ }, { "Key": "Name", - "Value": "newVpc/Vpc/isolatedSubnet2" + "Value": "lamkin-newVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -352,7 +352,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc/isolatedSubnet2" + "Value": "lamkin-newVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -388,7 +388,7 @@ }, { "Key": "Name", - "Value": "newVpc/Vpc/isolatedSubnet3" + "Value": "lamkin-newVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -402,7 +402,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc/isolatedSubnet3" + "Value": "lamkin-newVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -439,7 +439,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc/FlowLog" + "Value": "lamkin-newVpc/Vpc/FlowLog" } ] } @@ -491,7 +491,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc/FlowLog" + "Value": "lamkin-newVpc/Vpc/FlowLog" } ] }, @@ -528,7 +528,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpc/Vpc/FlowLog" + "Value": "lamkin-newVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -541,7 +541,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newVpcKINESISSTREAMSsecuritygroup88F75AD5", + "lamkinnewVpcKINESISSTREAMSsecuritygroup5C800E5E", "GroupId" ] } @@ -575,10 +575,10 @@ } } }, - "newVpcKINESISSTREAMSsecuritygroup88F75AD5": { + "lamkinnewVpcKINESISSTREAMSsecuritygroup5C800E5E": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "newVpc/newVpc-KINESIS_STREAMS-security-group", + "GroupDescription": "lamkin-newVpc/lamkin-newVpc-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newVpc.ts 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.lamkin-newVpcFromProps.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newVpcFromProps.expected.json index 398bfd9be..fb8e0369a 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.lamkin-newVpcFromProps.expected.json @@ -117,7 +117,7 @@ "testlambdakinesisstreamsReplaceDefaultSecurityGroupsecuritygroupFB22266C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "newVpcFromProps/test-lambda-kinesisstreams/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamkin-newVpcFromProps/test-lambda-kinesisstreams/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -258,7 +258,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc" + "Value": "lamkin-newVpcFromProps/Vpc" } ] } @@ -280,7 +280,7 @@ }, { "Key": "Name", - "Value": "newVpcFromProps/Vpc/isolatedSubnet1" + "Value": "lamkin-newVpcFromProps/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -294,7 +294,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc/isolatedSubnet1" + "Value": "lamkin-newVpcFromProps/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -331,7 +331,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc/FlowLog" + "Value": "lamkin-newVpcFromProps/Vpc/FlowLog" } ] } @@ -383,7 +383,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc/FlowLog" + "Value": "lamkin-newVpcFromProps/Vpc/FlowLog" } ] }, @@ -420,7 +420,7 @@ "Tags": [ { "Key": "Name", - "Value": "newVpcFromProps/Vpc/FlowLog" + "Value": "lamkin-newVpcFromProps/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -433,7 +433,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "newVpcFromPropsKINESISSTREAMSsecuritygroup9B3EE931", + "lamkinnewVpcFromPropsKINESISSTREAMSsecuritygroup10DC8B01", "GroupId" ] } @@ -461,10 +461,10 @@ } } }, - "newVpcFromPropsKINESISSTREAMSsecuritygroup9B3EE931": { + "lamkinnewVpcFromPropsKINESISSTREAMSsecuritygroup10DC8B01": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "newVpcFromProps/newVpcFromProps-KINESIS_STREAMS-security-group", + "GroupDescription": "lamkin-newVpcFromProps/lamkin-newVpcFromProps-KINESIS_STREAMS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newVpcFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.newVpcFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-newVpcFromProps.ts 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.lamkin-noArguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-noArguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-noArguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.noArguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-kinesisstreams/test/integ.lamkin-noArguments.ts 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.lamopn-cluster-config.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-cluster-config.expected.json index 451416bce..91c2dcc33 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.lamopn-cluster-config.expected.json @@ -103,7 +103,7 @@ "testlambdaopensearchReplaceDefaultSecurityGroupsecuritygroupB44718EC": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "cluster-config/test-lambda-opensearch/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamopn-cluster-config/test-lambda-opensearch/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -742,7 +742,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc" + "Value": "lamopn-cluster-config/Vpc" } ] } @@ -764,7 +764,7 @@ }, { "Key": "Name", - "Value": "cluster-config/Vpc/isolatedSubnet1" + "Value": "lamopn-cluster-config/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -778,7 +778,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc/isolatedSubnet1" + "Value": "lamopn-cluster-config/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -814,7 +814,7 @@ }, { "Key": "Name", - "Value": "cluster-config/Vpc/isolatedSubnet2" + "Value": "lamopn-cluster-config/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -828,7 +828,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc/isolatedSubnet2" + "Value": "lamopn-cluster-config/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -865,7 +865,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc/FlowLog" + "Value": "lamopn-cluster-config/Vpc/FlowLog" } ] } @@ -917,7 +917,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc/FlowLog" + "Value": "lamopn-cluster-config/Vpc/FlowLog" } ] }, @@ -954,7 +954,7 @@ "Tags": [ { "Key": "Name", - "Value": "cluster-config/Vpc/FlowLog" + "Value": "lamopn-cluster-config/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-cluster-config.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.cluster-config.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-cluster-config.ts 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.lamopn-disabled-zone-awareness.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-disabled-zone-awareness.expected.json index bacca0a29..21a55d6b6 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.lamopn-disabled-zone-awareness.expected.json @@ -103,7 +103,7 @@ "testlambdaopensearchReplaceDefaultSecurityGroupsecuritygroupB44718EC": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "disabled-zone-awareness/test-lambda-opensearch/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamopn-disabled-zone-awareness/test-lambda-opensearch/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -732,7 +732,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc" + "Value": "lamopn-disabled-zone-awareness/Vpc" } ] } @@ -754,7 +754,7 @@ }, { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc/isolatedSubnet1" + "Value": "lamopn-disabled-zone-awareness/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -768,7 +768,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc/isolatedSubnet1" + "Value": "lamopn-disabled-zone-awareness/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -805,7 +805,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc/FlowLog" + "Value": "lamopn-disabled-zone-awareness/Vpc/FlowLog" } ] } @@ -857,7 +857,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc/FlowLog" + "Value": "lamopn-disabled-zone-awareness/Vpc/FlowLog" } ] }, @@ -894,7 +894,7 @@ "Tags": [ { "Key": "Name", - "Value": "disabled-zone-awareness/Vpc/FlowLog" + "Value": "lamopn-disabled-zone-awareness/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-disabled-zone-awareness.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.disabled-zone-awareness.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-disabled-zone-awareness.ts 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.lamopn-domain-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-domain-arguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-domain-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.domain-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-domain-arguments.ts 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.lamopn-existing-vpc.expected.json similarity index 96% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-existing-vpc.expected.json index 3115d78a4..c8c5b4dff 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.lamopn-existing-vpc.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "lamopn-existing-vpc/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet1" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet2" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PublicSubnet3" + "Value": "lamopn-existing-vpc/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet1" + "Value": "lamopn-existing-vpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet1" + "Value": "lamopn-existing-vpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet2" + "Value": "lamopn-existing-vpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet2" + "Value": "lamopn-existing-vpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet3" + "Value": "lamopn-existing-vpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/PrivateSubnet3" + "Value": "lamopn-existing-vpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc" + "Value": "lamopn-existing-vpc/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/FlowLog" + "Value": "lamopn-existing-vpc/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/FlowLog" + "Value": "lamopn-existing-vpc/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "existing-vpc/Vpc/FlowLog" + "Value": "lamopn-existing-vpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -772,7 +772,7 @@ "testlambdaelasticsearchkibana4ReplaceDefaultSecurityGroupsecuritygroupA79E2B92": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "existing-vpc/test-lambda-elasticsearch-kibana4/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamopn-existing-vpc/test-lambda-elasticsearch-kibana4/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-existing-vpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.existing-vpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-existing-vpc.ts 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.lamopn-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-no-arguments.expected.json index bb4aceef8..43b70f2ed 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.lamopn-no-arguments.expected.json @@ -227,7 +227,7 @@ "testlambdaopensearchUserPoolDomain98864920": { "Type": "AWS::Cognito::UserPoolDomain", "Properties": { - "Domain": "solutions-constructs-domain", + "Domain": "lamopn-no-args", "UserPoolId": { "Ref": "testlambdaopensearchCognitoUserPoolA09096F9" } @@ -284,7 +284,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/solutions-constructs-domain/*" + ":domain/lamopn-no-args/*" ] ] } @@ -397,7 +397,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/solutions-constructs-domain" + ":domain/lamopn-no-args" ] ] } @@ -469,7 +469,7 @@ { "Ref": "AWS::AccountId" }, - ":domain/solutions-constructs-domain/*" + ":domain/lamopn-no-args/*" ] ] } @@ -505,7 +505,7 @@ "EnforceHTTPS": true, "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07" }, - "DomainName": "solutions-constructs-domain", + "DomainName": "lamopn-no-args", "EBSOptions": { "EBSEnabled": true, "VolumeSize": 10 diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-no-arguments.ts similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-no-arguments.ts index 8330476a9..af1e5450d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-no-arguments.ts @@ -27,7 +27,7 @@ const lambdaProps: lambda.FunctionProps = { handler: 'index.handler' }; -const openSearchDomain = 'solutions-constructs-domain'; +const openSearchDomain = 'lamopn-no-args'; new LambdaToOpenSearch(stack, 'test-lambda-opensearch', { lambdaFunctionProps: lambdaProps, 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.lamopn-vpc-props.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-vpc-props.expected.json index 21ebb11c4..e0178d93b 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.lamopn-vpc-props.expected.json @@ -103,7 +103,7 @@ "testlambdaopensearchReplaceDefaultSecurityGroupsecuritygroupB44718EC": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "vpc-props/test-lambda-opensearch/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamopn-vpc-props/test-lambda-opensearch/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -747,7 +747,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc" + "Value": "lamopn-vpc-props/Vpc" } ] } @@ -769,7 +769,7 @@ }, { "Key": "Name", - "Value": "vpc-props/Vpc/isolatedSubnet1" + "Value": "lamopn-vpc-props/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -783,7 +783,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc/isolatedSubnet1" + "Value": "lamopn-vpc-props/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -819,7 +819,7 @@ }, { "Key": "Name", - "Value": "vpc-props/Vpc/isolatedSubnet2" + "Value": "lamopn-vpc-props/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -833,7 +833,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc/isolatedSubnet2" + "Value": "lamopn-vpc-props/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -869,7 +869,7 @@ }, { "Key": "Name", - "Value": "vpc-props/Vpc/isolatedSubnet3" + "Value": "lamopn-vpc-props/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -883,7 +883,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc/isolatedSubnet3" + "Value": "lamopn-vpc-props/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -920,7 +920,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc/FlowLog" + "Value": "lamopn-vpc-props/Vpc/FlowLog" } ] } @@ -972,7 +972,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc/FlowLog" + "Value": "lamopn-vpc-props/Vpc/FlowLog" } ] }, @@ -1009,7 +1009,7 @@ "Tags": [ { "Key": "Name", - "Value": "vpc-props/Vpc/FlowLog" + "Value": "lamopn-vpc-props/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-vpc-props.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.vpc-props.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-opensearch/test/integ.lamopn-vpc-props.ts 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.lams3-customLoggingBucket.expected.json similarity index 75% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-customLoggingBucket.expected.json index 486e68be1..d9ae239f6 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.lams3-customLoggingBucket.expected.json @@ -197,6 +197,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -256,6 +262,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "testlambdas3S3LoggingBucketD42FC73D", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "testlambdas3S3LoggingBucketD42FC73D", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -297,6 +342,25 @@ } } }, + "testlambdas3S3LoggingBucketAutoDeleteObjectsCustomResource9AE70F3A": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "testlambdas3S3LoggingBucketD42FC73D" + } + }, + "DependsOn": [ + "testlambdas3S3LoggingBucketPolicyCEAFB213" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "testlambdas3S3Bucket179A52E6": { "Type": "AWS::S3::Bucket", "Properties": { @@ -386,6 +450,82 @@ "Version": "2012-10-17" } } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "testlambdas3S3LoggingBucketD42FC73D" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } } }, "Parameters": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-customLoggingBucket.ts similarity index 88% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-customLoggingBucket.ts index fa78562bc..55ea15e14 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-customLoggingBucket.ts @@ -16,7 +16,7 @@ import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; import { LambdaToS3 } from "../lib"; import * as lambda from 'aws-cdk-lib/aws-lambda'; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); @@ -34,9 +34,11 @@ new LambdaToS3(stack, 'test-lambda-s3', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: BucketEncryption.S3_MANAGED, versioned: true } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); 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.lams3-deployFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-deployFunction.ts 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.lams3-deployFunctionWithVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-deployFunctionWithVpc.expected.json index 299acbe25..4d13d0f19 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.lams3-deployFunctionWithVpc.expected.json @@ -141,7 +141,7 @@ "testlambdas3ReplaceDefaultSecurityGroupsecuritygroupA1E3F673": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-s3/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lams3-deployFunctionWithVpc/test-lambda-s3/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -349,7 +349,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lams3-deployFunctionWithVpc/Vpc" } ] } @@ -371,7 +371,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lams3-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -385,7 +385,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lams3-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -421,7 +421,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lams3-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -435,7 +435,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lams3-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -471,7 +471,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lams3-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -485,7 +485,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lams3-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -522,7 +522,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lams3-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lams3-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -611,7 +611,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lams3-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-deployFunctionWithVpc.ts 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.lams3-existingFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-existingFunction.ts 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.lams3-pre-existing-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-pre-existing-bucket.expected.json index 03aafe278..e9c101292 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.lams3-pre-existing-bucket.expected.json @@ -54,6 +54,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,7 +144,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-pre-existing-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.lams3-pre-existing-bucket.ts 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.lamsag-deployFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-deployFunction.ts 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.lamsag-existingFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingFunction.ts 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.lamsag-existingSageMakerEndpoint.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.existingSageMakerEndpoint.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/test/integ.lamsag-existingSageMakerEndpoint.ts 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.lamsec-deployFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunction.ts 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.lamsec-deployFunctionWithExistingVpc.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunctionWithExistingVpc.expected.json index 00399cbea..3e36236a0 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.lamsec-deployFunctionWithExistingVpc.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamsec-deployFunctionWithExistingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithExistingVpcSECRETSMANAGERsecuritygroupB20BA3EB", + "lamsecdeployFunctionWithExistingVpcSECRETSMANAGERsecuritygroup30E54F0F", "GroupId" ] } @@ -824,7 +824,7 @@ "testlambdasecretsmanagerstackReplaceDefaultSecurityGroupsecuritygroupBBE9275E": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithExistingVpc/test-lambda-secretsmanager-stack/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamsec-deployFunctionWithExistingVpc/test-lambda-secretsmanager-stack/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -948,10 +948,10 @@ } } }, - "deployFunctionWithExistingVpcSECRETSMANAGERsecuritygroupB20BA3EB": { + "lamsecdeployFunctionWithExistingVpcSECRETSMANAGERsecuritygroup30E54F0F": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithExistingVpc/deployFunctionWithExistingVpc-SECRETS_MANAGER-security-group", + "GroupDescription": "lamsec-deployFunctionWithExistingVpc/lamsec-deployFunctionWithExistingVpc-SECRETS_MANAGER-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunctionWithExistingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithExistingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunctionWithExistingVpc.ts 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.lamsec-deployFunctionWithVpc.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunctionWithVpc.expected.json index 14093b327..656b42ee7 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.lamsec-deployFunctionWithVpc.expected.json @@ -114,7 +114,7 @@ "testlambdasecretsmanagerReplaceDefaultSecurityGroupsecuritygroupF837FD37": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-secretsmanager/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamsec-deployFunctionWithVpc/test-lambda-secretsmanager/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -245,7 +245,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamsec-deployFunctionWithVpc/Vpc" } ] } @@ -267,7 +267,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamsec-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -281,7 +281,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamsec-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -317,7 +317,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamsec-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -331,7 +331,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamsec-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -367,7 +367,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamsec-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -381,7 +381,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamsec-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -418,7 +418,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsec-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -470,7 +470,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsec-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -507,7 +507,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsec-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -520,7 +520,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithVpcSECRETSMANAGERsecuritygroup140A8C59", + "lamsecdeployFunctionWithVpcSECRETSMANAGERsecuritygroup98862008", "GroupId" ] } @@ -554,10 +554,10 @@ } } }, - "deployFunctionWithVpcSECRETSMANAGERsecuritygroup140A8C59": { + "lamsecdeployFunctionWithVpcSECRETSMANAGERsecuritygroup98862008": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/deployFunctionWithVpc-SECRETS_MANAGER-security-group", + "GroupDescription": "lamsec-deployFunctionWithVpc/lamsec-deployFunctionWithVpc-SECRETS_MANAGER-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-deployFunctionWithVpc.ts 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.lamsec-existingFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/test/integ.lamsec-existingFunction.ts 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.lamsns-deployFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-deployFunction.ts 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.lamsns-deployFunctionWithVpc.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-deployFunctionWithVpc.expected.json index fac38e6c5..1a1afe45a 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.lamsns-deployFunctionWithVpc.expected.json @@ -111,7 +111,7 @@ "testlambdasnsReplaceDefaultSecurityGroupsecuritygroup071D13CB": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-sns/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamsns-deployFunctionWithVpc/test-lambda-sns/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamsns-deployFunctionWithVpc/Vpc" } ] } @@ -361,7 +361,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamsns-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -375,7 +375,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamsns-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -411,7 +411,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamsns-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -425,7 +425,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamsns-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -461,7 +461,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamsns-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -475,7 +475,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamsns-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -512,7 +512,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsns-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -564,7 +564,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsns-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -601,7 +601,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsns-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -614,7 +614,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithVpcSNSsecuritygroup5E54C413", + "lamsnsdeployFunctionWithVpcSNSsecuritygroup072F337C", "GroupId" ] } @@ -648,10 +648,10 @@ } } }, - "deployFunctionWithVpcSNSsecuritygroup5E54C413": { + "lamsnsdeployFunctionWithVpcSNSsecuritygroup072F337C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/deployFunctionWithVpc-SNS-security-group", + "GroupDescription": "lamsns-deployFunctionWithVpc/lamsns-deployFunctionWithVpc-SNS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-deployFunctionWithVpc.ts 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.lamsns-existingFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.lamsns-existingFunction.ts 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.lamsqslam-defaultDeployment.expected.json old mode 100755 new mode 100644 similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-defaultDeployment.expected.json index d1e2e4d6e..10e28137d --- 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.lamsqslam-defaultDeployment.expected.json @@ -477,7 +477,7 @@ } } }, - "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourcedefaultDeploymenttestlambdasqslambdalambdatosqsqueue5E928C6A3AD18AD6": { + "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourcelamsqslamdefaultDeploymenttestlambdasqslambdalambdatosqsqueue3E64D9566563B998": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-defaultDeployment.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-defaultDeployment.ts 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.lamsqslam-deployProducerFunctionWithVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-deployProducerFunctionWithVpc.expected.json index 0118c94c6..b242e72f1 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.lamsqslam-deployProducerFunctionWithVpc.expected.json @@ -118,7 +118,7 @@ "testlambdasqslambdatosqsReplaceDefaultSecurityGroupsecuritygroupD9549651": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployProducerFunctionWithVpc/test-lambda-sqs/lambda-to-sqs/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/lambda-to-sqs/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -398,7 +398,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc" } ] } @@ -420,7 +420,7 @@ }, { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet1" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -434,7 +434,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet1" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -470,7 +470,7 @@ }, { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet2" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -484,7 +484,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet2" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -520,7 +520,7 @@ }, { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet3" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -534,7 +534,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet3" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -571,7 +571,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" } ] } @@ -623,7 +623,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" } ] }, @@ -660,7 +660,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" + "Value": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -710,7 +710,7 @@ "testlambdasqstestlambdasqsSQSsecuritygroupBDBA458D": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployProducerFunctionWithVpc/test-lambda-sqs/test-lambda-sqs-SQS-security-group", + "GroupDescription": "lamsqslam-deployProducerFunctionWithVpc/test-lambda-sqs/test-lambda-sqs-SQS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -919,7 +919,7 @@ } } }, - "testlambdasqssqstolambdaLambdaFunctionSqsEventSourcedeployProducerFunctionWithVpctestlambdasqslambdatosqsqueueA1382C56CEF2BFAB": { + "testlambdasqssqstolambdaLambdaFunctionSqsEventSourcelamsqslamdeployProducerFunctionWithVpctestlambdasqslambdatosqsqueueD62DE11EB9A24E09": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-deployProducerFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.deployProducerFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-deployProducerFunctionWithVpc.ts 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.lamsqslam-existingConsumerFunction.expected.json old mode 100755 new mode 100644 similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingConsumerFunction.expected.json index f3c39b316..b9d93247a --- 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.lamsqslam-existingConsumerFunction.expected.json @@ -155,7 +155,7 @@ } } }, - "LambdaFunctionSqsEventSourceexistingConsumerFunctiontestlambdasqslambdalambdatosqsqueue06632F2BBBBAB968": { + "LambdaFunctionSqsEventSourcelamsqslamexistingConsumerFunctiontestlambdasqslambdalambdatosqsqueueADB261AF57113DBC": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingConsumerFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingConsumerFunction.ts 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.lamsqslam-existingProducerFunction.expected.json old mode 100755 new mode 100644 similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingProducerFunction.expected.json index db615ee83..fbff99899 --- 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.lamsqslam-existingProducerFunction.expected.json @@ -477,7 +477,7 @@ } } }, - "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourceexistingProducerFunctiontestlambdasqslambdalambdatosqsqueue9043AC9D03EA33DA": { + "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourcelamsqslamexistingProducerFunctiontestlambdasqslambdalambdatosqsqueue8D69F5FDF7993E28": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingProducerFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingProducerFunction.ts 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.lamsqslam-existingQueue.expected.json old mode 100755 new mode 100644 similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingQueue.expected.json index 0adc3d1f2..7f18cd4e7 --- 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.lamsqslam-existingQueue.expected.json @@ -389,7 +389,7 @@ } } }, - "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourceexistingQueueexistingsqsqueue05DEA3674B910AAB": { + "testlambdasqslambdasqstolambdaLambdaFunctionSqsEventSourcelamsqslamexistingQueueexistingsqsqueue9D244BAE1189AC7F": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingQueue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.lamsqslam-existingQueue.ts 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.lamsqs-deployFunction.expected.json old mode 100755 new mode 100644 similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunction.ts 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.lamsqs-deployFunctionWithVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunctionWithVpc.expected.json index 3aea6b351..500ea1b29 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.lamsqs-deployFunctionWithVpc.expected.json @@ -118,7 +118,7 @@ "testlambdasqsReplaceDefaultSecurityGroupsecuritygroup2CA205C7": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-sqs/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamsqs-deployFunctionWithVpc/test-lambda-sqs/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -398,7 +398,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamsqs-deployFunctionWithVpc/Vpc" } ] } @@ -420,7 +420,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -434,7 +434,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -470,7 +470,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -484,7 +484,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -520,7 +520,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -534,7 +534,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -571,7 +571,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -623,7 +623,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -660,7 +660,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamsqs-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -673,7 +673,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithVpcSQSsecuritygroup2E4E2685", + "lamsqsdeployFunctionWithVpcSQSsecuritygroupE4F67F17", "GroupId" ] } @@ -707,10 +707,10 @@ } } }, - "deployFunctionWithVpcSQSsecuritygroup2E4E2685": { + "lamsqsdeployFunctionWithVpcSQSsecuritygroupE4F67F17": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/deployFunctionWithVpc-SQS-security-group", + "GroupDescription": "lamsqs-deployFunctionWithVpc/lamsqs-deployFunctionWithVpc-SQS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-deployFunctionWithVpc.ts 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.lamsqs-existingFunction.expected.json old mode 100755 new mode 100644 similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.lamsqs-existingFunction.ts 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.lamssm-deployFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunction.ts 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.lamssm-deployFunctionWithExistingVpc.expected.json similarity index 92% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunctionWithExistingVpc.expected.json index 47c986943..52608f163 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.lamssm-deployFunctionWithExistingVpc.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet1" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet2" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PublicSubnet3" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithExistingVpc/Vpc/FlowLog" + "Value": "lamssm-deployFunctionWithExistingVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -677,7 +677,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithExistingVpcSSMsecuritygroupC287F479", + "lamssmdeployFunctionWithExistingVpcSSMsecuritygroup091BDDCC", "GroupId" ] } @@ -846,7 +846,7 @@ "testlambdassmstringparameterReplaceDefaultSecurityGroupsecuritygroupBB1CB03C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithExistingVpc/test-lambda-ssmstringparameter/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamssm-deployFunctionWithExistingVpc/test-lambda-ssmstringparameter/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -959,10 +959,10 @@ "Value": "test-string-value" } }, - "deployFunctionWithExistingVpcSSMsecuritygroupC287F479": { + "lamssmdeployFunctionWithExistingVpcSSMsecuritygroup091BDDCC": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithExistingVpc/deployFunctionWithExistingVpc-SSM-security-group", + "GroupDescription": "lamssm-deployFunctionWithExistingVpc/lamssm-deployFunctionWithExistingVpc-SSM-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunctionWithExistingVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithExistingVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunctionWithExistingVpc.ts 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.lamssm-deployFunctionWithVpc.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunctionWithVpc.expected.json index 785fe73e6..185f0ebc8 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.lamssm-deployFunctionWithVpc.expected.json @@ -136,7 +136,7 @@ "testlambdassmstringparameterReplaceDefaultSecurityGroupsecuritygroupBB1CB03C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-ssmstringparameter/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamssm-deployFunctionWithVpc/test-lambda-ssmstringparameter/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -256,7 +256,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamssm-deployFunctionWithVpc/Vpc" } ] } @@ -278,7 +278,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamssm-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -292,7 +292,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamssm-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -328,7 +328,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamssm-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -342,7 +342,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamssm-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -378,7 +378,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamssm-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -392,7 +392,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamssm-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -429,7 +429,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamssm-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -481,7 +481,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamssm-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -518,7 +518,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamssm-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -531,7 +531,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithVpcSSMsecuritygroup918CB15C", + "lamssmdeployFunctionWithVpcSSMsecuritygroup40CF2829", "GroupId" ] } @@ -565,10 +565,10 @@ } } }, - "deployFunctionWithVpcSSMsecuritygroup918CB15C": { + "lamssmdeployFunctionWithVpcSSMsecuritygroup40CF2829": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/deployFunctionWithVpc-SSM-security-group", + "GroupDescription": "lamssm-deployFunctionWithVpc/lamssm-deployFunctionWithVpc-SSM-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-deployFunctionWithVpc.ts 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.lamssm-existingFunction.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-existingFunction.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-existingFunction.ts 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.lamssm-existingStringParameter.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-existingStringParameter.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-existingStringParameter.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.existingStringParameter.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/test/integ.lamssm-existingStringParameter.ts 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.lamstp-deploy-lambda.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-deploy-lambda.expected.json index 251c1aca8..5e3c597f8 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.lamstp-deploy-lambda.expected.json @@ -7,7 +7,7 @@ "Fn::Join": [ "", [ - "/aws/vendedlogs/states/constructs/deploy-lambdatest-lambda-stepfunctions-constructStateMachineLog-", + "/aws/vendedlogs/states/constructs/lamstp-deploy-lambdatest-lambda-stepfunctions-constructStateMachineLog-", { "Fn::Select": [ 2, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-deploy-lambda.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-deploy-lambda.ts 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.lamstp-deployFunctionWithVpc.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-deployFunctionWithVpc.expected.json index 4f7f845e8..4a4691fc8 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.lamstp-deployFunctionWithVpc.expected.json @@ -256,7 +256,7 @@ "testlambdastepfunctionsReplaceDefaultSecurityGroupsecuritygroup3E86407A": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/test-lambda-stepfunctions/ReplaceDefaultSecurityGroup-security-group", + "GroupDescription": "lamstp-deployFunctionWithVpc/test-lambda-stepfunctions/ReplaceDefaultSecurityGroup-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", @@ -432,7 +432,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc" + "Value": "lamstp-deployFunctionWithVpc/Vpc" } ] } @@ -454,7 +454,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamstp-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -468,7 +468,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet1" + "Value": "lamstp-deployFunctionWithVpc/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -504,7 +504,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamstp-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -518,7 +518,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet2" + "Value": "lamstp-deployFunctionWithVpc/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -554,7 +554,7 @@ }, { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamstp-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -568,7 +568,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/isolatedSubnet3" + "Value": "lamstp-deployFunctionWithVpc/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -605,7 +605,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamstp-deployFunctionWithVpc/Vpc/FlowLog" } ] } @@ -657,7 +657,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamstp-deployFunctionWithVpc/Vpc/FlowLog" } ] }, @@ -694,7 +694,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployFunctionWithVpc/Vpc/FlowLog" + "Value": "lamstp-deployFunctionWithVpc/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -707,7 +707,7 @@ "SecurityGroupIds": [ { "Fn::GetAtt": [ - "deployFunctionWithVpcSTEPFUNCTIONSsecuritygroupA9CFA360", + "lamstpdeployFunctionWithVpcSTEPFUNCTIONSsecuritygroupC6950841", "GroupId" ] } @@ -741,10 +741,10 @@ } } }, - "deployFunctionWithVpcSTEPFUNCTIONSsecuritygroupA9CFA360": { + "lamstpdeployFunctionWithVpcSTEPFUNCTIONSsecuritygroupC6950841": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "deployFunctionWithVpc/deployFunctionWithVpc-STEP_FUNCTIONS-security-group", + "GroupDescription": "lamstp-deployFunctionWithVpc/lamstp-deployFunctionWithVpc-STEP_FUNCTIONS-security-group", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-deployFunctionWithVpc.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-deployFunctionWithVpc.ts 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.lamstp-existing-function.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.expected.json rename to source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-existing-function.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-existing-function.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.ts rename to source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.lamstp-existing-function.ts 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.opilam-apiFromAssetExistingLambdaFunctions.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.expected.json rename to source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.expected.json index 90ce56cf6..0778d1a11 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.opilam-apiFromAssetExistingLambdaFunctions.expected.json @@ -671,7 +671,7 @@ }, "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, - "Description": "AWS CDK resource provider framework - onEvent (apiFromAssetExistingLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", + "Description": "AWS CDK resource provider framework - onEvent (opilam-apiFromAssetExistingLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", "Environment": { "Variables": { "USER_ON_EVENT_FUNCTION_ARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.ts b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetExistingLambdaFunctions.ts rename to source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetExistingLambdaFunctions.ts 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.opilam-apiFromAssetNewLambdaFunctions.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.expected.json rename to source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetNewLambdaFunctions.expected.json index 22cc311a0..e3332f80b 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.opilam-apiFromAssetNewLambdaFunctions.expected.json @@ -670,7 +670,7 @@ }, "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, - "Description": "AWS CDK resource provider framework - onEvent (apiFromAssetNewLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", + "Description": "AWS CDK resource provider framework - onEvent (opilam-apiFromAssetNewLambdaFunctions/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", "Environment": { "Variables": { "USER_ON_EVENT_FUNCTION_ARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.ts b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetNewLambdaFunctions.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetNewLambdaFunctions.ts rename to source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetNewLambdaFunctions.ts 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.opilam-apiFromAssetWithCognitoAuth.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.expected.json rename to source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetWithCognitoAuth.expected.json index c888345b9..baa7e97c8 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.opilam-apiFromAssetWithCognitoAuth.expected.json @@ -670,7 +670,7 @@ }, "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip" }, - "Description": "AWS CDK resource provider framework - onEvent (apiFromAssetWithCognitoAuth/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", + "Description": "AWS CDK resource provider framework - onEvent (opilam-apiFromAssetWithCognitoAuth/OpenApiGatewayToLambda/ApiTemplateWriterProvider)", "Environment": { "Variables": { "USER_ON_EVENT_FUNCTION_ARN": { diff --git a/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.ts b/source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetWithCognitoAuth.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.apiFromAssetWithCognitoAuth.ts rename to source/patterns/@aws-solutions-constructs/aws-openapigateway-lambda/test/integ.opilam-apiFromAssetWithCognitoAuth.ts 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.r53alb-deployPrivateApi.expected.json similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApi.expected.json index 5d0d3bb46..d7914c06c 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.r53alb-deployPrivateApi.expected.json @@ -69,7 +69,7 @@ "privateapistackprivateapistackalbSecurityGroup5A8A9725": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB deployPrivateApiprivateapistackprivateapistackalb5DF93E18", + "GroupDescription": "Automatically created Security Group for ELB r53albdeployPrivateApiprivateapistackprivateapistackalb2321F60F", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -184,6 +184,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -365,7 +366,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc" + "Value": "r53alb-deployPrivateApi/Vpc" } ] } @@ -387,7 +388,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApi/Vpc/isolatedSubnet1" + "Value": "r53alb-deployPrivateApi/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -401,7 +402,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc/isolatedSubnet1" + "Value": "r53alb-deployPrivateApi/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -437,7 +438,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApi/Vpc/isolatedSubnet2" + "Value": "r53alb-deployPrivateApi/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -451,7 +452,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc/isolatedSubnet2" + "Value": "r53alb-deployPrivateApi/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -487,7 +488,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApi/Vpc/isolatedSubnet3" + "Value": "r53alb-deployPrivateApi/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -501,7 +502,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc/isolatedSubnet3" + "Value": "r53alb-deployPrivateApi/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -538,7 +539,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc/FlowLog" + "Value": "r53alb-deployPrivateApi/Vpc/FlowLog" } ] } @@ -590,7 +591,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc/FlowLog" + "Value": "r53alb-deployPrivateApi/Vpc/FlowLog" } ] }, @@ -627,7 +628,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApi/Vpc/FlowLog" + "Value": "r53alb-deployPrivateApi/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -662,7 +663,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.ts b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApi.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.ts rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApi.ts 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.r53alb-deployPrivateApiExistingZone.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.expected.json index 3a56327aa..f9c5f5b23 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.r53alb-deployPrivateApiExistingZone.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet1" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet1" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet1" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet1" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet2" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet2" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet2" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet2" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet3" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet3" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet3" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PublicSubnet3" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet1" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet1" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet2" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet2" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet3" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/PrivateSubnet3" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/FlowLog" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/FlowLog" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPrivateApiExistingZone/Vpc/FlowLog" + "Value": "r53alb-deployPrivateApiExistingZone/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -738,7 +738,7 @@ "existingzonestackexistingzonestackalbSecurityGroup6F32DCA5": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB deployPrivateApiExistingZoneexistingzonestackexistingzonestackalbFBEA12EB", + "GroupDescription": "Automatically created Security Group for ELB r53albdeployPrivateApiExistingZoneexistingzonestackexistingzonestackalb431F8644", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -853,6 +853,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -1053,7 +1054,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.ts b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.ts rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPrivateApiExistingZone.ts 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.r53alb-deployPublicApiExistingAlb.expected.json similarity index 91% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.expected.json rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiExistingAlb.expected.json index b9cf81aa1..52e62e99b 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.r53alb-deployPublicApiExistingAlb.expected.json @@ -11,7 +11,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc" } ] } @@ -33,7 +33,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet1" } ], "VpcId": { @@ -57,7 +57,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet1" } ], "VpcId": { @@ -98,7 +98,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet1" } ] } @@ -118,7 +118,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet1" } ] }, @@ -144,7 +144,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet2" } ], "VpcId": { @@ -168,7 +168,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet2" } ], "VpcId": { @@ -209,7 +209,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet2" } ] } @@ -229,7 +229,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet2" } ] }, @@ -255,7 +255,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet3" } ], "VpcId": { @@ -279,7 +279,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet3" } ], "VpcId": { @@ -320,7 +320,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet3" } ] } @@ -340,7 +340,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PublicSubnet3" } ] }, @@ -366,7 +366,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet1" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -380,7 +380,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet1" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -428,7 +428,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet2" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -442,7 +442,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet2" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -490,7 +490,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet3" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -504,7 +504,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/PrivateSubnet3" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -541,7 +541,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc" } ] } @@ -575,7 +575,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/FlowLog" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/FlowLog" } ] } @@ -627,7 +627,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/FlowLog" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/FlowLog" } ] }, @@ -664,7 +664,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiExistingAlb/Vpc/FlowLog" + "Value": "r53alb-deployPublicApiExistingAlb/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -721,7 +721,7 @@ "testalbSecurityGroup0C84CDF9": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB deployPublicApiExistingAlbtestalb700DF81E", + "GroupDescription": "Automatically created Security Group for ELB r53albdeployPublicApiExistingAlbtestalb4D355E36", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.ts b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiExistingAlb.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.ts rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiExistingAlb.ts 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.r53alb-deployPublicApiNewAlb.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.expected.json index 609c4a6d2..3e0330483 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.r53alb-deployPublicApiNewAlb.expected.json @@ -67,7 +67,7 @@ "newalbstacknewalbstackalbSecurityGroup7BBB827C": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB deployPublicApiNewAlbnewalbstacknewalbstackalbC987D9E9", + "GroupDescription": "Automatically created Security Group for ELB r53albdeployPublicApiNewAlbnewalbstacknewalbstackalb11D1F44A", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -182,6 +182,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -363,7 +364,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc" + "Value": "r53alb-deployPublicApiNewAlb/Vpc" } ] } @@ -385,7 +386,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet1" } ], "VpcId": { @@ -409,7 +410,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet1" } ], "VpcId": { @@ -450,7 +451,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet1" } ] } @@ -470,7 +471,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet1" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet1" } ] }, @@ -496,7 +497,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet2" } ], "VpcId": { @@ -520,7 +521,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet2" } ], "VpcId": { @@ -561,7 +562,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet2" } ] } @@ -581,7 +582,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet2" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet2" } ] }, @@ -607,7 +608,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet3" } ], "VpcId": { @@ -631,7 +632,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet3" } ], "VpcId": { @@ -672,7 +673,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet3" } ] } @@ -692,7 +693,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PublicSubnet3" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PublicSubnet3" } ] }, @@ -718,7 +719,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet1" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -732,7 +733,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet1" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -780,7 +781,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet2" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -794,7 +795,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet2" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -842,7 +843,7 @@ }, { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet3" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -856,7 +857,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/PrivateSubnet3" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -893,7 +894,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc" + "Value": "r53alb-deployPublicApiNewAlb/Vpc" } ] } @@ -927,7 +928,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/FlowLog" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/FlowLog" } ] } @@ -979,7 +980,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/FlowLog" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/FlowLog" } ] }, @@ -1016,7 +1017,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployPublicApiNewAlb/Vpc/FlowLog" + "Value": "r53alb-deployPublicApiNewAlb/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -1051,7 +1052,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.ts b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.ts rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployPublicApiNewAlb.ts 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.r53alb-deployWithoutLogging.expected.json similarity index 93% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.expected.json rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployWithoutLogging.expected.json index 47d84e1f8..3e7729ab5 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.r53alb-deployWithoutLogging.expected.json @@ -60,7 +60,7 @@ "nologgingstacknologgingstackalbSecurityGroup1C3487C4": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB deployWithoutLoggingnologgingstacknologgingstackalbBA718BE3", + "GroupDescription": "Automatically created Security Group for ELB r53albdeployWithoutLoggingnologgingstacknologgingstackalbB659CBAA", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", @@ -127,7 +127,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc" + "Value": "r53alb-deployWithoutLogging/Vpc" } ] } @@ -149,7 +149,7 @@ }, { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/isolatedSubnet1" + "Value": "r53alb-deployWithoutLogging/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -163,7 +163,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/isolatedSubnet1" + "Value": "r53alb-deployWithoutLogging/Vpc/isolatedSubnet1" } ], "VpcId": { @@ -199,7 +199,7 @@ }, { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/isolatedSubnet2" + "Value": "r53alb-deployWithoutLogging/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -213,7 +213,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/isolatedSubnet2" + "Value": "r53alb-deployWithoutLogging/Vpc/isolatedSubnet2" } ], "VpcId": { @@ -249,7 +249,7 @@ }, { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/isolatedSubnet3" + "Value": "r53alb-deployWithoutLogging/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -263,7 +263,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/isolatedSubnet3" + "Value": "r53alb-deployWithoutLogging/Vpc/isolatedSubnet3" } ], "VpcId": { @@ -300,7 +300,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/FlowLog" + "Value": "r53alb-deployWithoutLogging/Vpc/FlowLog" } ] } @@ -352,7 +352,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/FlowLog" + "Value": "r53alb-deployWithoutLogging/Vpc/FlowLog" } ] }, @@ -389,7 +389,7 @@ "Tags": [ { "Key": "Name", - "Value": "deployWithoutLogging/Vpc/FlowLog" + "Value": "r53alb-deployWithoutLogging/Vpc/FlowLog" } ], "TrafficType": "ALL" diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.ts b/source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployWithoutLogging.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployWithoutLogging.ts rename to source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.r53alb-deployWithoutLogging.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.dummyTest.expected.json b/source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.r53api-dummyTest.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.dummyTest.expected.json rename to source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.r53api-dummyTest.expected.json index 5d969b002..5c8d7c7da 100644 --- a/source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.dummyTest.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.r53api-dummyTest.expected.json @@ -34,10 +34,10 @@ "RestApiDeployment180EC50303f556aa2d7ddf6a650ba4d72f3e85ac": { "Type": "AWS::ApiGateway::Deployment", "Properties": { + "Description": "Automatically created by the RestApi construct", "RestApiId": { "Ref": "RestApi0C43BF4B" - }, - "Description": "Automatically created by the RestApi construct" + } }, "DependsOn": [ "RestApiGET0F59260B" @@ -56,9 +56,6 @@ "RestApiDeploymentStageprod3855DE66": { "Type": "AWS::ApiGateway::Stage", "Properties": { - "RestApiId": { - "Ref": "RestApi0C43BF4B" - }, "AccessLogSetting": { "DestinationArn": { "Fn::GetAtt": [ @@ -79,6 +76,9 @@ "ResourcePath": "/*" } ], + "RestApiId": { + "Ref": "RestApi0C43BF4B" + }, "StageName": "prod", "TracingEnabled": true } @@ -86,7 +86,11 @@ "RestApiGET0F59260B": { "Type": "AWS::ApiGateway::Method", "Properties": { + "AuthorizationType": "AWS_IAM", "HttpMethod": "GET", + "Integration": { + "Type": "MOCK" + }, "ResourceId": { "Fn::GetAtt": [ "RestApi0C43BF4B", @@ -95,10 +99,6 @@ }, "RestApiId": { "Ref": "RestApi0C43BF4B" - }, - "AuthorizationType": "AWS_IAM", - "Integration": { - "Type": "MOCK" } } }, @@ -254,4 +254,4 @@ ] } } -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.dummyTest.ts b/source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.r53api-dummyTest.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.dummyTest.ts rename to source/patterns/@aws-solutions-constructs/aws-route53-apigateway/test/integ.r53api-dummyTest.ts 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.s3lam-existing-s3-bucket.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-existing-s3-bucket.expected.json index dfad072b0..261450cc1 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.s3lam-existing-s3-bucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -143,10 +144,10 @@ "Managed": true }, "DependsOn": [ - "scrapBucketAllowBucketNotificationsToexistings3buckettests3lambdaLambdaFunction4D270585E171492B" + "scrapBucketAllowBucketNotificationsTos3lamexistings3buckettests3lambdaLambdaFunctionCA1AFC4CBBE7A87C" ] }, - "scrapBucketAllowBucketNotificationsToexistings3buckettests3lambdaLambdaFunction4D270585E171492B": { + "scrapBucketAllowBucketNotificationsTos3lamexistings3buckettests3lambdaLambdaFunctionCA1AFC4CBBE7A87C": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -197,7 +198,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-existing-s3-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-existing-s3-bucket.ts 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.s3lam-no-arguments.expected.json similarity index 82% rename from source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-no-arguments.expected.json index 400d8c050..a21853fd2 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.s3lam-no-arguments.expected.json @@ -156,6 +156,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -215,6 +221,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "tests3lambdaS3LoggingBucket0C3BBFDC", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "tests3lambdaS3LoggingBucket0C3BBFDC", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -256,6 +301,25 @@ } } }, + "tests3lambdaS3LoggingBucketAutoDeleteObjectsCustomResource323E9779": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "tests3lambdaS3LoggingBucket0C3BBFDC" + } + }, + "DependsOn": [ + "tests3lambdaS3LoggingBucketPolicyC349F74C" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "tests3lambdaS3BucketBE7C1B8E": { "Type": "AWS::S3::Bucket", "Properties": { @@ -386,10 +450,10 @@ "Managed": true }, "DependsOn": [ - "tests3lambdaS3BucketAllowBucketNotificationsTonoargumentstests3lambdaLambdaFunction865C51D19BEA6368" + "tests3lambdaS3BucketAllowBucketNotificationsTos3lamnoargumentstests3lambdaLambdaFunction7F4DB5A1D2077883" ] }, - "tests3lambdaS3BucketAllowBucketNotificationsTonoargumentstests3lambdaLambdaFunction865C51D19BEA6368": { + "tests3lambdaS3BucketAllowBucketNotificationsTos3lamnoargumentstests3lambdaLambdaFunction7F4DB5A1D2077883": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -411,6 +475,82 @@ } } }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "tests3lambdaS3LoggingBucket0C3BBFDC" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } + }, "BucketNotificationsHandler050a0587b7544547bf325f094a3db834RoleB6FB88EC": { "Type": "AWS::IAM::Role", "Properties": { diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-no-arguments.ts similarity index 95% rename from source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-no-arguments.ts index f63575983..03e1aeeb3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.s3lam-no-arguments.ts @@ -34,6 +34,7 @@ const props: S3ToLambdaProps = { removalPolicy: RemovalPolicy.DESTROY, }, loggingBucketProps: { + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY, }, }; @@ -46,4 +47,5 @@ defaults.addCfnSuppressRules(s3Bucket, [ reason: 'This S3 bucket is created for unit/ integration testing purposes only.' }, ]); +defaults.suppressAutoDeleteHandlerWarnings(stack); app.synth(); \ No newline at end of file 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.s3sns-customLoggingBucket.expected.json similarity index 83% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-customLoggingBucket.expected.json index 678527ff8..fac652b13 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.s3sns-customLoggingBucket.expected.json @@ -18,6 +18,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -77,6 +83,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "tests3snsS3LoggingBucket94DE93BC", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "tests3snsS3LoggingBucket94DE93BC", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -118,6 +163,25 @@ } } }, + "tests3snsS3LoggingBucketAutoDeleteObjectsCustomResourceFEE6B95B": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "tests3snsS3LoggingBucket94DE93BC" + } + }, + "DependsOn": [ + "tests3snsS3LoggingBucketPolicyA32283D9" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "tests3snsS3Bucket4CA10A65": { "Type": "AWS::S3::Bucket", "Properties": { @@ -402,6 +466,82 @@ ] } }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "tests3snsS3LoggingBucket94DE93BC" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } + }, "BucketNotificationsHandler050a0587b7544547bf325f094a3db834RoleB6FB88EC": { "Type": "AWS::IAM::Role", "Properties": { diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-customLoggingBucket.ts similarity index 84% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-customLoggingBucket.ts index 7b733b49c..654f51366 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-customLoggingBucket.ts @@ -14,7 +14,7 @@ /// !cdk-integ * import { App, RemovalPolicy, Stack } from "aws-cdk-lib"; import { S3ToSns } from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename)); @@ -24,8 +24,10 @@ new S3ToSns(stack, 'test-s3-sns', { removalPolicy: RemovalPolicy.DESTROY }, loggingBucketProps: { + autoDeleteObjects: true, removalPolicy: RemovalPolicy.DESTROY } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); 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.s3sns-existingS3Bucket.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingS3Bucket.expected.json index a21e54624..205169da2 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.s3sns-existingS3Bucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -173,7 +174,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingS3Bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingS3Bucket.ts 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.s3sns-existingSnsTopic.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingSnsTopic.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingSnsTopic.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingSnsTopic.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingUnencryptedSnsTopic.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingUnencryptedSnsTopic.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingUnencryptedSnsTopic.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingUnencryptedSnsTopic.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingUnencryptedSnsTopic.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingUnencryptedSnsTopic.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingUnencryptedSnsTopic.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-existingUnencryptedSnsTopic.ts 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.s3sns-newTopicFromProps.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-newTopicFromProps.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-newTopicFromProps.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-newTopicFromProps.ts 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.s3sns-noArguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-noArguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-noArguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-noArguments.ts 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.s3sns-s3EventTypesAndFilters.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-s3EventTypesAndFilters.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-s3EventTypesAndFilters.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-s3EventTypesAndFilters.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.snsTopicWithAwsManagedKey.expected.json b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-snsTopicWithAwsManagedKey.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.snsTopicWithAwsManagedKey.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-snsTopicWithAwsManagedKey.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.snsTopicWithAwsManagedKey.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-snsTopicWithAwsManagedKey.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.snsTopicWithAwsManagedKey.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3sns-snsTopicWithAwsManagedKey.ts 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.s3sqs-creatingNewQueue.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-creatingNewQueue.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-creatingNewQueue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-creatingNewQueue.ts 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.s3sqs-customLoggingBucket.expected.json similarity index 84% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-customLoggingBucket.expected.json index a6927de0a..76a958692 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.s3sqs-customLoggingBucket.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "tests3sqsS3LoggingBucket0B0BC86A", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "tests3sqsS3LoggingBucket0B0BC86A", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "tests3sqsS3LoggingBucketAutoDeleteObjectsCustomResource054A5A8A": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "tests3sqsS3LoggingBucket0B0BC86A" + } + }, + "DependsOn": [ + "tests3sqsS3LoggingBucketPolicy3A15958C" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "tests3sqsS3BucketFF76CDA6": { "Type": "AWS::S3::Bucket", "Properties": { @@ -512,6 +576,82 @@ ] } }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "tests3sqsS3LoggingBucket0B0BC86A" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } + }, "BucketNotificationsHandler050a0587b7544547bf325f094a3db834RoleB6FB88EC": { "Type": "AWS::IAM::Role", "Properties": { diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-customLoggingBucket.ts similarity index 86% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-customLoggingBucket.ts index 2bc475657..df3b22c36 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-customLoggingBucket.ts @@ -15,7 +15,7 @@ import {App, Stack, RemovalPolicy} from "aws-cdk-lib"; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; import {S3ToSqs} from "../lib"; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); @@ -28,9 +28,11 @@ new S3ToSqs(stack, 'test-s3-sqs', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: BucketEncryption.S3_MANAGED, versioned: true } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); 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.s3sqs-existingLoggingBucket.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingLoggingBucket.expected.json index 3e9c4bdc5..0e6edef9d 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.s3sqs-existingLoggingBucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -178,7 +179,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, @@ -318,6 +319,7 @@ }, { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingLoggingBucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingLoggingBucket.ts 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.s3sqs-existingQueue.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingQueue.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingQueue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingQueue.ts 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.s3sqs-existingS3Bucket.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingS3Bucket.expected.json index c6b3e9b5b..0482b5ae2 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.s3sqs-existingS3Bucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -176,7 +177,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingS3Bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-existingS3Bucket.ts 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.s3sqs-noArguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-noArguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.ts b/source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-noArguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.s3sqs-noArguments.ts 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.s3stp-customLoggingBucket.expected.json similarity index 87% rename from source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-customLoggingBucket.expected.json index 39116fa34..09e2dad25 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.s3stp-customLoggingBucket.expected.json @@ -19,6 +19,12 @@ "IgnorePublicAcls": true, "RestrictPublicBuckets": true }, + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ], "VersioningConfiguration": { "Status": "Enabled" } @@ -78,6 +84,45 @@ } ] }, + { + "Action": [ + "s3:PutBucketPolicy", + "s3:GetBucket*", + "s3:List*", + "s3:DeleteObject*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "tests3stepfunctionsS3LoggingBucketF7586A92", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "tests3stepfunctionsS3LoggingBucketF7586A92", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, { "Action": "s3:PutObject", "Condition": { @@ -119,6 +164,25 @@ } } }, + "tests3stepfunctionsS3LoggingBucketAutoDeleteObjectsCustomResource7F12902B": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "tests3stepfunctionsS3LoggingBucketF7586A92" + } + }, + "DependsOn": [ + "tests3stepfunctionsS3LoggingBucketPolicyA69F8114" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, "tests3stepfunctionsS3Bucket2B08AD28": { "Type": "AWS::S3::Bucket", "Properties": { @@ -512,6 +576,82 @@ "Threshold": 1 } }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "tests3stepfunctionsS3LoggingBucketF7586A92" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ], + "Metadata": { + "cfn_nag": { + "rules_to_suppress": [ + { + "id": "W58", + "reason": "CDK generated custom resource" + }, + { + "id": "W89", + "reason": "CDK generated custom resource" + }, + { + "id": "W92", + "reason": "CDK generated custom resource" + } + ] + } + } + }, "BucketNotificationsHandler050a0587b7544547bf325f094a3db834RoleB6FB88EC": { "Type": "AWS::IAM::Role", "Properties": { diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-customLoggingBucket.ts similarity index 89% rename from source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-customLoggingBucket.ts index ae11eb701..c3f85b225 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-customLoggingBucket.ts @@ -16,7 +16,7 @@ import { App, Stack, RemovalPolicy } from "aws-cdk-lib"; import { BucketEncryption } from "aws-cdk-lib/aws-s3"; import { S3ToStepfunctions } from "../lib"; import * as stepfunctions from 'aws-cdk-lib/aws-stepfunctions'; -import { generateIntegStackName } from '@aws-solutions-constructs/core'; +import { generateIntegStackName, suppressAutoDeleteHandlerWarnings } from '@aws-solutions-constructs/core'; const app = new App(); @@ -34,6 +34,7 @@ new S3ToStepfunctions(stack, 'test-s3-stepfunctions', { }, loggingBucketProps: { removalPolicy: RemovalPolicy.DESTROY, + autoDeleteObjects: true, bucketName: 'custom-logging-bucket', encryption: BucketEncryption.S3_MANAGED, versioned: true @@ -44,4 +45,5 @@ new S3ToStepfunctions(stack, 'test-s3-stepfunctions', { } }); +suppressAutoDeleteHandlerWarnings(stack); app.synth(); 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.s3stp-pre-existing-bucket.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-pre-existing-bucket.expected.json index d6d2e344a..eea751b3e 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.s3stp-pre-existing-bucket.expected.json @@ -53,6 +53,7 @@ "Statement": [ { "Action": [ + "s3:PutBucketPolicy", "s3:GetBucket*", "s3:List*", "s3:DeleteObject*" @@ -160,7 +161,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5194f926380567b6fdffc61629afdad2afc818614cb227df45e499c69db163a7.zip" + "S3Key": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-pre-existing-bucket.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.pre-existing-bucket.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-pre-existing-bucket.ts 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.s3stp-s3-stepfunctions-no-argument.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.expected.json rename to source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-s3-stepfunctions-no-argument.expected.json index a0a1c4e60..08cf2043b 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.s3stp-s3-stepfunctions-no-argument.expected.json @@ -120,7 +120,7 @@ "Fn::Join": [ "", [ - "/aws/vendedlogs/states/constructs/s3-stepfunctions-no-argumenttest-s3-stepfunctions-construct-event-rule-step-function-constructStateMachineLog-", + "/aws/vendedlogs/states/constructs/s3stp-s3-stepfunctions-no-argumenttest-s3-stepfunctions-construct-event-rule-step-function-constructStateMachineLog-", { "Fn::Select": [ 2, diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.ts b/source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-s3-stepfunctions-no-argument.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3-stepfunctions-no-argument.ts rename to source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.s3stp-s3-stepfunctions-no-argument.ts 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.snslam-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.snslam-no-arguments.expected.json index 0eea518ec..7652a2031 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.snslam-no-arguments.expected.json @@ -139,7 +139,7 @@ } } }, - "testsnslambdaLambdaFunctionAllowInvokenoargumentstestsnslambdaSnsTopic42029AF3BAF184D6": { + "testsnslambdaLambdaFunctionAllowInvokesnslamnoargumentstestsnslambdaSnsTopicC2A3522489F066D4": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.snslam-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.snslam-no-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployFIFOQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployFIFOQueue.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployFIFOQueue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployFIFOQueue.expected.json index 5f61faead..423b8ebd4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployFIFOQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployFIFOQueue.expected.json @@ -33,6 +33,7 @@ "ImportedEncryptionKeyBE10B2FC": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -82,8 +83,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -91,6 +91,7 @@ "ImportedDLQEncryptionKeyDE178CD5": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -118,8 +119,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -323,18 +323,18 @@ ] } }, - "testsnssqsqueuedeployFIFOQueueTestTopicF4DE8F7CBB48A357": { + "testsnssqsqueuesnssqsdeployFIFOQueueTestTopicE42F11A6E8D5756E": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "TestTopic339EC197" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsqueueB02504BF", "Arn" ] + }, + "Protocol": "sqs", + "TopicArn": { + "Ref": "TestTopic339EC197" } }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployFIFOQueue.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployFIFOQueue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployFIFOQueue.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployFIFOQueue.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployStandardQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployStandardQueue.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployStandardQueue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployStandardQueue.expected.json index cb3600029..643fa8183 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployStandardQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployStandardQueue.expected.json @@ -32,6 +32,7 @@ "ImportedEncryptionKeyBE10B2FC": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -81,8 +82,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -90,6 +90,7 @@ "ImportedDLQEncryptionKeyDE178CD5": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -117,8 +118,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -320,18 +320,18 @@ ] } }, - "testsnssqsqueuedeployStandardQueueTestTopic883C28A0E3343345": { + "testsnssqsqueuesnssqsdeployStandardQueueTestTopic5DF390FB363A1845": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "TestTopic339EC197" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsqueueB02504BF", "Arn" ] + }, + "Protocol": "sqs", + "TopicArn": { + "Ref": "TestTopic339EC197" } }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployStandardQueue.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployStandardQueue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.deployStandardQueue.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-deployStandardQueue.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-existing-kms-key.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-existing-kms-key.expected.json index f8b9ea9e9..7c1a3e846 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-existing-kms-key.expected.json @@ -4,6 +4,7 @@ "ImportedEncryptionKeyBE10B2FC": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -53,8 +54,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -346,18 +346,18 @@ ] } }, - "testsnssqsqueueexistingkmskeytestsnssqsSnsTopic7983450BF2F0AE01": { + "testsnssqsqueuesnssqsexistingkmskeytestsnssqsSnsTopic38F01D270E0130B8": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "testsnssqsSnsTopic2CD0065B" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsqueueB02504BF", "Arn" ] + }, + "Protocol": "sqs", + "TopicArn": { + "Ref": "testsnssqsSnsTopic2CD0065B" } }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-existing-kms-key.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-existing-kms-key.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-no-arguments.expected.json index 718d86b59..0a8e04925 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-no-arguments.expected.json @@ -288,18 +288,18 @@ ] } }, - "testsnssqsstackqueuenoargumentstestsnssqsstackSnsTopic712B4DD27CD7036F": { + "testsnssqsstackqueuesnssqsnoargumentstestsnssqsstackSnsTopic716318502B9FD0D3": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "testsnssqsstackSnsTopic92693DD8" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsstackqueue908D8D48", "Arn" ] + }, + "Protocol": "sqs", + "TopicArn": { + "Ref": "testsnssqsstackSnsTopic92693DD8" } }, "DependsOn": [ @@ -309,6 +309,7 @@ "EncryptionKey1B843E66": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -384,8 +385,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-no-arguments.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.rawMessageDelivery.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-rawMessageDelivery.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.rawMessageDelivery.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-rawMessageDelivery.expected.json index 4f678f840..3bbb2200a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.rawMessageDelivery.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-rawMessageDelivery.expected.json @@ -4,6 +4,7 @@ "ImportedSQSEncryptionKey29533C9A": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -31,8 +32,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -372,13 +372,9 @@ ] } }, - "testsnssqsstackqueuerawMessageDeliverytestsnssqsstackSnsTopic1904512BF06EA9C9": { + "testsnssqsstackqueuesnssqsrawMessageDeliverytestsnssqsstackSnsTopic3172B66321A5F373": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "testsnssqsstackSnsTopic92693DD8" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsstackqueue908D8D48", @@ -423,6 +419,7 @@ } ] }, + "Protocol": "sqs", "RawMessageDelivery": true, "RedrivePolicy": { "deadLetterTargetArn": { @@ -431,6 +428,9 @@ "Arn" ] } + }, + "TopicArn": { + "Ref": "testsnssqsstackSnsTopic92693DD8" } }, "DependsOn": [ @@ -440,6 +440,7 @@ "EncryptionKey1B843E66": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -515,8 +516,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.rawMessageDelivery.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-rawMessageDelivery.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.rawMessageDelivery.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-rawMessageDelivery.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-existing-kms-key.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-existing-kms-key.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-existing-kms-key.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-existing-kms-key.expected.json index f76afdd87..b5d9ea36d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-existing-kms-key.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-existing-kms-key.expected.json @@ -4,6 +4,7 @@ "ImportedSNSEncryptionKeyF83F9D6C": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -31,8 +32,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -40,6 +40,7 @@ "ImportedSQSEncryptionKey29533C9A": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -89,8 +90,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -382,18 +382,18 @@ ] } }, - "testsnssqsqueuesnsexistingkmskeytestsnssqsSnsTopic7F8632A2DD832F81": { + "testsnssqsqueuesnssqssnsexistingkmskeytestsnssqsSnsTopic30156F8ACF5CBBE3": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "testsnssqsSnsTopic2CD0065B" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsqueueB02504BF", "Arn" ] + }, + "Protocol": "sqs", + "TopicArn": { + "Ref": "testsnssqsSnsTopic2CD0065B" } }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-existing-kms-key.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-existing-kms-key.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-existing-kms-key.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-existing-kms-key.ts diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.expected.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-managed-kms-key.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-managed-kms-key.expected.json index be698b623..13e8bf6ee 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-managed-kms-key.expected.json @@ -4,6 +4,7 @@ "ImportedSQSEncryptionKey29533C9A": { "Type": "AWS::KMS::Key", "Properties": { + "EnableKeyRotation": true, "KeyPolicy": { "Statement": [ { @@ -53,8 +54,7 @@ } ], "Version": "2012-10-17" - }, - "EnableKeyRotation": true + } }, "UpdateReplacePolicy": "Retain", "DeletionPolicy": "Retain" @@ -360,18 +360,18 @@ ] } }, - "testsnssqsqueuesnsmanagedkmskeytestsnssqsSnsTopicEE80A3561046D187": { + "testsnssqsqueuesnssqssnsmanagedkmskeytestsnssqsSnsTopicA513C5806E61C6C0": { "Type": "AWS::SNS::Subscription", "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "testsnssqsSnsTopic2CD0065B" - }, "Endpoint": { "Fn::GetAtt": [ "testsnssqsqueueB02504BF", "Arn" ] + }, + "Protocol": "sqs", + "TopicArn": { + "Ref": "testsnssqsSnsTopic2CD0065B" } }, "DependsOn": [ diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-managed-kms-key.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.ts rename to source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.snssqs-sns-managed-kms-key.ts 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.sqslam-deployFifoQueue.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-deployFifoQueue.expected.json index ffc3c0676..4202acbee 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.sqslam-deployFifoQueue.expected.json @@ -155,7 +155,7 @@ } } }, - "testsqslambdafifoLambdaFunctionSqsEventSourcedeployFifoQueuetestsqslambdafifoqueue90CAB7D6AF891A0A": { + "testsqslambdafifoLambdaFunctionSqsEventSourcesqslamdeployFifoQueuetestsqslambdafifoqueue471FB9167780560F": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-deployFifoQueue.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.ts rename to source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-deployFifoQueue.ts 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.sqslam-deployFunction.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-deployFunction.expected.json index dcc3a8016..043178078 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.sqslam-deployFunction.expected.json @@ -155,7 +155,7 @@ } } }, - "testsqslambdaLambdaFunctionSqsEventSourcedeployFunctiontestsqslambdaqueueC37BE757C660F26A": { + "testsqslambdaLambdaFunctionSqsEventSourcesqslamdeployFunctiontestsqslambdaqueueAA417393CB51C9D9": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-deployFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-deployFunction.ts 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.sqslam-existingFunction.expected.json similarity index 99% rename from source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.expected.json rename to source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-existingFunction.expected.json index 8f53e1154..126189fd0 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.sqslam-existingFunction.expected.json @@ -155,7 +155,7 @@ } } }, - "LambdaFunctionSqsEventSourceexistingFunctiontestsqslambdaqueue15248716FB07DA49": { + "LambdaFunctionSqsEventSourcesqslamexistingFunctiontestsqslambdaqueue1655244776FD943D": { "Type": "AWS::Lambda::EventSourceMapping", "Properties": { "EventSourceArn": { diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-existingFunction.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.ts rename to source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.sqslam-existingFunction.ts 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.wafalb-no-arguments.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.wafalb-no-arguments.expected.json index 575dddfb3..8e5a20751 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.wafalb-no-arguments.expected.json @@ -10,7 +10,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc" + "Value": "wafalb-no-arguments/Vpc" } ] } @@ -32,7 +32,7 @@ }, { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet1" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet1" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet1" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet1" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet1" } ] }, @@ -143,7 +143,7 @@ }, { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet2" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet2" } ], "VpcId": { @@ -167,7 +167,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet2" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet2" } ], "VpcId": { @@ -208,7 +208,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet2" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet2" } ] } @@ -228,7 +228,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet2" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet2" } ] }, @@ -254,7 +254,7 @@ }, { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet3" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet3" } ], "VpcId": { @@ -278,7 +278,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet3" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet3" } ], "VpcId": { @@ -319,7 +319,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet3" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet3" } ] } @@ -339,7 +339,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PublicSubnet3" + "Value": "wafalb-no-arguments/Vpc/PublicSubnet3" } ] }, @@ -365,7 +365,7 @@ }, { "Key": "Name", - "Value": "no-arguments/Vpc/PrivateSubnet1" + "Value": "wafalb-no-arguments/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -379,7 +379,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PrivateSubnet1" + "Value": "wafalb-no-arguments/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -427,7 +427,7 @@ }, { "Key": "Name", - "Value": "no-arguments/Vpc/PrivateSubnet2" + "Value": "wafalb-no-arguments/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -441,7 +441,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PrivateSubnet2" + "Value": "wafalb-no-arguments/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -489,7 +489,7 @@ }, { "Key": "Name", - "Value": "no-arguments/Vpc/PrivateSubnet3" + "Value": "wafalb-no-arguments/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -503,7 +503,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/PrivateSubnet3" + "Value": "wafalb-no-arguments/Vpc/PrivateSubnet3" } ], "VpcId": { @@ -540,7 +540,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc" + "Value": "wafalb-no-arguments/Vpc" } ] } @@ -574,7 +574,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/FlowLog" + "Value": "wafalb-no-arguments/Vpc/FlowLog" } ] } @@ -626,7 +626,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/FlowLog" + "Value": "wafalb-no-arguments/Vpc/FlowLog" } ] }, @@ -663,7 +663,7 @@ "Tags": [ { "Key": "Name", - "Value": "no-arguments/Vpc/FlowLog" + "Value": "wafalb-no-arguments/Vpc/FlowLog" } ], "TrafficType": "ALL" @@ -714,7 +714,7 @@ "newlbSecurityGroup04195C74": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "Automatically created Security Group for ELB noargumentsnewlb0B076C69", + "GroupDescription": "Automatically created Security Group for ELB wafalbnoargumentsnewlbD99D4109", "SecurityGroupEgress": [ { "CidrIp": "255.255.255.255/32", diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.wafalb-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-alb/test/integ.wafalb-no-arguments.ts 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.wafapi-existing-waf-to-multiple-gateways.expected.json similarity index 97% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-existing-waf-to-multiple-gateways.expected.json index f2926a264..0d1fc45b9 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.wafapi-existing-waf-to-multiple-gateways.expected.json @@ -194,7 +194,7 @@ } } }, - "testOneApiproxyANYApiPermissionexistingwaftomultiplegatewaystestOneApi22528807ANYproxy9ED2695E": { + "testOneApiproxyANYApiPermissionwafapiexistingwaftomultiplegatewaystestOneApiB9044B59ANYproxy1B0A478E": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -235,7 +235,7 @@ } } }, - "testOneApiproxyANYApiPermissionTestexistingwaftomultiplegatewaystestOneApi22528807ANYproxy55EEE701": { + "testOneApiproxyANYApiPermissionTestwafapiexistingwaftomultiplegatewaystestOneApiB9044B59ANYproxy0DF6631B": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -322,7 +322,7 @@ } } }, - "testOneApiANYApiPermissionexistingwaftomultiplegatewaystestOneApi22528807ANY278A4AFF": { + "testOneApiANYApiPermissionwafapiexistingwaftomultiplegatewaystestOneApiB9044B59ANYDB292C51": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -363,7 +363,7 @@ } } }, - "testOneApiANYApiPermissionTestexistingwaftomultiplegatewaystestOneApi22528807ANYBB10DF1E": { + "testOneApiANYApiPermissionTestwafapiexistingwaftomultiplegatewaystestOneApiB9044B59ANY2BFAB738": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -647,7 +647,7 @@ } } }, - "testTwoApiproxyANYApiPermissionexistingwaftomultiplegatewaystestTwoApiB96C8AF0ANYproxy40A72786": { + "testTwoApiproxyANYApiPermissionwafapiexistingwaftomultiplegatewaystestTwoApi3F5A8986ANYproxy1DFBDD22": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -688,7 +688,7 @@ } } }, - "testTwoApiproxyANYApiPermissionTestexistingwaftomultiplegatewaystestTwoApiB96C8AF0ANYproxyC55E58D0": { + "testTwoApiproxyANYApiPermissionTestwafapiexistingwaftomultiplegatewaystestTwoApi3F5A8986ANYproxy0FCB1905": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -775,7 +775,7 @@ } } }, - "testTwoApiANYApiPermissionexistingwaftomultiplegatewaystestTwoApiB96C8AF0ANYD7D25755": { + "testTwoApiANYApiPermissionwafapiexistingwaftomultiplegatewaystestTwoApi3F5A8986ANY258342E0": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -816,7 +816,7 @@ } } }, - "testTwoApiANYApiPermissionTestexistingwaftomultiplegatewaystestTwoApiB96C8AF0ANY2726789F": { + "testTwoApiANYApiPermissionTestwafapiexistingwaftomultiplegatewaystestTwoApi3F5A8986ANY6B2BB285": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-existing-waf-to-multiple-gateways.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-existing-waf-to-multiple-gateways.ts 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.wafapi-no-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-no-arguments.expected.json index 7828ece80..9d9a39774 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.wafapi-no-arguments.expected.json @@ -194,7 +194,7 @@ } } }, - "testApiproxyANYApiPermissionnoargumentstestApiE7931390ANYproxy64013C99": { + "testApiproxyANYApiPermissionwafapinoargumentstestApi4B407520ANYproxy10A0B1BE": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -235,7 +235,7 @@ } } }, - "testApiproxyANYApiPermissionTestnoargumentstestApiE7931390ANYproxyB62320D7": { + "testApiproxyANYApiPermissionTestwafapinoargumentstestApi4B407520ANYproxyE3EA6B08": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -322,7 +322,7 @@ } } }, - "testApiANYApiPermissionnoargumentstestApiE7931390ANYC253B3F4": { + "testApiANYApiPermissionwafapinoargumentstestApi4B407520ANY9475DCE2": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -363,7 +363,7 @@ } } }, - "testApiANYApiPermissionTestnoargumentstestApiE7931390ANYB623D7E8": { + "testApiANYApiPermissionTestwafapinoargumentstestApi4B407520ANYA4D7C2D5": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-no-arguments.ts 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.wafapi-partial-arguments.expected.json similarity index 98% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-partial-arguments.expected.json index 2bb675390..87d37dc69 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.wafapi-partial-arguments.expected.json @@ -194,7 +194,7 @@ } } }, - "testApiproxyANYApiPermissionpartialargumentstestApi67E53489ANYproxyD442645B": { + "testApiproxyANYApiPermissionwafapipartialargumentstestApi4A48F3FBANYproxyAE6A25BF": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -235,7 +235,7 @@ } } }, - "testApiproxyANYApiPermissionTestpartialargumentstestApi67E53489ANYproxyA0A33584": { + "testApiproxyANYApiPermissionTestwafapipartialargumentstestApi4A48F3FBANYproxy2829A2A7": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -322,7 +322,7 @@ } } }, - "testApiANYApiPermissionpartialargumentstestApi67E53489ANY0CE0FBBB": { + "testApiANYApiPermissionwafapipartialargumentstestApi4A48F3FBANY92439CB8": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", @@ -363,7 +363,7 @@ } } }, - "testApiANYApiPermissionTestpartialargumentstestApi67E53489ANYFA990832": { + "testApiANYApiPermissionTestwafapipartialargumentstestApi4A48F3FBANY15778CF5": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-partial-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.partial-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.wafapi-partial-arguments.ts 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.wafaps-no-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.wafaps-no-arguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.wafaps-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.wafaps-no-arguments.ts 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.wafaps-partial-arguments.expected.json similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.wafaps-partial-arguments.expected.json diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.wafaps-partial-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.partial-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-appsync/test/integ.wafaps-partial-arguments.ts 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.wafcft-existing-waf-to-multiple-cloudfront.expected.json similarity index 89% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-existing-waf-to-multiple-cloudfront.expected.json index 1dd044136..f14be6611 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.wafcft-existing-waf-to-multiple-cloudfront.expected.json @@ -7,7 +7,7 @@ "DefaultCacheBehavior": { "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6", "Compress": true, - "TargetOriginId": "existingwaftomultiplecloudfrontdistroOneOriginGroup16F812E2D", + "TargetOriginId": "wafcftexistingwaftomultiplecloudfrontdistroOneOriginGroup16D711F19", "ViewerProtocolPolicy": "allow-all" }, "Enabled": true, @@ -24,14 +24,14 @@ "Quantity": 1 } }, - "Id": "existingwaftomultiplecloudfrontdistroOneOriginGroup16F812E2D", + "Id": "wafcftexistingwaftomultiplecloudfrontdistroOneOriginGroup16D711F19", "Members": { "Items": [ { - "OriginId": "existingwaftomultiplecloudfrontdistroOneOrigin1720378E5" + "OriginId": "wafcftexistingwaftomultiplecloudfrontdistroOneOrigin17FBA6436" }, { - "OriginId": "existingwaftomultiplecloudfrontdistroOneOrigin274CE21CE" + "OriginId": "wafcftexistingwaftomultiplecloudfrontdistroOneOrigin23A024C57" } ], "Quantity": 2 @@ -49,7 +49,7 @@ ] }, "DomainName": "www.example.com", - "Id": "existingwaftomultiplecloudfrontdistroOneOrigin1720378E5" + "Id": "wafcftexistingwaftomultiplecloudfrontdistroOneOrigin17FBA6436" }, { "CustomOriginConfig": { @@ -59,7 +59,7 @@ ] }, "DomainName": "admin.example.com", - "Id": "existingwaftomultiplecloudfrontdistroOneOrigin274CE21CE" + "Id": "wafcftexistingwaftomultiplecloudfrontdistroOneOrigin23A024C57" } ], "WebACLId": { @@ -92,7 +92,7 @@ "DefaultCacheBehavior": { "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6", "Compress": true, - "TargetOriginId": "existingwaftomultiplecloudfrontdistroTwoOriginGroup1DD80530C", + "TargetOriginId": "wafcftexistingwaftomultiplecloudfrontdistroTwoOriginGroup1786AF0DE", "ViewerProtocolPolicy": "allow-all" }, "Enabled": true, @@ -109,14 +109,14 @@ "Quantity": 1 } }, - "Id": "existingwaftomultiplecloudfrontdistroTwoOriginGroup1DD80530C", + "Id": "wafcftexistingwaftomultiplecloudfrontdistroTwoOriginGroup1786AF0DE", "Members": { "Items": [ { - "OriginId": "existingwaftomultiplecloudfrontdistroTwoOrigin1E5A746DE" + "OriginId": "wafcftexistingwaftomultiplecloudfrontdistroTwoOrigin17844DE3F" }, { - "OriginId": "existingwaftomultiplecloudfrontdistroTwoOrigin22FA0DC4A" + "OriginId": "wafcftexistingwaftomultiplecloudfrontdistroTwoOrigin210278EB5" } ], "Quantity": 2 @@ -134,7 +134,7 @@ ] }, "DomainName": "www.example.com", - "Id": "existingwaftomultiplecloudfrontdistroTwoOrigin1E5A746DE" + "Id": "wafcftexistingwaftomultiplecloudfrontdistroTwoOrigin17844DE3F" }, { "CustomOriginConfig": { @@ -144,7 +144,7 @@ ] }, "DomainName": "admin.example.com", - "Id": "existingwaftomultiplecloudfrontdistroTwoOrigin22FA0DC4A" + "Id": "wafcftexistingwaftomultiplecloudfrontdistroTwoOrigin210278EB5" } ], "WebACLId": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-existing-waf-to-multiple-cloudfront.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.existing-waf-to-multiple-cloudfront.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-existing-waf-to-multiple-cloudfront.ts 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.wafcft-no-arguments.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-no-arguments.expected.json index 65721a0dd..291afbbd9 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.wafcft-no-arguments.expected.json @@ -7,7 +7,7 @@ "DefaultCacheBehavior": { "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6", "Compress": true, - "TargetOriginId": "noargumentsdistroOriginGroup1DC74B51C", + "TargetOriginId": "wafcftnoargumentsdistroOriginGroup1D51155E2", "ViewerProtocolPolicy": "allow-all" }, "Enabled": true, @@ -24,14 +24,14 @@ "Quantity": 1 } }, - "Id": "noargumentsdistroOriginGroup1DC74B51C", + "Id": "wafcftnoargumentsdistroOriginGroup1D51155E2", "Members": { "Items": [ { - "OriginId": "noargumentsdistroOrigin1337DEB39" + "OriginId": "wafcftnoargumentsdistroOrigin13A0BEDF7" }, { - "OriginId": "noargumentsdistroOrigin207F6D139" + "OriginId": "wafcftnoargumentsdistroOrigin210710A25" } ], "Quantity": 2 @@ -49,7 +49,7 @@ ] }, "DomainName": "www.example.com", - "Id": "noargumentsdistroOrigin1337DEB39" + "Id": "wafcftnoargumentsdistroOrigin13A0BEDF7" }, { "CustomOriginConfig": { @@ -59,7 +59,7 @@ ] }, "DomainName": "admin.example.com", - "Id": "noargumentsdistroOrigin207F6D139" + "Id": "wafcftnoargumentsdistroOrigin210710A25" } ], "WebACLId": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-no-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.no-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-no-arguments.ts 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.wafcft-partial-arguments.expected.json similarity index 94% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.expected.json rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-partial-arguments.expected.json index dce1c2672..4743639ba 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.wafcft-partial-arguments.expected.json @@ -7,7 +7,7 @@ "DefaultCacheBehavior": { "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6", "Compress": true, - "TargetOriginId": "partialargumentsdistroOriginGroup13A14546B", + "TargetOriginId": "wafcftpartialargumentsdistroOriginGroup12A48644F", "ViewerProtocolPolicy": "allow-all" }, "Enabled": true, @@ -24,14 +24,14 @@ "Quantity": 1 } }, - "Id": "partialargumentsdistroOriginGroup13A14546B", + "Id": "wafcftpartialargumentsdistroOriginGroup12A48644F", "Members": { "Items": [ { - "OriginId": "partialargumentsdistroOrigin1D2A7BC52" + "OriginId": "wafcftpartialargumentsdistroOrigin1C84D3821" }, { - "OriginId": "partialargumentsdistroOrigin2689E5A52" + "OriginId": "wafcftpartialargumentsdistroOrigin240311680" } ], "Quantity": 2 @@ -49,7 +49,7 @@ ] }, "DomainName": "www.example.com", - "Id": "partialargumentsdistroOrigin1D2A7BC52" + "Id": "wafcftpartialargumentsdistroOrigin1C84D3821" }, { "CustomOriginConfig": { @@ -59,7 +59,7 @@ ] }, "DomainName": "admin.example.com", - "Id": "partialargumentsdistroOrigin2689E5A52" + "Id": "wafcftpartialargumentsdistroOrigin240311680" } ], "WebACLId": { diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-partial-arguments.ts similarity index 100% rename from source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.partial-arguments.ts rename to source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/test/integ.wafcft-partial-arguments.ts