diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json index 27a3f1ff464d1..cde2ed4b5b63d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/cdk.out index 2313ab5436501..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/integ.json index e47dd25d0fd62..2336bc796e8d1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "testCases": { "BatchEcsJobDefinitionTest/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/manifest.json index 356510a3c50ce..9617496b73812 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "artifacts": { "stack.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,12 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "stack.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/4aa63dc2410e527912a2abc501a3d3eff66d21949c7a314e7818bb8eb4a2cc40.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1ca573840f0910faf6241c40d95e3727761b62de78f5f3fb048da395d6c066f9.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -192,7 +194,10 @@ "/stack/managedEc2CE/Resource": [ { "type": "aws:cdk:logicalId", - "data": "managedEc2CE195A935F" + "data": "managedEc2CE195A935F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/stack/joBBQ/Resource": [ @@ -259,7 +264,9 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.assets.json index 4a690f5876298..a6cef8b95c6b2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { - "4aa63dc2410e527912a2abc501a3d3eff66d21949c7a314e7818bb8eb4a2cc40": { + "1ca573840f0910faf6241c40d95e3727761b62de78f5f3fb048da395d6c066f9": { "source": { "path": "stack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "4aa63dc2410e527912a2abc501a3d3eff66d21949c7a314e7818bb8eb4a2cc40.json", + "objectKey": "1ca573840f0910faf6241c40d95e3727761b62de78f5f3fb048da395d6c066f9.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-batch/test/integ.grants.js.snapshot/stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.template.json index 8b1b14eb0ff43..181660cd45056 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.template.json @@ -484,7 +484,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/tree.json index 4b635247b41d5..37ff9a6ae9a13 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/tree.json @@ -803,7 +803,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -1132,7 +1132,7 @@ "path": "BatchEcsJobDefinitionTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "DeployAssert": { @@ -1178,7 +1178,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json index 0dee86e8f3ad8..cde2ed4b5b63d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.assets.json index e6fdaff9e9acf..d517091a6e030 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.assets.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "files": { "bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1": { "source": { @@ -14,7 +14,7 @@ } } }, - "937de9f6ce81b7b9f39da5371a67cbaefe04b6574d9267fb2181cdb31a34d875": { + "5075e6e8c5e0b5f71ee0895ef9c74afa6c00975df46d9c86685c32863d0d04dd": { "source": { "path": "batch-stack-job-queue.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "937de9f6ce81b7b9f39da5371a67cbaefe04b6574d9267fb2181cdb31a34d875.json", + "objectKey": "5075e6e8c5e0b5f71ee0895ef9c74afa6c00975df46d9c86685c32863d0d04dd.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-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.template.json index 261ea97e53bad..d68a44ca969dd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/batch-stack-job-queue.template.json @@ -608,7 +608,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/cdk.out index 1f0068d32659a..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"36.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/integ.json index cb4b16b555a53..b1527f320a1a6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "testCases": { "BatchEcsJobDefinitionTest/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/manifest.json index f0f41b6dc6677..0cfe4f18653ee 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "artifacts": { "batch-stack-job-queue.assets": { "type": "cdk:asset-manifest", @@ -16,9 +16,10 @@ "templateFile": "batch-stack-job-queue.template.json", "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/937de9f6ce81b7b9f39da5371a67cbaefe04b6574d9267fb2181cdb31a34d875.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/5075e6e8c5e0b5f71ee0895ef9c74afa6c00975df46d9c86685c32863d0d04dd.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -184,6 +185,12 @@ "data": "LatestNodeRuntimeMap" } ], + "/batch-stack-job-queue/Custom::VpcRestrictDefaultSGCustomResourceProvider": [ + { + "type": "aws:cdk:is-custom-resource-handler-customResourceProvider", + "data": true + } + ], "/batch-stack-job-queue/Custom::VpcRestrictDefaultSGCustomResourceProvider/Role": [ { "type": "aws:cdk:logicalId", @@ -217,7 +224,10 @@ "/batch-stack-job-queue/CE/Resource": [ { "type": "aws:cdk:logicalId", - "data": "CE1BFE03A1" + "data": "CE1BFE03A1", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/batch-stack-job-queue/joBBQ/Resource": [ @@ -256,6 +266,7 @@ "templateFile": "BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.template.json", "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/tree.json index 0037145bf0113..d4b7397574a23 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue-job-state-time-limit-actions.js.snapshot/tree.json @@ -863,7 +863,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json index 27a3f1ff464d1..cde2ed4b5b63d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/cdk.out index 2313ab5436501..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/integ.json index e47dd25d0fd62..2336bc796e8d1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "testCases": { "BatchEcsJobDefinitionTest/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/manifest.json index 85db12e3ca4ef..ee9742a251c16 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "artifacts": { "stack.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,12 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "stack.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/26ff3a1acb8c49e883cdd6bf8a787702f31ead398a7ad6a26d37b18264ff6bed.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/656076fad7a4134aa61c82bcb69fa930cace91f2cafea52d922a4f4bebf005f7.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -198,7 +200,10 @@ "/stack/managedEc2CE/Resource": [ { "type": "aws:cdk:logicalId", - "data": "managedEc2CE195A935F" + "data": "managedEc2CE195A935F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/stack/joBBQ/Resource": [ @@ -228,7 +233,10 @@ "/stack/newManagedEc2CE/Resource": [ { "type": "aws:cdk:logicalId", - "data": "newManagedEc2CECBFFDA3E" + "data": "newManagedEc2CECBFFDA3E", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/stack/BootstrapVersion": [ @@ -259,7 +267,9 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.assets.json index 156ee2918ae7d..e937c3fe8408f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { - "26ff3a1acb8c49e883cdd6bf8a787702f31ead398a7ad6a26d37b18264ff6bed": { + "656076fad7a4134aa61c82bcb69fa930cace91f2cafea52d922a4f4bebf005f7": { "source": { "path": "stack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "26ff3a1acb8c49e883cdd6bf8a787702f31ead398a7ad6a26d37b18264ff6bed.json", + "objectKey": "656076fad7a4134aa61c82bcb69fa930cace91f2cafea52d922a4f4bebf005f7.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-batch/test/integ.job-queue.js.snapshot/stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.template.json index 37f96b3e9ba8b..0579be87dd717 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.template.json @@ -504,7 +504,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, @@ -634,7 +634,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/tree.json index 06f99eabc57c5..ff657cd37ae39 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/tree.json @@ -841,7 +841,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -1059,7 +1059,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -1109,7 +1109,7 @@ "path": "BatchEcsJobDefinitionTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "DeployAssert": { @@ -1155,7 +1155,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json index de953f1e34aad..bf6bfe08bd768 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.assets.json index 7fbccde788f96..18341da369708 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.assets.json @@ -1,7 +1,7 @@ { - "version": "36.0.0", + "version": "38.0.1", "files": { - "29532266ce5c96c372f99765edc76d90da88dd7316798a6e86946bc0ffa1802d": { + "3808589272972730d7793fe3006515c193ca8b79a9f6e1325494b3751f2ef1b6": { "source": { "path": "batch-stack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "29532266ce5c96c372f99765edc76d90da88dd7316798a6e86946bc0ffa1802d.json", + "objectKey": "3808589272972730d7793fe3006515c193ca8b79a9f6e1325494b3751f2ef1b6.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-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json index c99047b447f4b..da1ecd3adb2f7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json @@ -432,7 +432,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, @@ -479,7 +479,7 @@ }, "ReplaceComputeEnvironment": true, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": { "JobExecutionTimeoutMinutes": 30, "TerminateJobsOnUpdate": true @@ -587,7 +587,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, @@ -744,7 +744,7 @@ }, "ReplaceComputeEnvironment": true, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": { "JobExecutionTimeoutMinutes": 60, "TerminateJobsOnUpdate": false @@ -876,7 +876,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, @@ -982,7 +982,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, @@ -1115,7 +1115,7 @@ "foo": "bar", "super": "salamander" }, - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } }, @@ -1217,7 +1217,7 @@ }, "ReplaceComputeEnvironment": false, "State": "ENABLED", - "Type": "managed", + "Type": "MANAGED", "UpdatePolicy": {} } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out index 1f0068d32659a..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"36.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/integ.json index 1d97ef0a4308e..2c1b56834d4b0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "testCases": { "BatchManagedComputeEnvironmentTest/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json index 9ec827b896504..7bd01ffef6bc7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "36.0.0", + "version": "38.0.1", "artifacts": { "batch-stack.assets": { "type": "cdk:asset-manifest", @@ -16,9 +16,10 @@ "templateFile": "batch-stack.template.json", "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/29532266ce5c96c372f99765edc76d90da88dd7316798a6e86946bc0ffa1802d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3808589272972730d7793fe3006515c193ca8b79a9f6e1325494b3751f2ef1b6.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -193,7 +194,10 @@ "/batch-stack/maximalPropsFargate/Resource": [ { "type": "aws:cdk:logicalId", - "data": "maximalPropsFargate2D7D8138" + "data": "maximalPropsFargate2D7D8138", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/batch-stack/minimalPropsEc2/SecurityGroup/Resource": [ @@ -394,6 +398,7 @@ "templateFile": "BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.template.json", "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/tree.json index 7d665f06bcdc1..99bb6fa75edbf 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/tree.json @@ -717,7 +717,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -800,7 +800,7 @@ }, "replaceComputeEnvironment": true, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": { "terminateJobsOnUpdate": true, "jobExecutionTimeoutMinutes": 30 @@ -978,7 +978,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -1258,7 +1258,7 @@ }, "replaceComputeEnvironment": true, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": { "terminateJobsOnUpdate": false, "jobExecutionTimeoutMinutes": 60 @@ -1486,7 +1486,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -1662,7 +1662,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -1865,7 +1865,7 @@ "foo": "bar", "super": "salamander" }, - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, @@ -2037,7 +2037,7 @@ }, "replaceComputeEnvironment": false, "state": "ENABLED", - "type": "managed", + "type": "MANAGED", "updatePolicy": {} } }, diff --git a/packages/aws-cdk-lib/aws-batch/lib/managed-compute-environment.ts b/packages/aws-cdk-lib/aws-batch/lib/managed-compute-environment.ts index c9f03e9f0dd73..f6e6446c5c0dd 100644 --- a/packages/aws-cdk-lib/aws-batch/lib/managed-compute-environment.ts +++ b/packages/aws-cdk-lib/aws-batch/lib/managed-compute-environment.ts @@ -1232,7 +1232,7 @@ function baseManagedResourceProperties(baseComputeEnvironment: ManagedComputeEnv jobExecutionTimeoutMinutes: baseComputeEnvironment.updateTimeout?.toMinutes(), }, replaceComputeEnvironment: baseComputeEnvironment.replaceComputeEnvironment, - type: 'managed', + type: 'MANAGED', }; } diff --git a/packages/aws-cdk-lib/aws-batch/test/managed-compute-environment.test.ts b/packages/aws-cdk-lib/aws-batch/test/managed-compute-environment.test.ts index b2d572fd8de37..2d7482199dac9 100644 --- a/packages/aws-cdk-lib/aws-batch/test/managed-compute-environment.test.ts +++ b/packages/aws-cdk-lib/aws-batch/test/managed-compute-environment.test.ts @@ -7,7 +7,7 @@ import { Stack, Duration, Tags } from '../../core'; import { AllocationStrategy, CfnComputeEnvironmentProps, ManagedEc2EcsComputeEnvironment, ManagedEc2EcsComputeEnvironmentProps, ManagedEc2EksComputeEnvironment, ManagedEc2EksComputeEnvironmentProps, FargateComputeEnvironment, EcsMachineImageType, EksMachineImageType } from '../lib'; const defaultExpectedEcsProps: CfnComputeEnvironmentProps = { - type: 'managed', + type: 'MANAGED', computeEnvironmentName: undefined, serviceRole: undefined, state: 'ENABLED',