From 6ed62f7b260b7a3e297fc21446300e09aa81a2e9 Mon Sep 17 00:00:00 2001 From: Henry Wilson Date: Fri, 16 Feb 2024 15:49:57 +0000 Subject: [PATCH] test(synthetics): updated integration test snapshot --- ...efaultTestDeployAssert3AD5A094.assets.json | 4 +- ...aultTestDeployAssert3AD5A094.template.json | 209 +------- .../canary-one.assets.json | 4 +- .../canary-one.template.json | 255 --------- .../integ.canary.js.snapshot/manifest.json | 121 ++--- .../test/integ.canary.js.snapshot/tree.json | 493 ------------------ 6 files changed, 60 insertions(+), 1026 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.assets.json index cf7a576f8cdd6..9da85e7d5cdcc 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.assets.json @@ -14,7 +14,7 @@ } } }, - "ee9407993a16e314ccc5619b8696d81fce7c51614e78f797b6199b3baed7e780": { + "5222f77a218b1c67430bb8086fc0c058075ebfaf5eadf0c2c4ce5a54a1fadf5a": { "source": { "path": "IntegCanaryTestDefaultTestDeployAssert3AD5A094.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "ee9407993a16e314ccc5619b8696d81fce7c51614e78f797b6199b3baed7e780.json", + "objectKey": "5222f77a218b1c67430bb8086fc0c058075ebfaf5eadf0c2c4ce5a54a1fadf5a.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.template.json index 2315bb42f778b..3b7db7aa118b9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/IntegCanaryTestDefaultTestDeployAssert3AD5A094.template.json @@ -34,7 +34,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481011" + "salt": "1708098560175" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -335,24 +335,6 @@ "*" ] }, - { - "Action": [ - "states:StartExecution" - ], - "Effect": "Allow", - "Resource": [ - "*" - ] - }, - { - "Action": [ - "synthetics:GetCanaryRuns" - ], - "Effect": "Allow", - "Resource": [ - "*" - ] - }, { "Action": [ "states:StartExecution" @@ -486,15 +468,6 @@ "*" ] }, - { - "Action": [ - "synthetics:GetCanaryRuns" - ], - "Effect": "Allow", - "Resource": [ - "*" - ] - }, { "Action": [ "synthetics:GetCanaryRuns" @@ -606,7 +579,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481012" + "salt": "1708098560176" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -762,7 +735,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481013" + "salt": "1708098560177" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -918,7 +891,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481013" + "salt": "1708098560177" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -1040,162 +1013,6 @@ "AwsApiCallSyntheticsgetCanaryRunsaf0432d0aeabb461c9a56a62dba7b6feWaitForRole0C9EEFC1" ] }, - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae": { - "Type": "Custom::DeployAssert@SdkCallSyntheticsgetCanaryRuns", - "Properties": { - "ServiceToken": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F", - "Arn" - ] - }, - "service": "Synthetics", - "api": "getCanaryRuns", - "expected": "{\"$StringLike\":\"PASSED\"}", - "actualPath": "CanaryRuns.0.Status.State", - "stateMachineArn": { - "Ref": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitFor2AE5B3D5" - }, - "parameters": { - "Name": { - "Fn::Join": [ - "", - [ - "\"", - { - "Fn::ImportValue": "canary-one:ExportsOutputRefSynNodejsPuppeteer3978815E0AC2F26208" - }, - "\"" - ] - ] - } - }, - "flattenResponse": "true", - "outputPaths": [ - "CanaryRuns.0.Status.State" - ], - "salt": "1708097481014" - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForIsCompleteProviderInvokeEFBEE0D2": { - "Type": "AWS::Lambda::Permission", - "Properties": { - "Action": "lambda:InvokeFunction", - "FunctionName": { - "Fn::GetAtt": [ - "SingletonFunction76b3e830a873425f8453eddd85c86925Handler81461ECE", - "Arn" - ] - }, - "Principal": { - "Fn::GetAtt": [ - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForRoleF3F1B67B", - "Arn" - ] - } - } - }, - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForTimeoutProviderInvoke0A0F7C7B": { - "Type": "AWS::Lambda::Permission", - "Properties": { - "Action": "lambda:InvokeFunction", - "FunctionName": { - "Fn::GetAtt": [ - "SingletonFunction5c1898e096fb4e3e95d5f6c67f3ce41aHandlerADF3E6EA", - "Arn" - ] - }, - "Principal": { - "Fn::GetAtt": [ - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForRoleF3F1B67B", - "Arn" - ] - } - } - }, - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForRoleF3F1B67B": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Version": "2012-10-17", - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "states.amazonaws.com" - } - } - ] - }, - "Policies": [ - { - "PolicyName": "InlineInvokeFunctions", - "PolicyDocument": { - "Version": "2012-10-17", - "Statement": [ - { - "Action": "lambda:InvokeFunction", - "Effect": "Allow", - "Resource": [ - { - "Fn::GetAtt": [ - "SingletonFunction76b3e830a873425f8453eddd85c86925Handler81461ECE", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "SingletonFunction5c1898e096fb4e3e95d5f6c67f3ce41aHandlerADF3E6EA", - "Arn" - ] - } - ] - } - ] - } - } - ] - } - }, - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitFor2AE5B3D5": { - "Type": "AWS::StepFunctions::StateMachine", - "Properties": { - "DefinitionString": { - "Fn::Join": [ - "", - [ - "{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":5,\"MaxAttempts\":60,\"BackoffRate\":1}],\"Catch\":[{\"ErrorEquals\":[\"States.ALL\"],\"Next\":\"framework-onTimeout-task\"}],\"Type\":\"Task\",\"Resource\":\"", - { - "Fn::GetAtt": [ - "SingletonFunction76b3e830a873425f8453eddd85c86925Handler81461ECE", - "Arn" - ] - }, - "\"},\"framework-onTimeout-task\":{\"End\":true,\"Type\":\"Task\",\"Resource\":\"", - { - "Fn::GetAtt": [ - "SingletonFunction5c1898e096fb4e3e95d5f6c67f3ce41aHandlerADF3E6EA", - "Arn" - ] - }, - "\"}}}" - ] - ] - }, - "RoleArn": { - "Fn::GetAtt": [ - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForRoleF3F1B67B", - "Arn" - ] - } - }, - "DependsOn": [ - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForRoleF3F1B67B" - ] - }, "AwsApiCallSyntheticsgetCanaryRunse77bc009769f8becf2bba8ec443d0a60": { "Type": "Custom::DeployAssert@SdkCallSyntheticsgetCanaryRuns", "Properties": { @@ -1230,7 +1047,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481014" + "salt": "1708098560177" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -1386,7 +1203,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481014" + "salt": "1708098560178" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -1542,7 +1359,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481015" + "salt": "1708098560178" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -1698,7 +1515,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481015" + "salt": "1708098560178" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -1854,7 +1671,7 @@ "outputPaths": [ "CanaryRuns.0.Status.State" ], - "salt": "1708097481015" + "salt": "1708098560179" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" @@ -2010,14 +1827,6 @@ ] } }, - "AssertionResultsAwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae": { - "Value": { - "Fn::GetAtt": [ - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae", - "assertion" - ] - } - }, "AssertionResultsAwsApiCallSyntheticsgetCanaryRunse77bc009769f8becf2bba8ec443d0a60": { "Value": { "Fn::GetAtt": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.assets.json index fed95a9070314..9476666a05aba 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.assets.json @@ -53,7 +53,7 @@ } } }, - "f478dc43927b756395222f7dc79ca0f9b77a2d9626f81dfdaa596da586196b5b": { + "a084e2781e9799cdbf79f61a1e48791de68f996748cbf9a82d4df5ebe1259373": { "source": { "path": "canary-one.template.json", "packaging": "file" @@ -61,7 +61,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "f478dc43927b756395222f7dc79ca0f9b77a2d9626f81dfdaa596da586196b5b.json", + "objectKey": "a084e2781e9799cdbf79f61a1e48791de68f996748cbf9a82d4df5ebe1259373.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.template.json index 0025f684eea48..1fc8936a16471 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/canary-one.template.json @@ -1181,253 +1181,6 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932": { - "Type": "AWS::S3::Bucket", - "Properties": { - "BucketEncryption": { - "ServerSideEncryptionConfiguration": [ - { - "ServerSideEncryptionByDefault": { - "SSEAlgorithm": "aws:kms" - } - } - ] - } - }, - "UpdateReplacePolicy": "Retain", - "DeletionPolicy": "Retain" - }, - "SynNodejsPuppeteer39ArtifactsBucketPolicy502FE6AD": { - "Type": "AWS::S3::BucketPolicy", - "Properties": { - "Bucket": { - "Ref": "SynNodejsPuppeteer39ArtifactsBucketC3BBB932" - }, - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - } - ], - "Version": "2012-10-17" - } - } - }, - "SynNodejsPuppeteer39ServiceRole946A595A": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "Policies": [ - { - "PolicyDocument": { - "Statement": [ - { - "Action": "s3:ListAllMyBuckets", - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": "s3:GetBucketLocation", - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - } - }, - { - "Action": "s3:PutObject", - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - }, - "/*" - ] - ] - } - }, - { - "Action": "cloudwatch:PutMetricData", - "Condition": { - "StringEquals": { - "cloudwatch:namespace": "CloudWatchSynthetics" - } - }, - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "logs:CreateLogGroup", - "logs:CreateLogStream", - "logs:PutLogEvents" - ], - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":logs:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":log-group:/aws/lambda/cwsyn-*" - ] - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "canaryPolicy" - } - ] - } - }, - "SynNodejsPuppeteer3978815E0A": { - "Type": "AWS::Synthetics::Canary", - "Properties": { - "ArtifactS3Location": { - "Fn::Join": [ - "", - [ - "s3://", - { - "Ref": "SynNodejsPuppeteer39ArtifactsBucketC3BBB932" - } - ] - ] - }, - "Code": { - "Handler": "canary.handler", - "S3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "S3Key": "d6b51cbdd22d449b9e57c20ef9d0977e1cfbf06806f8008ce376101a2ad432a8.zip" - }, - "ExecutionRoleArn": { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ServiceRole946A595A", - "Arn" - ] - }, - "Name": "canaryonesynnodec5378", - "RunConfig": { - "EnvironmentVariables": { - "URL": { - "Fn::Join": [ - "", - [ - "https://", - { - "Ref": "ApiGateway11E7F47B" - }, - ".execute-api.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Ref": "ApiGatewayDeploymentStageprod1C6D5CD6" - }, - "/" - ] - ] - } - } - }, - "RuntimeVersion": "syn-nodejs-puppeteer-3.9", - "Schedule": { - "DurationInSeconds": "0", - "Expression": "rate(5 minutes)" - }, - "StartCanaryAfterCreation": true, - "Tags": [ - { - "Key": "aws-cdk:auto-delete-underlying-resources", - "Value": "true" - } - ] - } - }, - "SynNodejsPuppeteer39AutoDeleteUnderlyingResourcesCustomResourceB6D0DB57": { - "Type": "Custom::SyntheticsAutoDeleteUnderlyingResources", - "Properties": { - "ServiceToken": { - "Fn::GetAtt": [ - "CustomSyntheticsAutoDeleteUnderlyingResourcesCustomResourceProviderHandler26776D4E", - "Arn" - ] - }, - "CanaryName": { - "Ref": "SynNodejsPuppeteer3978815E0A" - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, "SynNodejsPuppeteer40ArtifactsBucket30A9D9DC": { "Type": "AWS::S3::Bucket", "Properties": { @@ -2723,14 +2476,6 @@ "Name": "canary-one:ExportsOutputRefZipAssetA028C65FBA619339" } }, - "ExportsOutputRefSynNodejsPuppeteer3978815E0AC2F26208": { - "Value": { - "Ref": "SynNodejsPuppeteer3978815E0A" - }, - "Export": { - "Name": "canary-one:ExportsOutputRefSynNodejsPuppeteer3978815E0AC2F26208" - } - }, "ExportsOutputRefSynNodejsPuppeteer406C46FFAF8F9722F2": { "Value": { "Ref": "SynNodejsPuppeteer406C46FFAF" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/manifest.json index 3cef52bd55da2..bb6abeb625d6c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/manifest.json @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f478dc43927b756395222f7dc79ca0f9b77a2d9626f81dfdaa596da586196b5b.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a084e2781e9799cdbf79f61a1e48791de68f996748cbf9a82d4df5ebe1259373.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -214,36 +214,6 @@ "data": "ZipAssetAutoDeleteUnderlyingResourcesCustomResource0AD8D2D4" } ], - "/canary-one/SynNodejsPuppeteer39/ArtifactsBucket/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "SynNodejsPuppeteer39ArtifactsBucketC3BBB932" - } - ], - "/canary-one/SynNodejsPuppeteer39/ArtifactsBucket/Policy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "SynNodejsPuppeteer39ArtifactsBucketPolicy502FE6AD" - } - ], - "/canary-one/SynNodejsPuppeteer39/ServiceRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "SynNodejsPuppeteer39ServiceRole946A595A" - } - ], - "/canary-one/SynNodejsPuppeteer39/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "SynNodejsPuppeteer3978815E0A" - } - ], - "/canary-one/SynNodejsPuppeteer39/AutoDeleteUnderlyingResourcesCustomResource/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "SynNodejsPuppeteer39AutoDeleteUnderlyingResourcesCustomResourceB6D0DB57" - } - ], "/canary-one/SynNodejsPuppeteer40/ArtifactsBucket/Resource": [ { "type": "aws:cdk:logicalId", @@ -418,12 +388,6 @@ "data": "ExportsOutputRefZipAssetA028C65FBA619339" } ], - "/canary-one/Exports/Output{\"Ref\":\"SynNodejsPuppeteer3978815E0A\"}": [ - { - "type": "aws:cdk:logicalId", - "data": "ExportsOutputRefSynNodejsPuppeteer3978815E0AC2F26208" - } - ], "/canary-one/Exports/Output{\"Ref\":\"SynNodejsPuppeteer406C46FFAF\"}": [ { "type": "aws:cdk:logicalId", @@ -465,6 +429,51 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } + ], + "SynNodejsPuppeteer39ArtifactsBucketC3BBB932": [ + { + "type": "aws:cdk:logicalId", + "data": "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "SynNodejsPuppeteer39ArtifactsBucketPolicy502FE6AD": [ + { + "type": "aws:cdk:logicalId", + "data": "SynNodejsPuppeteer39ArtifactsBucketPolicy502FE6AD", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "SynNodejsPuppeteer39ServiceRole946A595A": [ + { + "type": "aws:cdk:logicalId", + "data": "SynNodejsPuppeteer39ServiceRole946A595A", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "SynNodejsPuppeteer3978815E0A": [ + { + "type": "aws:cdk:logicalId", + "data": "SynNodejsPuppeteer3978815E0A", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "SynNodejsPuppeteer39AutoDeleteUnderlyingResourcesCustomResourceB6D0DB57": [ + { + "type": "aws:cdk:logicalId", + "data": "SynNodejsPuppeteer39AutoDeleteUnderlyingResourcesCustomResourceB6D0DB57", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } ] }, "displayName": "canary-one" @@ -486,7 +495,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ee9407993a16e314ccc5619b8696d81fce7c51614e78f797b6199b3baed7e780.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/5222f77a218b1c67430bb8086fc0c058075ebfaf5eadf0c2c4ce5a54a1fadf5a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -683,42 +692,6 @@ "data": "AssertionResultsAwsApiCallSyntheticsgetCanaryRunsaf0432d0aeabb461c9a56a62dba7b6fe" } ], - "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/Default/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae" - } - ], - "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/IsCompleteProvider/Invoke": [ - { - "type": "aws:cdk:logicalId", - "data": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForIsCompleteProviderInvokeEFBEE0D2" - } - ], - "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/TimeoutProvider/Invoke": [ - { - "type": "aws:cdk:logicalId", - "data": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForTimeoutProviderInvoke0A0F7C7B" - } - ], - "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/Role": [ - { - "type": "aws:cdk:logicalId", - "data": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitForRoleF3F1B67B" - } - ], - "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5aeWaitFor2AE5B3D5" - } - ], - "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/AssertionResults": [ - { - "type": "aws:cdk:logicalId", - "data": "AssertionResultsAwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae" - } - ], "/IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRunse77bc009769f8becf2bba8ec443d0a60/Default/Default": [ { "type": "aws:cdk:logicalId", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/tree.json index 1bfa49c792d52..4529ddbf0c4b0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary.js.snapshot/tree.json @@ -1582,359 +1582,6 @@ "version": "0.0.0" } }, - "SynNodejsPuppeteer39": { - "id": "SynNodejsPuppeteer39", - "path": "canary-one/SynNodejsPuppeteer39", - "children": { - "ArtifactsBucket": { - "id": "ArtifactsBucket", - "path": "canary-one/SynNodejsPuppeteer39/ArtifactsBucket", - "children": { - "Resource": { - "id": "Resource", - "path": "canary-one/SynNodejsPuppeteer39/ArtifactsBucket/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::S3::Bucket", - "aws:cdk:cloudformation:props": { - "bucketEncryption": { - "serverSideEncryptionConfiguration": [ - { - "serverSideEncryptionByDefault": { - "sseAlgorithm": "aws:kms" - } - } - ] - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.CfnBucket", - "version": "0.0.0" - } - }, - "Policy": { - "id": "Policy", - "path": "canary-one/SynNodejsPuppeteer39/ArtifactsBucket/Policy", - "children": { - "Resource": { - "id": "Resource", - "path": "canary-one/SynNodejsPuppeteer39/ArtifactsBucket/Policy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::S3::BucketPolicy", - "aws:cdk:cloudformation:props": { - "bucket": { - "Ref": "SynNodejsPuppeteer39ArtifactsBucketC3BBB932" - }, - "policyDocument": { - "Statement": [ - { - "Action": "s3:*", - "Condition": { - "Bool": { - "aws:SecureTransport": "false" - } - }, - "Effect": "Deny", - "Principal": { - "AWS": "*" - }, - "Resource": [ - { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - }, - "/*" - ] - ] - } - ] - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.CfnBucketPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.Bucket", - "version": "0.0.0" - } - }, - "ServiceRole": { - "id": "ServiceRole", - "path": "canary-one/SynNodejsPuppeteer39/ServiceRole", - "children": { - "ImportServiceRole": { - "id": "ImportServiceRole", - "path": "canary-one/SynNodejsPuppeteer39/ServiceRole/ImportServiceRole", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "canary-one/SynNodejsPuppeteer39/ServiceRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "policies": [ - { - "policyName": "canaryPolicy", - "policyDocument": { - "Statement": [ - { - "Action": "s3:ListAllMyBuckets", - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": "s3:GetBucketLocation", - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - } - }, - { - "Action": "s3:PutObject", - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ArtifactsBucketC3BBB932", - "Arn" - ] - }, - "/*" - ] - ] - } - }, - { - "Action": "cloudwatch:PutMetricData", - "Condition": { - "StringEquals": { - "cloudwatch:namespace": "CloudWatchSynthetics" - } - }, - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "logs:CreateLogGroup", - "logs:CreateLogStream", - "logs:PutLogEvents" - ], - "Effect": "Allow", - "Resource": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":logs:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":log-group:/aws/lambda/cwsyn-*" - ] - ] - } - } - ], - "Version": "2012-10-17" - } - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "0.0.0" - } - }, - "Code": { - "id": "Code", - "path": "canary-one/SynNodejsPuppeteer39/Code", - "children": { - "Stage": { - "id": "Stage", - "path": "canary-one/SynNodejsPuppeteer39/Code/Stage", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" - } - }, - "AssetBucket": { - "id": "AssetBucket", - "path": "canary-one/SynNodejsPuppeteer39/Code/AssetBucket", - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "canary-one/SynNodejsPuppeteer39/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Synthetics::Canary", - "aws:cdk:cloudformation:props": { - "artifactS3Location": { - "Fn::Join": [ - "", - [ - "s3://", - { - "Ref": "SynNodejsPuppeteer39ArtifactsBucketC3BBB932" - } - ] - ] - }, - "code": { - "handler": "canary.handler", - "s3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "s3Key": "d6b51cbdd22d449b9e57c20ef9d0977e1cfbf06806f8008ce376101a2ad432a8.zip" - }, - "executionRoleArn": { - "Fn::GetAtt": [ - "SynNodejsPuppeteer39ServiceRole946A595A", - "Arn" - ] - }, - "name": "canaryonesynnodec5378", - "runConfig": { - "environmentVariables": { - "URL": { - "Fn::Join": [ - "", - [ - "https://", - { - "Ref": "ApiGateway11E7F47B" - }, - ".execute-api.", - { - "Ref": "AWS::Region" - }, - ".", - { - "Ref": "AWS::URLSuffix" - }, - "/", - { - "Ref": "ApiGatewayDeploymentStageprod1C6D5CD6" - }, - "/" - ] - ] - } - } - }, - "runtimeVersion": "syn-nodejs-puppeteer-3.9", - "schedule": { - "durationInSeconds": "0", - "expression": "rate(5 minutes)" - }, - "startCanaryAfterCreation": true, - "tags": [ - { - "key": "aws-cdk:auto-delete-underlying-resources", - "value": "true" - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_synthetics.CfnCanary", - "version": "0.0.0" - } - }, - "AutoDeleteUnderlyingResourcesCustomResource": { - "id": "AutoDeleteUnderlyingResourcesCustomResource", - "path": "canary-one/SynNodejsPuppeteer39/AutoDeleteUnderlyingResourcesCustomResource", - "children": { - "Default": { - "id": "Default", - "path": "canary-one/SynNodejsPuppeteer39/AutoDeleteUnderlyingResourcesCustomResource/Default", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_synthetics.Canary", - "version": "0.0.0" - } - }, "SynNodejsPuppeteer40": { "id": "SynNodejsPuppeteer40", "path": "canary-one/SynNodejsPuppeteer40", @@ -3736,14 +3383,6 @@ "version": "0.0.0" } }, - "Output{\"Ref\":\"SynNodejsPuppeteer3978815E0A\"}": { - "id": "Output{\"Ref\":\"SynNodejsPuppeteer3978815E0A\"}", - "path": "canary-one/Exports/Output{\"Ref\":\"SynNodejsPuppeteer3978815E0A\"}", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "0.0.0" - } - }, "Output{\"Ref\":\"SynNodejsPuppeteer406C46FFAF\"}": { "id": "Output{\"Ref\":\"SynNodejsPuppeteer406C46FFAF\"}", "path": "canary-one/Exports/Output{\"Ref\":\"SynNodejsPuppeteer406C46FFAF\"}", @@ -4462,138 +4101,6 @@ "version": "0.0.0" } }, - "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae": { - "id": "AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae", - "children": { - "SdkProvider": { - "id": "SdkProvider", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/SdkProvider", - "children": { - "AssertionsProvider": { - "id": "AssertionsProvider", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/SdkProvider/AssertionsProvider", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "0.0.0" - } - }, - "Default": { - "id": "Default", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/Default", - "children": { - "Default": { - "id": "Default", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/Default/Default", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" - } - }, - "WaitFor": { - "id": "WaitFor", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor", - "children": { - "IsCompleteProvider": { - "id": "IsCompleteProvider", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/IsCompleteProvider", - "children": { - "AssertionsProvider": { - "id": "AssertionsProvider", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/IsCompleteProvider/AssertionsProvider", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" - } - }, - "Invoke": { - "id": "Invoke", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/IsCompleteProvider/Invoke", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "0.0.0" - } - }, - "TimeoutProvider": { - "id": "TimeoutProvider", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/TimeoutProvider", - "children": { - "AssertionsProvider": { - "id": "AssertionsProvider", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/TimeoutProvider/AssertionsProvider", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" - } - }, - "Invoke": { - "id": "Invoke", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/TimeoutProvider/Invoke", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "0.0.0" - } - }, - "Role": { - "id": "Role", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/Role", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/WaitFor/Resource", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.WaiterStateMachine", - "version": "0.0.0" - } - }, - "AssertionResults": { - "id": "AssertionResults", - "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRuns2cca2de7ae72f8b5fe89f0c7e484d5ae/AssertionResults", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AwsApiCall", - "version": "0.0.0" - } - }, "AwsApiCallSyntheticsgetCanaryRunse77bc009769f8becf2bba8ec443d0a60": { "id": "AwsApiCallSyntheticsgetCanaryRunse77bc009769f8becf2bba8ec443d0a60", "path": "IntegCanaryTest/DefaultTest/DeployAssert/AwsApiCallSyntheticsgetCanaryRunse77bc009769f8becf2bba8ec443d0a60",