Skip to content

Commit 013c181

Browse files
bnusunnymergify[bot]
bnusunny
authored and
mergify[bot]
committed
fix(region-info): IAM service principal for China regions (#3491)
* fix IAM service principal for China regions * fix integration testings for correct China region service principals * fix IAM service principal for China regions * fix integration testings for correct China region service principals * fix IAM principal for China region - ( aws-s3-deployment / aws-eks ) * remove two regions where we don't have the CDK Metadata resource * remove two regions where we don't have the CDK Metadata resource * remove two regions where we don't have the CDK Metadata resource * fix additional Principal values for China region * fix(region-info): merge changes from v1.4.0
1 parent 175471f commit 013c181

File tree

109 files changed

+357
-2425
lines changed

Some content is hidden

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

109 files changed

+357
-2425
lines changed

‎packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,7 @@
1414
"Action": "sts:AssumeRole",
1515
"Effect": "Allow",
1616
"Principal": {
17-
"Service": {
18-
"Fn::Join": [
19-
"",
20-
[
21-
"codepipeline.",
22-
{
23-
"Ref": "AWS::URLSuffix"
24-
}
25-
]
26-
]
27-
}
17+
"Service": "codepipeline.amazonaws.com"
2818
}
2919
}
3020
],
@@ -426,17 +416,7 @@
426416
"Action": "sts:AssumeRole",
427417
"Effect": "Allow",
428418
"Principal": {
429-
"Service": {
430-
"Fn::Join": [
431-
"",
432-
[
433-
"cloudformation.",
434-
{
435-
"Ref": "AWS::URLSuffix"
436-
}
437-
]
438-
]
439-
}
419+
"Service": "cloudformation.amazonaws.com"
440420
}
441421
}
442422
],

‎packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,7 @@
99
"Action": "sts:AssumeRole",
1010
"Effect": "Allow",
1111
"Principal": {
12-
"Service": {
13-
"Fn::Join": [
14-
"",
15-
[
16-
"lambda.",
17-
{
18-
"Ref": "AWS::URLSuffix"
19-
}
20-
]
21-
]
22-
}
12+
"Service": "lambda.amazonaws.com"
2313
}
2414
}
2515
],
@@ -225,17 +215,7 @@
225215
"Action": "sts:AssumeRole",
226216
"Effect": "Allow",
227217
"Principal": {
228-
"Service": {
229-
"Fn::Join": [
230-
"",
231-
[
232-
"lambda.",
233-
{
234-
"Ref": "AWS::URLSuffix"
235-
}
236-
]
237-
]
238-
}
218+
"Service": "lambda.amazonaws.com"
239219
}
240220
}
241221
],
@@ -441,17 +421,7 @@
441421
"Action": "sts:AssumeRole",
442422
"Effect": "Allow",
443423
"Principal": {
444-
"Service": {
445-
"Fn::Join": [
446-
"",
447-
[
448-
"lambda.",
449-
{
450-
"Ref": "AWS::URLSuffix"
451-
}
452-
]
453-
]
454-
}
424+
"Service": "lambda.amazonaws.com"
455425
}
456426
}
457427
],
@@ -615,17 +585,7 @@
615585
"Action": "sts:AssumeRole",
616586
"Effect": "Allow",
617587
"Principal": {
618-
"Service": {
619-
"Fn::Join": [
620-
"",
621-
[
622-
"apigateway.",
623-
{
624-
"Ref": "AWS::URLSuffix"
625-
}
626-
]
627-
]
628-
}
588+
"Service": "apigateway.amazonaws.com"
629589
}
630590
}
631591
],

‎packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.expected.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@
3939
"Action": "sts:AssumeRole",
4040
"Effect": "Allow",
4141
"Principal": {
42-
"Service": {
43-
"Fn::Join": [
44-
"",
45-
[
46-
"apigateway.",
47-
{
48-
"Ref": "AWS::URLSuffix"
49-
}
50-
]
51-
]
52-
}
42+
"Service": "apigateway.amazonaws.com"
5343
}
5444
}
5545
],

