Skip to content

Commit

Permalink
fix integ test
Browse files Browse the repository at this point in the history
  • Loading branch information
@wanjacki
wanjacki committed Dec 27, 2022
1 parent c857bf2 commit 400d4bd
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 61 deletions.
4 changes: 2 additions & 2 deletions ...ws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@
}
}
},
"c95fa05010797b14fc061c131be6c6bca0e55544e0c60aecea5aec4d41cc838b": {
"6135e800e36d77703eb2e8b9598f683698677115d74aec7f4b25db092f6fd27c": {
"source": {
"path": "integ-servicecatalog-product.template.json",
"packaging": "file"
},
"destinations": {
"12345678-test-region": {
"bucketName": "cdk-hnb659fds-assets-12345678-test-region",
"objectKey": "c95fa05010797b14fc061c131be6c6bca0e55544e0c60aecea5aec4d41cc838b.json",
"objectKey": "6135e800e36d77703eb2e8b9598f683698677115d74aec7f4b25db092f6fd27c.json",
"region": "test-region",
"assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region"
}
Expand Down
4 changes: 4 additions & 0 deletions ...-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@
"d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip",
"e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip"
],
"SourceMarkers": [
{},
{}
],
"DestinationBucketName": {
"Ref": "TestAssetBucket9434EFAE"
},
Expand Down
7 changes: 2 additions & 5 deletions packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-test-region",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-test-region",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/c95fa05010797b14fc061c131be6c6bca0e55544e0c60aecea5aec4d41cc838b.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/6135e800e36d77703eb2e8b9598f683698677115d74aec7f4b25db092f6fd27c.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -78,10 +78,7 @@
"/integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "AssetsBucketDeploymentAwsCliLayer9BCEE17F",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
]
"data": "AssetsBucketDeploymentAwsCliLayer9BCEE17F"
}
],
"/integ-servicecatalog-product/AssetsBucketDeployment/CustomResource/Default": [
Expand Down
108 changes: 54 additions & 54 deletions packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,14 @@
"id": "Default",
"path": "integ-servicecatalog-product/TestAssetBucket/AutoDeleteObjectsCustomResource/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CustomResource",
"version": "0.0.0"
}
}
},
Expand All @@ -223,30 +223,30 @@
"id": "Staging",
"path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"Role": {
"id": "Role",
"path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"Handler": {
"id": "Handler",
"path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CustomResourceProvider",
"version": "0.0.0"
}
},
"SNSTopicProduct1": {
Expand Down Expand Up @@ -329,8 +329,8 @@
"id": "ImportServiceRole",
"path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/ServiceRole/ImportServiceRole",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
Expand Down Expand Up @@ -386,8 +386,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/Code/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand Down Expand Up @@ -447,8 +447,8 @@
"id": "ImportServiceRole",
"path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/ServiceRole/ImportServiceRole",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
Expand Down Expand Up @@ -504,8 +504,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/Code/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand Down Expand Up @@ -575,8 +575,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Code/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand Down Expand Up @@ -633,8 +633,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset1/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand All @@ -659,14 +659,14 @@
"id": "Default",
"path": "integ-servicecatalog-product/AssetsBucketDeployment/CustomResource/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CustomResource",
"version": "0.0.0"
}
},
"Asset2": {
Expand All @@ -677,8 +677,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset2/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand Down Expand Up @@ -713,8 +713,8 @@
"id": "ImportServiceRole",
"path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/ImportServiceRole",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
Expand Down Expand Up @@ -875,8 +875,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand Down Expand Up @@ -942,8 +942,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/TestProduct/Template1d7080eb134c/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand All @@ -968,8 +968,8 @@
"id": "Stage",
"path": "integ-servicecatalog-product/TestProduct/Template346eefaaa30e/Stage",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"AssetBucket": {
Expand Down Expand Up @@ -1069,30 +1069,30 @@
"id": "PortfolioId",
"path": "integ-servicecatalog-product/PortfolioId",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnOutput",
"version": "0.0.0"
}
},
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "integ-servicecatalog-product/BootstrapVersion",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "integ-servicecatalog-product/CheckBootstrapVersion",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
}
},
"integ-product": {
Expand All @@ -1119,22 +1119,22 @@
"id": "BootstrapVersion",
"path": "integ-product/DefaultTest/DeployAssert/BootstrapVersion",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "integ-product/DefaultTest/DeployAssert/CheckBootstrapVersion",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
}
}
},
Expand All @@ -1159,8 +1159,8 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.189"
"fqn": "@aws-cdk/core.App",
"version": "0.0.0"
}
}
}

0 comments on commit 400d4bd

Please sign in to comment.