Skip to content

Commit 1c707eb

Browse files
kaizencckaizencc
authored
fix(region-info): EC2 service principal is incorrect in GovCloud regions (#22589)
According to these [docs](https://dca-docs-aws.amazon.com/c2s/latest/userguide/ec2.html), "The AWS service principal for Amazon EC2 is ec2.amazonaws.com, but the former service principal of ec2.c2s.ic.gov is still supported for backward compatibility."
1 parent 5759087 commit 1c707eb

File tree

389 files changed

+3671
-3121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+3671
-3121
lines changed

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.http-proxy.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.lambda-proxy.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.nlb.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.service-discovery.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/websocket/integ.mock.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apprunner/test/integ.service-ecr-public.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apprunner/test/integ.service-ecr.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apprunner/test/integ.service-github.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-apprunner/test/integ.service-vpc-connector.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"20.0.0"}
1+
{"version":"21.0.0"}

‎packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/integ-autoscalinghook-queue.assets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "21.0.0",
33
"files": {
4-
"512271f7a4721942ff4cf09cc4e4500d86b0e93fd0a1214307f7caf0a387bbc8": {
4+
"8a3db2dee171afc18cb3c206a03f7f70b4bda8fd9614c0da580b2f78810392fa": {
55
"source": {
66
"path": "integ-autoscalinghook-queue.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "512271f7a4721942ff4cf09cc4e4500d86b0e93fd0a1214307f7caf0a387bbc8.json",
12+
"objectKey": "8a3db2dee171afc18cb3c206a03f7f70b4bda8fd9614c0da580b2f78810392fa.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/integ-autoscalinghook-queue.template.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -427,17 +427,7 @@
427427
"Action": "sts:AssumeRole",
428428
"Effect": "Allow",
429429
"Principal": {
430-
"Service": {
431-
"Fn::Join": [
432-
"",
433-
[
434-
"ec2.",
435-
{
436-
"Ref": "AWS::URLSuffix"
437-
}
438-
]
439-
]
440-
}
430+
"Service": "ec2.amazonaws.com"
441431
}
442432
}
443433
],

‎packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"validateOnSynth": false,
2424
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
2525
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
26-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/512271f7a4721942ff4cf09cc4e4500d86b0e93fd0a1214307f7caf0a387bbc8.json",
26+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8a3db2dee171afc18cb3c206a03f7f70b4bda8fd9614c0da580b2f78810392fa.json",
2727
"requiresBootstrapStackVersion": 6,
2828
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2929
"additionalDependencies": [
@@ -286,7 +286,7 @@
286286
"validateOnSynth": false,
287287
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
288288
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
289-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2952a5f1ee2df6894e782c86d2be1fdd7d53f82d214752f25a6a79e822dabf3e.json",
289+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/bdae540cd4baafd04bde1c5823b5c218b9a79b8d856a8e9a26151bedc547eacd.json",
290290
"requiresBootstrapStackVersion": 6,
291291
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
292292
"additionalDependencies": [

‎packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/queuehooktestDefaultTestDeployAssertCF5493DF.assets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
}
1515
}
1616
},
17-
"2952a5f1ee2df6894e782c86d2be1fdd7d53f82d214752f25a6a79e822dabf3e": {
17+
"bdae540cd4baafd04bde1c5823b5c218b9a79b8d856a8e9a26151bedc547eacd": {
1818
"source": {
1919
"path": "queuehooktestDefaultTestDeployAssertCF5493DF.template.json",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "2952a5f1ee2df6894e782c86d2be1fdd7d53f82d214752f25a6a79e822dabf3e.json",
25+
"objectKey": "bdae540cd4baafd04bde1c5823b5c218b9a79b8d856a8e9a26151bedc547eacd.json",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}

‎packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/queuehooktestDefaultTestDeployAssertCF5493DF.template.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"DesiredCapacity": 1
1919
},
2020
"flattenResponse": "false",
21-
"salt": "1664821428400"
21+
"salt": "1666982510481"
2222
},
2323
"UpdateReplacePolicy": "Delete",
2424
"DeletionPolicy": "Delete"
@@ -133,7 +133,7 @@
133133
}
134134
},
135135
"flattenResponse": "true",
136-
"salt": "1664821428400"
136+
"salt": "1666982510481"
137137
},
138138
"UpdateReplacePolicy": "Delete",
139139
"DeletionPolicy": "Delete"
@@ -226,7 +226,7 @@
226226
"Fn::Join": [
227227
"",
228228
[
229-
"{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":5,\"MaxAttempts\":360,\"BackoffRate\":1}],\"Catch\":[{\"ErrorEquals\":[\"States.ALL\"],\"Next\":\"framework-onTimeout-task\"}],\"Type\":\"Task\",\"Resource\":\"",
229+
"{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":5,\"MaxAttempts\":8,\"BackoffRate\":1}],\"Catch\":[{\"ErrorEquals\":[\"States.ALL\"],\"Next\":\"framework-onTimeout-task\"}],\"Type\":\"Task\",\"Resource\":\"",
230230
{
231231
"Fn::GetAtt": [
232232
"SingletonFunction76b3e830a873425f8453eddd85c86925Handler81461ECE",
@@ -385,7 +385,7 @@
385385
}
386386
},
387387
"flattenResponse": "false",
388-
"salt": "1664821428402"
388+
"salt": "1666982510483"
389389
},
390390
"DependsOn": [
391391
"AwsApiCallAutoScalingsetDesiredCapacity",

‎packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/tree.json

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"path": "Tree",
1010
"constructInfo": {
1111
"fqn": "constructs.Construct",
12-
"version": "10.1.102"
12+
"version": "10.1.140"
1313
}
1414
},
1515
"integ-autoscalinghook-queue": {
@@ -741,17 +741,7 @@
741741
"Action": "sts:AssumeRole",
742742
"Effect": "Allow",
743743
"Principal": {
744-
"Service": {
745-
"Fn::Join": [
746-
"",
747-
[
748-
"ec2.",
749-
{
750-
"Ref": "AWS::URLSuffix"
751-
}
752-
]
753-
]
754-
}
744+
"Service": "ec2.amazonaws.com"
755745
}
756746
}
757747
],
@@ -1039,7 +1029,7 @@
10391029
},
10401030
"constructInfo": {
10411031
"fqn": "constructs.Construct",
1042-
"version": "10.1.102"
1032+
"version": "10.1.140"
10431033
}
10441034
}
10451035
},
@@ -1061,7 +1051,7 @@
10611051
"path": "queue-hook-test/DefaultTest/Default",
10621052
"constructInfo": {
10631053
"fqn": "constructs.Construct",
1064-
"version": "10.1.102"
1054+
"version": "10.1.140"
10651055
}
10661056
},
10671057
"DeployAssert": {
@@ -1081,7 +1071,7 @@
10811071
"path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallAutoScalingsetDesiredCapacity/SdkProvider/AssertionsProvider",
10821072
"constructInfo": {
10831073
"fqn": "constructs.Construct",
1084-
"version": "10.1.102"
1074+
"version": "10.1.140"
10851075
}
10861076
}
10871077
},
@@ -1145,7 +1135,7 @@
11451135
},
11461136
"constructInfo": {
11471137
"fqn": "constructs.Construct",
1148-
"version": "10.1.102"
1138+
"version": "10.1.140"
11491139
}
11501140
},
11511141
"AwsApiCallSQSreceiveMessage": {
@@ -1161,7 +1151,7 @@
11611151
"path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallSQSreceiveMessage/SdkProvider/AssertionsProvider",
11621152
"constructInfo": {
11631153
"fqn": "constructs.Construct",
1164-
"version": "10.1.102"
1154+
"version": "10.1.140"
11651155
}
11661156
}
11671157
},
@@ -1201,7 +1191,7 @@
12011191
"path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallSQSreceiveMessage/WaitFor/IsCompleteProvider/AssertionsProvider",
12021192
"constructInfo": {
12031193
"fqn": "constructs.Construct",
1204-
"version": "10.1.102"
1194+
"version": "10.1.140"
12051195
}
12061196
},
12071197
"Invoke": {
@@ -1227,7 +1217,7 @@
12271217
"path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallSQSreceiveMessage/WaitFor/TimeoutProvider/AssertionsProvider",
12281218
"constructInfo": {
12291219
"fqn": "constructs.Construct",
1230-
"version": "10.1.102"
1220+
"version": "10.1.140"
12311221
}
12321222
},
12331223
"Invoke": {
@@ -1311,7 +1301,7 @@
13111301
},
13121302
"constructInfo": {
13131303
"fqn": "constructs.Construct",
1314-
"version": "10.1.102"
1304+
"version": "10.1.140"
13151305
}
13161306
},
13171307
"SingletonFunction5c1898e096fb4e3e95d5f6c67f3ce41a": {
@@ -1345,7 +1335,7 @@
13451335
},
13461336
"constructInfo": {
13471337
"fqn": "constructs.Construct",
1348-
"version": "10.1.102"
1338+
"version": "10.1.140"
13491339
}
13501340
},
13511341
"AwsApiCallAutoScalingcompleteLifecycleAction": {
@@ -1361,7 +1351,7 @@
13611351
"path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallAutoScalingcompleteLifecycleAction/SdkProvider/AssertionsProvider",
13621352
"constructInfo": {
13631353
"fqn": "constructs.Construct",
1364-
"version": "10.1.102"
1354+
"version": "10.1.140"
13651355
}
13661356
}
13671357
},

