diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json index f73155e9287a4..03e78b0922f33 100644 --- a/packages/@aws-cdk-testing/framework-integ/package.json +++ b/packages/@aws-cdk-testing/framework-integ/package.json @@ -30,7 +30,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@aws-sdk/client-acm": "3.632.0", "@aws-sdk/client-rds": "3.632.0", diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json index 6e8cb006477dd..49e7746fa2b5e 100644 --- a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json +++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json @@ -89,7 +89,7 @@ }, "devDependencies": { "aws-cdk-lib": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/integ-tests-alpha": "0.0.0", "constructs": "^10.0.0", "@aws-cdk/cdk-build-tools": "0.0.0", diff --git a/packages/@aws-cdk/aws-amplify-alpha/package.json b/packages/@aws-cdk/aws-amplify-alpha/package.json index 547d68e200e58..1ecd1d2b19bd2 100644 --- a/packages/@aws-cdk/aws-amplify-alpha/package.json +++ b/packages/@aws-cdk/aws-amplify-alpha/package.json @@ -87,7 +87,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@aws-cdk/custom-resource-handlers": "0.0.0", "@aws-sdk/client-amplify": "3.632.0", diff --git a/packages/@aws-cdk/aws-applicationsignals-alpha/package.json b/packages/@aws-cdk/aws-applicationsignals-alpha/package.json index aef5a3a0abebd..b78230450bce2 100644 --- a/packages/@aws-cdk/aws-applicationsignals-alpha/package.json +++ b/packages/@aws-cdk/aws-applicationsignals-alpha/package.json @@ -84,7 +84,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/integ-tests-alpha": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", diff --git a/packages/@aws-cdk/aws-apprunner-alpha/package.json b/packages/@aws-cdk/aws-apprunner-alpha/package.json index 963ad2f994514..b2a29d9366540 100644 --- a/packages/@aws-cdk/aws-apprunner-alpha/package.json +++ b/packages/@aws-cdk/aws-apprunner-alpha/package.json @@ -86,7 +86,7 @@ "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", "aws-cdk-lib": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "constructs": "^10.0.0", diff --git a/packages/@aws-cdk/aws-bedrock-alpha/package.json b/packages/@aws-cdk/aws-bedrock-alpha/package.json index da75d09b6ee69..9af215f9538fc 100644 --- a/packages/@aws-cdk/aws-bedrock-alpha/package.json +++ b/packages/@aws-cdk/aws-bedrock-alpha/package.json @@ -78,7 +78,7 @@ "devDependencies": { "aws-cdk-lib": "0.0.0", "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@aws-cdk/integ-tests-alpha": "0.0.0", "@types/jest": "^29.5.14", diff --git a/packages/@aws-cdk/aws-cloud9-alpha/package.json b/packages/@aws-cdk/aws-cloud9-alpha/package.json index 3f76e85ecbaf7..b492982028a45 100644 --- a/packages/@aws-cdk/aws-cloud9-alpha/package.json +++ b/packages/@aws-cdk/aws-cloud9-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-codestar-alpha/package.json b/packages/@aws-cdk/aws-codestar-alpha/package.json index 2d6017b780b01..894df105ec056 100644 --- a/packages/@aws-cdk/aws-codestar-alpha/package.json +++ b/packages/@aws-cdk/aws-codestar-alpha/package.json @@ -84,7 +84,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-ec2-alpha/package.json b/packages/@aws-cdk/aws-ec2-alpha/package.json index 73a7a97db2cc1..1249a44b731df 100644 --- a/packages/@aws-cdk/aws-ec2-alpha/package.json +++ b/packages/@aws-cdk/aws-ec2-alpha/package.json @@ -78,7 +78,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/integ-tests-alpha": "^0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", diff --git a/packages/@aws-cdk/aws-eks-v2-alpha/package.json b/packages/@aws-cdk/aws-eks-v2-alpha/package.json index 8f91e293fe1c5..2f56dca0df7b7 100644 --- a/packages/@aws-cdk/aws-eks-v2-alpha/package.json +++ b/packages/@aws-cdk/aws-eks-v2-alpha/package.json @@ -84,7 +84,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/integ-tests-alpha": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242", diff --git a/packages/@aws-cdk/aws-gamelift-alpha/package.json b/packages/@aws-cdk/aws-gamelift-alpha/package.json index f8d5a0d593f22..16dd1899d5ac8 100644 --- a/packages/@aws-cdk/aws-gamelift-alpha/package.json +++ b/packages/@aws-cdk/aws-gamelift-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-glue-alpha/package.json b/packages/@aws-cdk/aws-glue-alpha/package.json index 51dcc8c9a9bef..1cf6d9280e05f 100644 --- a/packages/@aws-cdk/aws-glue-alpha/package.json +++ b/packages/@aws-cdk/aws-glue-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/integ-tests-alpha": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/package.json b/packages/@aws-cdk/aws-iot-actions-alpha/package.json index 71bf0fca8da2e..22453aaf9a094 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/package.json +++ b/packages/@aws-cdk/aws-iot-actions-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-iot-alpha/package.json b/packages/@aws-cdk/aws-iot-alpha/package.json index 629cb7fe23fdc..bfa8ff5b4ce8a 100644 --- a/packages/@aws-cdk/aws-iot-alpha/package.json +++ b/packages/@aws-cdk/aws-iot-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json index 7a74d373156c5..af55e13be6dcc 100644 --- a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json +++ b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json @@ -75,7 +75,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-iotevents-alpha/package.json b/packages/@aws-cdk/aws-iotevents-alpha/package.json index 35cf576ab8c93..e08307f4ea10a 100644 --- a/packages/@aws-cdk/aws-iotevents-alpha/package.json +++ b/packages/@aws-cdk/aws-iotevents-alpha/package.json @@ -84,7 +84,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-ivs-alpha/package.json b/packages/@aws-cdk/aws-ivs-alpha/package.json index af714e0ab2ab7..66f7245a2ce8a 100644 --- a/packages/@aws-cdk/aws-ivs-alpha/package.json +++ b/packages/@aws-cdk/aws-ivs-alpha/package.json @@ -85,7 +85,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json index 4715bf701efe3..36a398fc6a306 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json @@ -78,7 +78,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/package.json b/packages/@aws-cdk/aws-lambda-go-alpha/package.json index 42f0f73e26738..d37dd04acc011 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/package.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/package.json @@ -78,7 +78,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/integ-tests-alpha": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/package.json b/packages/@aws-cdk/aws-lambda-python-alpha/package.json index 65f3c06a86662..67057693af391 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/package.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/package.json @@ -77,7 +77,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-location-alpha/package.json b/packages/@aws-cdk/aws-location-alpha/package.json index c486689061f85..79415d13eae9f 100644 --- a/packages/@aws-cdk/aws-location-alpha/package.json +++ b/packages/@aws-cdk/aws-location-alpha/package.json @@ -85,7 +85,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-msk-alpha/package.json b/packages/@aws-cdk/aws-msk-alpha/package.json index 235e3fbf3ffc4..cfc608962e447 100644 --- a/packages/@aws-cdk/aws-msk-alpha/package.json +++ b/packages/@aws-cdk/aws-msk-alpha/package.json @@ -84,7 +84,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-neptune-alpha/package.json b/packages/@aws-cdk/aws-neptune-alpha/package.json index 6e23084b21d89..e461ad05a10c6 100644 --- a/packages/@aws-cdk/aws-neptune-alpha/package.json +++ b/packages/@aws-cdk/aws-neptune-alpha/package.json @@ -83,7 +83,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-pipes-alpha/package.json b/packages/@aws-cdk/aws-pipes-alpha/package.json index e10962eb9a5b0..169afe5778885 100644 --- a/packages/@aws-cdk/aws-pipes-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29", diff --git a/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json b/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json index 3f05c60c2ec20..6a3f3310821c1 100644 --- a/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-enrichments-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29", diff --git a/packages/@aws-cdk/aws-pipes-sources-alpha/package.json b/packages/@aws-cdk/aws-pipes-sources-alpha/package.json index 49c9fb7ffba13..de91b7402e6b5 100644 --- a/packages/@aws-cdk/aws-pipes-sources-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-sources-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29", diff --git a/packages/@aws-cdk/aws-pipes-targets-alpha/package.json b/packages/@aws-cdk/aws-pipes-targets-alpha/package.json index 0060151c129e6..85568c0f9cd34 100644 --- a/packages/@aws-cdk/aws-pipes-targets-alpha/package.json +++ b/packages/@aws-cdk/aws-pipes-targets-alpha/package.json @@ -82,7 +82,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29", diff --git a/packages/@aws-cdk/aws-redshift-alpha/package.json b/packages/@aws-cdk/aws-redshift-alpha/package.json index ad23d4c8d12f3..d255a365e1b25 100644 --- a/packages/@aws-cdk/aws-redshift-alpha/package.json +++ b/packages/@aws-cdk/aws-redshift-alpha/package.json @@ -85,7 +85,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@aws-cdk/custom-resource-handlers": "0.0.0", "@aws-sdk/client-redshift": "3.632.0", diff --git a/packages/@aws-cdk/aws-route53resolver-alpha/package.json b/packages/@aws-cdk/aws-route53resolver-alpha/package.json index bc73842191470..9038867974b71 100644 --- a/packages/@aws-cdk/aws-route53resolver-alpha/package.json +++ b/packages/@aws-cdk/aws-route53resolver-alpha/package.json @@ -83,7 +83,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json index bfd64a0b5dcdd..328814798fbc9 100644 --- a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json +++ b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json @@ -85,7 +85,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/package.json b/packages/@aws-cdk/aws-sagemaker-alpha/package.json index 63847992cbb6f..97b7ee3462b65 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/package.json +++ b/packages/@aws-cdk/aws-sagemaker-alpha/package.json @@ -83,7 +83,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json index 255d71814ed04..35e43c0476cea 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json +++ b/packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json @@ -85,7 +85,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "aws-cdk-lib": "0.0.0", diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index e753c22220896..518d288fd106e 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -82,12 +82,12 @@ "semver": "^7.7.2" }, "peerDependencies": { - "@aws-cdk/cloud-assembly-schema": ">=44.1.0" + "@aws-cdk/cloud-assembly-schema": ">=45.0.0" }, "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/cloud-assembly-schema": "^44.8.0", + "@aws-cdk/cloud-assembly-schema": "^45.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "@types/mock-fs": "^4.13.4", diff --git a/packages/@aws-cdk/example-construct-library/package.json b/packages/@aws-cdk/example-construct-library/package.json index dfe00c56f2bfb..4baa953310a5e 100644 --- a/packages/@aws-cdk/example-construct-library/package.json +++ b/packages/@aws-cdk/example-construct-library/package.json @@ -75,7 +75,7 @@ "devDependencies": { "aws-cdk-lib": "0.0.0", "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", "jest": "^29.7.0" diff --git a/packages/@aws-cdk/integ-tests-alpha/package.json b/packages/@aws-cdk/integ-tests-alpha/package.json index e00e775f8a891..a42f4e655b573 100644 --- a/packages/@aws-cdk/integ-tests-alpha/package.json +++ b/packages/@aws-cdk/integ-tests-alpha/package.json @@ -67,7 +67,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/integ-runner": "^2.188.0", + "@aws-cdk/integ-runner": "^2.188.2", "@aws-cdk/pkglint": "0.0.0", "@aws-cdk/aws-custom-resource-sdk-adapter": "0.0.0", "@aws-sdk/client-ec2": "3.632.0", diff --git a/packages/aws-cdk-lib/core/lib/private/feature-flag-report.ts b/packages/aws-cdk-lib/core/lib/private/feature-flag-report.ts new file mode 100644 index 0000000000000..40066e140d4cc --- /dev/null +++ b/packages/aws-cdk-lib/core/lib/private/feature-flag-report.ts @@ -0,0 +1,39 @@ +import { ArtifactType, FeatureFlag } from '@aws-cdk/cloud-assembly-schema'; +import { IConstruct } from 'constructs'; +import { CloudAssemblyBuilder } from '../../../cx-api'; +import * as feats from '../../../cx-api/lib/features'; +import { FlagInfo } from '../../../cx-api/lib/private/flag-modeling'; + +/** + * Creates a FeatureFlag object based on flag information given. + */ +function parseFeatureFlagInfo(flagName: string, info: FlagInfo, root: IConstruct): FeatureFlag { + const userValue = root.node.tryGetContext(flagName) ?? undefined; + + let parsedFlag: FeatureFlag = { + userValue: userValue, + recommendedValue: info.recommendedValue, + explanation: info.summary, + }; + + return parsedFlag; +} + +/** + * Iterate through all feature flags, retrieve the user's context, + * and create a Feature Flag report. + */ +export function generateFeatureFlagReport(builder: CloudAssemblyBuilder, root: IConstruct): void { + const featureFlags: Record = {}; + for (const [flagName, flagInfo] of Object.entries(feats.FLAGS)) { + featureFlags[flagName] = parseFeatureFlagInfo(flagName, flagInfo, root); + } + + builder.addArtifact('aws-cdk-lib/feature-flag-report', { + type: ArtifactType.FEATURE_FLAG_REPORT, + properties: { + module: 'aws-cdk-lib', + flags: featureFlags, + }, + }); +} diff --git a/packages/aws-cdk-lib/core/lib/private/synthesis.ts b/packages/aws-cdk-lib/core/lib/private/synthesis.ts index 6a5c72facd265..5bae10a8c8189 100644 --- a/packages/aws-cdk-lib/core/lib/private/synthesis.ts +++ b/packages/aws-cdk-lib/core/lib/private/synthesis.ts @@ -15,6 +15,7 @@ import { Stack } from '../stack'; import { ISynthesisSession } from '../stack-synthesizers/types'; import { Stage, StageSynthesisOptions } from '../stage'; import { IPolicyValidationPluginBeta1 } from '../validation'; +import { generateFeatureFlagReport } from './feature-flag-report'; import { ConstructTree } from '../validation/private/construct-tree'; import { PolicyValidationReportFormatter, NamedValidationPluginReport } from '../validation/private/report'; @@ -64,6 +65,8 @@ export function synthesize(root: IConstruct, options: SynthesisOptions = { }): c // stacks to add themselves to the synthesized cloud assembly. synthesizeTree(root, builder, options.validateOnSynthesis); + generateFeatureFlagReport(builder, root); + const assembly = builder.buildAssembly(); invokeValidationPlugins(root, builder.outdir, assembly); diff --git a/packages/aws-cdk-lib/core/test/feature-flag-report.test.ts b/packages/aws-cdk-lib/core/test/feature-flag-report.test.ts new file mode 100644 index 0000000000000..bb177ac1862a9 --- /dev/null +++ b/packages/aws-cdk-lib/core/test/feature-flag-report.test.ts @@ -0,0 +1,51 @@ +import { FeatureFlagReportProperties } from '@aws-cdk/cloud-assembly-schema'; +import * as cxapi from '../../cx-api'; +import { App } from '../lib'; +import { generateFeatureFlagReport } from '../lib/private/feature-flag-report'; + +describe('generate feature flag report', () => { + test('feature flag report can be retrieved from CloudAssembly using its artifact ID', () => { + const app = new App(); + const assembly = app.synth(); + expect(assembly.manifest.artifacts?.['aws-cdk-lib/feature-flag-report']).toBeDefined(); + }); + test('report contains context values that represent the feature flags', () => { + const app = new App({ + context: { + '@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault': true, + '@aws-cdk/core:aspectStabilization': false, + }, + }); + const assembly = app.synth(); + const report = assembly.manifest.artifacts?.['aws-cdk-lib/feature-flag-report']; + expect(report).toEqual(expect.objectContaining({ + type: 'cdk:feature-flag-report', + properties: expect.objectContaining({ + module: 'aws-cdk-lib', + flags: expect.objectContaining({ + '@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault': expect.objectContaining({ + userValue: true, + }), + '@aws-cdk/core:aspectStabilization': expect.objectContaining({ + userValue: false, + }), + }), + }), + })); + }); + test('defaults userValue to undefined when not set in context', () => { + const app = new App(); + const builder = new cxapi.CloudAssemblyBuilder('/tmp/test'); + const spy = jest.spyOn(builder, 'addArtifact'); + + generateFeatureFlagReport(builder, app); + + const flags = (spy.mock.calls[0][1].properties as FeatureFlagReportProperties).flags; + expect(flags).toEqual(expect.objectContaining({ + '@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault': expect.objectContaining({ + userValue: undefined, + }), + })); + }); +}); + diff --git a/packages/aws-cdk-lib/core/test/stage.test.ts b/packages/aws-cdk-lib/core/test/stage.test.ts index 4c113c96e1e69..70e56cf7fe798 100644 --- a/packages/aws-cdk-lib/core/test/stage.test.ts +++ b/packages/aws-cdk-lib/core/test/stage.test.ts @@ -252,7 +252,7 @@ describe('stage', () => { const rootAssembly = app.synth(); // THEN - expect(rootAssembly.manifest.artifacts).toEqual({ + expect(rootAssembly.manifest.artifacts).toMatchObject({ 'assembly-StageLevel1': { type: 'cdk:cloud-assembly', properties: { @@ -263,7 +263,7 @@ describe('stage', () => { }); const assemblyLevel1 = rootAssembly.getNestedAssembly('assembly-StageLevel1'); - expect(assemblyLevel1.manifest.artifacts).toEqual({ + expect(assemblyLevel1.manifest.artifacts).toMatchObject({ 'assembly-StageLevel1-StageLevel2': { type: 'cdk:cloud-assembly', properties: { @@ -274,7 +274,7 @@ describe('stage', () => { }); const assemblyLevel2 = assemblyLevel1.getNestedAssembly('assembly-StageLevel1-StageLevel2'); - expect(assemblyLevel2.manifest.artifacts).toEqual({ + expect(assemblyLevel2.manifest.artifacts).toMatchObject({ 'assembly-StageLevel1-StageLevel2-StageLevel3': { type: 'cdk:cloud-assembly', properties: { diff --git a/packages/aws-cdk-lib/core/test/synthesis.test.ts b/packages/aws-cdk-lib/core/test/synthesis.test.ts index 65e9a6df24012..f92bde7131030 100644 --- a/packages/aws-cdk-lib/core/test/synthesis.test.ts +++ b/packages/aws-cdk-lib/core/test/synthesis.test.ts @@ -24,7 +24,7 @@ describe('synthesis', () => { // THEN expect(app.synth()).toEqual(session); // same session if we synth() again expect(list(session.directory)).toEqual(['cdk.out', 'manifest.json', 'tree.json']); - expect(readJson(session.directory, 'manifest.json').artifacts).toEqual({ + expect(readJson(session.directory, 'manifest.json').artifacts).toMatchObject({ Tree: { type: 'cdk:tree', properties: { file: 'tree.json' }, diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index 0f85f7b85590f..b23a5dea4c37c 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -121,7 +121,7 @@ "dependencies": { "@aws-cdk/asset-awscli-v1": "2.2.242", "@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0", - "@aws-cdk/cloud-assembly-schema": "^44.8.0", + "@aws-cdk/cloud-assembly-schema": "^45.0.0", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", "fs-extra": "^11.3.0", diff --git a/yarn.lock b/yarn.lock index 458cd4458b1c2..1b204578b0996 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,15 +58,7 @@ resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989" integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A== -"@aws-cdk/aws-service-spec@0.1.82": - version "0.1.82" - resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.82.tgz#d9d0b9e918daea01912de11e670e29e669b0f718" - integrity sha512-Vn0qMU00ozjmzxMgAluhS8V8H+/tk0Zk8VwKKf4kDJ3i1uFp15mfQM5vch8JwNs5Tn/xAOCX7jIavh1PiKfKYg== - dependencies: - "@aws-cdk/service-spec-types" "^0.0.148" - "@cdklabs/tskb" "^0.0.3" - -"@aws-cdk/aws-service-spec@^0.1.84": +"@aws-cdk/aws-service-spec@0.1.84", "@aws-cdk/aws-service-spec@^0.1.84": version "0.1.84" resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.84.tgz#520b4d69365bed901813fac1821750d899f6cc7e" integrity sha512-anurRdTvmebg3VhHeXDE7c039jJqVZNBtDvnxmbmjENDLch+jmu7uxIx0DXRLT7201raR7BKA28/nQh2srCzNA== @@ -74,21 +66,21 @@ "@aws-cdk/service-spec-types" "^0.0.150" "@cdklabs/tskb" "^0.0.3" -"@aws-cdk/cloud-assembly-schema@^44.8.0": - version "44.8.0" - resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-44.8.0.tgz#52da129bd718cc354c2970a6922c2346459f3945" - integrity sha512-Bxyj0VH8phE1uHJ6LiG3/UC/HYK91EBZnXSOzwtLsMJ0ZPuaQCYDRVAAfjDCSsEOwAk56/Waks8b5pXHpgz/xw== +"@aws-cdk/cloud-assembly-schema@^45.0.0": + version "45.0.0" + resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-45.0.0.tgz#32fe09103cae5f964b313403505391c4b25272fc" + integrity sha512-tHUX60ZevKlxAfnhQgjt5CcDEswImYuf25Ewg/+0aB6UnbvECT3eSkrUfhEXJ2T5zYO/w1Dy8ockfBXjE+QUNQ== dependencies: jsonschema "~1.4.1" semver "^7.7.2" -"@aws-cdk/integ-runner@^2.188.0": - version "2.188.0" - resolved "https://registry.npmjs.org/@aws-cdk/integ-runner/-/integ-runner-2.188.0.tgz#0ab613d491adf601dc000b2526ebcff562be00b5" - integrity sha512-MD8SFp9YfQEV/e3PONjTY58+gooU63KUUtZ62+RXFdgZDVn96oE/DwHz9CdOFARXjMX+BmtcFKiDNQEq2PgZMQ== +"@aws-cdk/integ-runner@^2.188.2": + version "2.188.2" + resolved "https://registry.npmjs.org/@aws-cdk/integ-runner/-/integ-runner-2.188.2.tgz#1117778c340f15481bffa637800e16ae3a27c788" + integrity sha512-oEyuOlyR2FgdZ1BqVt+RPYZTcACNlR9KlHs2LqAzn5EVshnC6GhZG+HWo/X0Jt1Q+bv5gHl+KkqyVe7YxXpS/Q== dependencies: - "@aws-cdk/aws-service-spec" "0.1.82" - aws-cdk "2.1019.2" + "@aws-cdk/aws-service-spec" "0.1.84" + aws-cdk "2.1020.1" optionalDependencies: fsevents "2.3.2" @@ -145,13 +137,6 @@ dependencies: "@cdklabs/tskb" "^0.0.3" -"@aws-cdk/service-spec-types@^0.0.148": - version "0.0.148" - resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.148.tgz#8ec4fa34d4bbb7e9542bce09da0641a20795f771" - integrity sha512-efHu3o1r/OWpwtz0415EEyXOLtxq7Wd4m7vb+bSg/QybNK9wwwlmYqDQaA8bDzygGJr4Kyq6losvGZhiBuYkiA== - dependencies: - "@cdklabs/tskb" "^0.0.3" - "@aws-cdk/service-spec-types@^0.0.150": version "0.0.150" resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.150.tgz#3a42559d9f81663f089b7ac518116c33a726c5ff" @@ -5212,10 +5197,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-cdk@2.1019.2: - version "2.1019.2" - resolved "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1019.2.tgz#acbdd3be7e095d3347168cd37aab437b3bd777f7" - integrity sha512-LkWZ3IKBkfCPTCu60t4Wb9JMSkb+0Uzk+HIxZeW5sFohq8bxDGV0OP1hcqEC2+KbVYRn7q+YhMeSJ/FOQcgpiw== +aws-cdk@2.1020.1: + version "2.1020.1" + resolved "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1020.1.tgz#97716539f80d3b74dc70cdf2bf38eb4232d94fa2" + integrity sha512-4UG9qzf6ZSDjINubcukPZChVj6PvDJAHiURAw0jYSkUhObPkX7Zo9uNUIlXzrM+hpB2N2jwRKY9b3sN+KDbtAQ== optionalDependencies: fsevents "2.3.2"