Skip to content

Commit

Permalink
fix(batch): JobQueue uses wrong id for underlying CfnJobQueue (#25269)
Browse files Browse the repository at this point in the history 
Closes #25248.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
@daschaa
daschaa committed Apr 27, 2023
1 parent aee537a commit 4cbb790
Show file tree
Hide file tree
Showing 31 changed files with 747 additions and 675 deletions.
4 changes: 2 additions & 2 deletions ...vents-targets/test/batch/integ.job-definition-events.js.snapshot/batch-events.assets.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "31.0.0",
"files": {
"0776292c0a44d9b0a502c6e8f5151f85ce0df1368d7a891bc5eb433c315e0c24": {
"d7dcc67b92ba98cf8898af8fd31d31f46001867bc6458f3c816a77850e10a990": {
"source": {
"path": "batch-events.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "0776292c0a44d9b0a502c6e8f5151f85ce0df1368d7a891bc5eb433c315e0c24.json",
"objectKey": "d7dcc67b92ba98cf8898af8fd31d31f46001867bc6458f3c816a77850e10a990.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...nts-targets/test/batch/integ.job-definition-events.js.snapshot/batch-events.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"State": "ENABLED"
}
},
"MyQueue4F9177CF": {
"MyQueueE6CA6235": {
"Type": "AWS::Batch::JobQueue",
"Properties": {
"ComputeEnvironmentOrder": [
Expand Down Expand Up @@ -139,7 +139,7 @@
"Resource": [
{
"Fn::GetAtt": [
"MyQueue4F9177CF",
"MyQueueE6CA6235",
"JobQueueArn"
]
},
Expand Down Expand Up @@ -168,7 +168,7 @@
{
"Arn": {
"Fn::GetAtt": [
"MyQueue4F9177CF",
"MyQueueE6CA6235",
"JobQueueArn"
]
},
Expand Down Expand Up @@ -198,7 +198,7 @@
{
"Arn": {
"Fn::GetAtt": [
"MyQueue4F9177CF",
"MyQueueE6CA6235",
"JobQueueArn"
]
},
Expand Down
15 changes: 12 additions & 3 deletions .../test/aws-events-targets/test/batch/integ.job-definition-events.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::${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}/0776292c0a44d9b0a502c6e8f5151f85ce0df1368d7a891bc5eb433c315e0c24.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d7dcc67b92ba98cf8898af8fd31d31f46001867bc6458f3c816a77850e10a990.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -45,10 +45,10 @@
"data": "ComputeEnvironmentC570994D"
}
],
"/batch-events/MyQueue/MyQueue": [
"/batch-events/MyQueue/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "MyQueue4F9177CF"
"data": "MyQueueE6CA6235"
}
],
"/batch-events/container/ExecutionRole/Resource": [
Expand Down Expand Up @@ -110,6 +110,15 @@
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
],
"MyQueue4F9177CF": [
{
"type": "aws:cdk:logicalId",
"data": "MyQueue4F9177CF",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
]
},
"displayName": "batch-events"
Expand Down
116 changes: 58 additions & 58 deletions ...nteg/test/aws-events-targets/test/batch/integ.job-definition-events.js.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"id": "ImportBatchServiceRole",
"path": "batch-events/ComputeEnvironment/BatchServiceRole/ImportBatchServiceRole",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.Resource",
"version": "0.0.0"
}
},
"Resource": {
Expand Down Expand Up @@ -59,14 +59,14 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.CfnRole",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.Role",
"version": "0.0.0"
}
},
"Resource": {
Expand All @@ -86,8 +86,8 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_batch.CfnComputeEnvironment",
"version": "0.0.0"
}
}
},
Expand All @@ -100,9 +100,9 @@
"id": "MyQueue",
"path": "batch-events/MyQueue",
"children": {
"MyQueue": {
"id": "MyQueue",
"path": "batch-events/MyQueue/MyQueue",
"Resource": {
"id": "Resource",
"path": "batch-events/MyQueue/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Batch::JobQueue",
"aws:cdk:cloudformation:props": {
Expand All @@ -122,8 +122,8 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_batch.CfnJobQueue",
"version": "0.0.0"
}
}
},
Expand All @@ -144,8 +144,8 @@
"id": "ImportExecutionRole",
"path": "batch-events/container/ExecutionRole/ImportExecutionRole",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.Resource",
"version": "0.0.0"
}
},
"Resource": {
Expand All @@ -169,14 +169,14 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.CfnRole",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.Role",
"version": "0.0.0"
}
}
},
Expand Down Expand Up @@ -225,8 +225,8 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_batch.CfnJobDefinition",
"version": "0.0.0"
}
},
"EventsRole": {
Expand All @@ -237,8 +237,8 @@
"id": "ImportEventsRole",
"path": "batch-events/MyJob/EventsRole/ImportEventsRole",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.Resource",
"version": "0.0.0"
}
},
"Resource": {
Expand All @@ -262,8 +262,8 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.CfnRole",
"version": "0.0.0"
}
},
"DefaultPolicy": {
Expand All @@ -284,7 +284,7 @@
"Resource": [
{
"Fn::GetAtt": [
"MyQueue4F9177CF",
"MyQueueE6CA6235",
"JobQueueArn"
]
},
Expand All @@ -305,20 +305,20 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.CfnPolicy",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.Policy",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_iam.Role",
"version": "0.0.0"
}
}
},
Expand All @@ -344,7 +344,7 @@
"id": "Target0",
"arn": {
"Fn::GetAtt": [
"MyQueue4F9177CF",
"MyQueueE6CA6235",
"JobQueueArn"
]
},
Expand All @@ -365,14 +365,14 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_events.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_events.Rule",
"version": "0.0.0"
}
},
"Timer2": {
Expand All @@ -392,7 +392,7 @@
"id": "Target0",
"arn": {
"Fn::GetAtt": [
"MyQueue4F9177CF",
"MyQueueE6CA6235",
"JobQueueArn"
]
},
Expand Down Expand Up @@ -425,14 +425,14 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_events.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_events.Rule",
"version": "0.0.0"
}
},
"Queue": {
Expand All @@ -447,8 +447,8 @@
"aws:cdk:cloudformation:props": {}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_sqs.CfnQueue",
"version": "0.0.0"
}
},
"Policy": {
Expand Down Expand Up @@ -498,42 +498,42 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_sqs.CfnQueuePolicy",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_sqs.QueuePolicy",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.aws_sqs.Queue",
"version": "0.0.0"
}
},
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "batch-events/BootstrapVersion",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "batch-events/CheckBootstrapVersion",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.Stack",
"version": "0.0.0"
}
},
"Tree": {
Expand All @@ -546,8 +546,8 @@
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.270"
"fqn": "aws-cdk-lib.App",
"version": "0.0.0"
}
}
}
Loading

0 comments on commit 4cbb790

Please sign in to comment.