‎packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/aws-cdk-autoscaling-integ.assets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "20.0.0",
2+
"version": "21.0.0",
33
"files": {
4-
"516c8876cabc562bdf34136436fba1348731ecb81e67578b762095b7a048fc98": {
4+
"62dd6f0ccfbbd1354c9a66f975cb337502f0359aa6f302762d33e013a53ee141": {
55
"source": {
66
"path": "aws-cdk-autoscaling-integ.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "516c8876cabc562bdf34136436fba1348731ecb81e67578b762095b7a048fc98.json",
12+
"objectKey": "62dd6f0ccfbbd1354c9a66f975cb337502f0359aa6f302762d33e013a53ee141.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/aws-cdk-autoscaling-integ.template.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -422,17 +422,7 @@
422422
"Action": "sts:AssumeRole",
423423
"Effect": "Allow",
424424
"Principal": {
425-
"Service": {
426-
"Fn::Join": [
427-
"",
428-
[
429-
"ec2.",
430-
{
431-
"Ref": "AWS::URLSuffix"
432-
}
433-
]
434-
]
435-
}
425+
"Service": "ec2.amazonaws.com"
436426
}
437427
}
438428
],

‎packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "20.0.0",
2+
"version": "21.0.0",
33
"testCases": {
44
"integ.amazonlinux2": {
55
"stacks": [

‎packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "20.0.0",
2+
"version": "21.0.0",
33
"artifacts": {
44
"Tree": {
55
"type": "cdk:tree",
@@ -23,7 +23,7 @@
2323
"validateOnSynth": false,
2424
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
2525
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
26-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/516c8876cabc562bdf34136436fba1348731ecb81e67578b762095b7a048fc98.json",
26+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/62dd6f0ccfbbd1354c9a66f975cb337502f0359aa6f302762d33e013a53ee141.json",
2727
"requiresBootstrapStackVersion": 6,
2828
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2929
"additionalDependencies": [

0 commit comments

Comments
 (0)