‎packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,7 @@
6666
"Action": "sts:AssumeRole",
6767
"Effect": "Allow",
6868
"Principal": {
69-
"Service": {
70-
"Fn::Join": [
71-
"",
72-
[
73-
"apigateway.",
74-
{
75-
"Ref": "AWS::URLSuffix"
76-
}
77-
]
78-
]
79-
}
69+
"Service": "apigateway.amazonaws.com"
8070
}
8171
}
8272
],
@@ -399,17 +389,7 @@
399389
"Action": "sts:AssumeRole",
400390
"Effect": "Allow",
401391
"Principal": {
402-
"Service": {
403-
"Fn::Join": [
404-
"",
405-
[
406-
"lambda.",
407-
{
408-
"Ref": "AWS::URLSuffix"
409-
}
410-
]
411-
]
412-
}
392+
"Service": "lambda.amazonaws.com"
413393
}
414394
}
415395
],

‎packages/@aws-cdk/aws-apigateway/test/integ.restapi.multiuse.expected.json

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,7 @@
99
"Action": "sts:AssumeRole",
1010
"Effect": "Allow",
1111
"Principal": {
12-
"Service": {
13-
"Fn::Join": [
14-
"",
15-
[
16-
"lambda.",
17-
{
18-
"Ref": "AWS::URLSuffix"
19-
}
20-
]
21-
]
22-
}
12+
"Service": "lambda.amazonaws.com"
2313
}
2414
}
2515
],
@@ -256,17 +246,7 @@
256246
"Action": "sts:AssumeRole",
257247
"Effect": "Allow",
258248
"Principal": {
259-
"Service": {
260-
"Fn::Join": [
261-
"",
262-
[
263-
"apigateway.",
264-
{
265-
"Ref": "AWS::URLSuffix"
266-
}
267-
]
268-
]
269-
}
249+
"Service": "apigateway.amazonaws.com"
270250
}
271251
}
272252
],
@@ -397,17 +377,7 @@
397377
"Action": "sts:AssumeRole",
398378
"Effect": "Allow",
399379
"Principal": {
400-
"Service": {
401-
"Fn::Join": [
402-
"",
403-
[
404-
"apigateway.",
405-
{
406-
"Ref": "AWS::URLSuffix"
407-
}
408-
]
409-
]
410-
}
380+
"Service": "apigateway.amazonaws.com"
411381
}
412382
}
413383
],

‎packages/@aws-cdk/aws-apigateway/test/test.restapi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export = {
6060
{
6161
Action: "sts:AssumeRole",
6262
Effect: "Allow",
63-
Principal: { Service: { "Fn::Join": ["", ["apigateway.", { Ref: "AWS::URLSuffix" }]] } }
63+
Principal: { Service: "apigateway.amazonaws.com" }
6464
}
6565
],
6666
Version: "2012-10-17"

‎packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ export = {
4646
{
4747
Action: "sts:AssumeRole",
4848
Effect: "Allow",
49-
Principal: { Service: { "Fn::Join": ["", ["autoscaling.", { Ref: "AWS::URLSuffix" }]] } }
49+
Principal: {
50+
Service: "autoscaling.amazonaws.com"
51+
}
5052
}
5153
],
5254
}

‎packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.expected.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,7 @@
2323
"Action": "sts:AssumeRole",
2424
"Effect": "Allow",
2525
"Principal": {
26-
"Service": {
27-
"Fn::Join": [
28-
"",
29-
[
30-
"lambda.",
31-
{
32-
"Ref": "AWS::URLSuffix"
33-
}
34-
]
35-
]
36-
}
26+
"Service": "lambda.amazonaws.com"
3727
}
3828
}
3929
],

‎packages/@aws-cdk/aws-cloudformation/test/test.resource.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export = testCase({
7878
"Action": "sts:AssumeRole",
7979
"Effect": "Allow",
8080
"Principal": {
81-
"Service": { "Fn::Join": ["", ["lambda.", { Ref: "AWS::URLSuffix" }]] }
81+
"Service": "lambda.amazonaws.com"
8282
}
8383
}
8484
],

‎packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-lambda-association.expected.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,7 @@
1414
"Action": "sts:AssumeRole",
1515
"Effect": "Allow",
1616
"Principal": {
17-
"Service": {
18-
"Fn::Join": [
19-
"",
20-
[
21-
"lambda.",
22-
{
23-
"Ref": "AWS::URLSuffix"
24-
}
25-
]
26-
]
27-
}
17+
"Service": "lambda.amazonaws.com"
2818
}
2919
}
3020
],

0 commit comments

Comments
 (0)