Skip to content

Commit ed30c44

Browse files
authored
fix(region-info): ssm service principal - fix more regions (#18135)
The #17984 (big kudos to @rix0rrr for that) introduced a fix for the SSM service principal format which depends on the region. However, due to a typo in that PR some of regions still don't have correct SSM service principal. Currently the SSM service principal for the following regions incorrectly include region, while according to the [issue #16188](#16188) it should be only added to all regions since `ap-east-1`. ``` cn-north-1 us-iso-east-1 eu-central-1 ap-northeast-2 ap-south-1 us-east-2 ca-central-1 eu-west-2 us-isob-east-1 cn-northwest-1 eu-west-3 ap-northeast-3 us-gov-east-1 eu-north-1 ``` It works like that because by accident `RULE_SSM_PRINCIPALS_ARE_REGIONAL` has the same value as `RULE_S3_WEBSITE_REGIONAL_SUBDOMAIN`. This causes incorrect results returned by the `aws-entities/before` function. This PR fixes that issue. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 82b091e commit ed30c44

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

packages/@aws-cdk/region-info/lib/aws-entities.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const RULE_SSM_PRINCIPALS_ARE_REGIONAL = `${RULE_}SSM_PRINCIPALS_ARE_REGI
1111
*
1212
* Before this point, S3 website domains look like `s3-website-REGION.s3.amazonaws.com`.
1313
*/
14-
export const RULE_S3_WEBSITE_REGIONAL_SUBDOMAIN = `${RULE_}SSM_PRINCIPALS_ARE_REGIONAL`;
14+
export const RULE_S3_WEBSITE_REGIONAL_SUBDOMAIN = `${RULE_}S3_WEBSITE_REGIONAL_SUBDOMAIN`;
1515

1616
/**
1717
* List of AWS region, ordered by launch date (oldest to newest)
@@ -144,4 +144,4 @@ export function generateRegionMap(cb: (region: string) => string): Record<string
144144
ret[region] = cb(region);
145145
}
146146
return ret;
147-
}
147+
}

packages/@aws-cdk/region-info/test/__snapshots__/region-info.test.js.snap

+14-14
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Object {
121121
"s3": "s3.amazonaws.com",
122122
"sns": "sns.amazonaws.com",
123123
"sqs": "sqs.amazonaws.com",
124-
"ssm": "ssm.ap-northeast-2.amazonaws.com",
124+
"ssm": "ssm.amazonaws.com",
125125
"states": "states.ap-northeast-2.amazonaws.com",
126126
},
127127
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -152,7 +152,7 @@ Object {
152152
"s3": "s3.amazonaws.com",
153153
"sns": "sns.amazonaws.com",
154154
"sqs": "sqs.amazonaws.com",
155-
"ssm": "ssm.ap-northeast-3.amazonaws.com",
155+
"ssm": "ssm.amazonaws.com",
156156
"states": "states.ap-northeast-3.amazonaws.com",
157157
},
158158
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -183,7 +183,7 @@ Object {
183183
"s3": "s3.amazonaws.com",
184184
"sns": "sns.amazonaws.com",
185185
"sqs": "sqs.amazonaws.com",
186-
"ssm": "ssm.ap-south-1.amazonaws.com",
186+
"ssm": "ssm.amazonaws.com",
187187
"states": "states.ap-south-1.amazonaws.com",
188188
},
189189
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -307,7 +307,7 @@ Object {
307307
"s3": "s3.amazonaws.com",
308308
"sns": "sns.amazonaws.com",
309309
"sqs": "sqs.amazonaws.com",
310-
"ssm": "ssm.ca-central-1.amazonaws.com",
310+
"ssm": "ssm.amazonaws.com",
311311
"states": "states.ca-central-1.amazonaws.com",
312312
},
313313
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -338,7 +338,7 @@ Object {
338338
"s3": "s3.amazonaws.com",
339339
"sns": "sns.amazonaws.com",
340340
"sqs": "sqs.amazonaws.com",
341-
"ssm": "ssm.cn-north-1.amazonaws.com",
341+
"ssm": "ssm.amazonaws.com",
342342
"states": "states.cn-north-1.amazonaws.com",
343343
},
344344
"vpcEndPointServiceNamePrefix": "cn.com.amazonaws.vpce",
@@ -369,7 +369,7 @@ Object {
369369
"s3": "s3.amazonaws.com",
370370
"sns": "sns.amazonaws.com",
371371
"sqs": "sqs.amazonaws.com",
372-
"ssm": "ssm.cn-northwest-1.amazonaws.com",
372+
"ssm": "ssm.amazonaws.com",
373373
"states": "states.cn-northwest-1.amazonaws.com",
374374
},
375375
"vpcEndPointServiceNamePrefix": "cn.com.amazonaws.vpce",
@@ -400,7 +400,7 @@ Object {
400400
"s3": "s3.amazonaws.com",
401401
"sns": "sns.amazonaws.com",
402402
"sqs": "sqs.amazonaws.com",
403-
"ssm": "ssm.eu-central-1.amazonaws.com",
403+
"ssm": "ssm.amazonaws.com",
404404
"states": "states.eu-central-1.amazonaws.com",
405405
},
406406
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -431,7 +431,7 @@ Object {
431431
"s3": "s3.amazonaws.com",
432432
"sns": "sns.amazonaws.com",
433433
"sqs": "sqs.amazonaws.com",
434-
"ssm": "ssm.eu-north-1.amazonaws.com",
434+
"ssm": "ssm.amazonaws.com",
435435
"states": "states.eu-north-1.amazonaws.com",
436436
},
437437
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -555,7 +555,7 @@ Object {
555555
"s3": "s3.amazonaws.com",
556556
"sns": "sns.amazonaws.com",
557557
"sqs": "sqs.amazonaws.com",
558-
"ssm": "ssm.eu-west-2.amazonaws.com",
558+
"ssm": "ssm.amazonaws.com",
559559
"states": "states.eu-west-2.amazonaws.com",
560560
},
561561
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -586,7 +586,7 @@ Object {
586586
"s3": "s3.amazonaws.com",
587587
"sns": "sns.amazonaws.com",
588588
"sqs": "sqs.amazonaws.com",
589-
"ssm": "ssm.eu-west-3.amazonaws.com",
589+
"ssm": "ssm.amazonaws.com",
590590
"states": "states.eu-west-3.amazonaws.com",
591591
},
592592
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -710,7 +710,7 @@ Object {
710710
"s3": "s3.amazonaws.com",
711711
"sns": "sns.amazonaws.com",
712712
"sqs": "sqs.amazonaws.com",
713-
"ssm": "ssm.us-east-2.amazonaws.com",
713+
"ssm": "ssm.amazonaws.com",
714714
"states": "states.us-east-2.amazonaws.com",
715715
},
716716
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -741,7 +741,7 @@ Object {
741741
"s3": "s3.amazonaws.com",
742742
"sns": "sns.amazonaws.com",
743743
"sqs": "sqs.amazonaws.com",
744-
"ssm": "ssm.us-gov-east-1.amazonaws.com",
744+
"ssm": "ssm.amazonaws.com",
745745
"states": "states.us-gov-east-1.amazonaws.com",
746746
},
747747
"vpcEndPointServiceNamePrefix": "com.amazonaws.vpce",
@@ -803,7 +803,7 @@ Object {
803803
"s3": "s3.amazonaws.com",
804804
"sns": "sns.amazonaws.com",
805805
"sqs": "sqs.amazonaws.com",
806-
"ssm": "ssm.us-iso-east-1.amazonaws.com",
806+
"ssm": "ssm.amazonaws.com",
807807
"states": "states.amazonaws.com",
808808
},
809809
"vpcEndPointServiceNamePrefix": "gov.ic.c2s.vpce",
@@ -865,7 +865,7 @@ Object {
865865
"s3": "s3.amazonaws.com",
866866
"sns": "sns.amazonaws.com",
867867
"sqs": "sqs.amazonaws.com",
868-
"ssm": "ssm.us-isob-east-1.amazonaws.com",
868+
"ssm": "ssm.amazonaws.com",
869869
"states": "states.amazonaws.com",
870870
},
871871
"vpcEndPointServiceNamePrefix": "gov.sgov.sc2s.vpce",

packages/@aws-cdk/region-info/test/default.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ describe('servicePrincipal', () => {
5454
describe('spot-check some service principals', () => {
5555
test('ssm', () => {
5656
expect(Default.servicePrincipal('ssm.amazonaws.com', 'us-east-1', 'x')).toBe('ssm.amazonaws.com');
57+
expect(Default.servicePrincipal('ssm.amazonaws.com', 'eu-north-1', 'x')).toBe('ssm.amazonaws.com');
5758
expect(Default.servicePrincipal('ssm.amazonaws.com', 'ap-east-1', 'x')).toBe('ssm.ap-east-1.amazonaws.com');
5859
expect(Default.servicePrincipal('ssm.amazonaws.com', 'eu-south-1', 'x')).toBe('ssm.eu-south-1.amazonaws.com');
5960
});
60-
});
61+
});

0 commit comments

Comments
 (0)