Skip to content

Commit 28330be

Browse files
himani2411Himani Anil Deshpande
andauthored
Using Pseudo Function to get Service URL Domain (#6632)
Co-authored-by: Himani Anil Deshpande <[email protected]>
1 parent b4402b4 commit 28330be

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

cloudformation/ad/ad-integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ Resources:
358358
- Action: sts:AssumeRole
359359
Effect: Allow
360360
Principal:
361-
Service: ec2.amazonaws.com
361+
Service: !Sub ec2.${AWS::URLSuffix}
362362
Version: "2012-10-17"
363363
ManagedPolicyArns:
364364
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore

cloudformation/proxy/proxy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Resources:
170170
- Action: sts:AssumeRole
171171
Effect: Allow
172172
Principal:
173-
Service: ec2.amazonaws.com
173+
Service: !Sub ec2.${AWS::URLSuffix}
174174
Version: 2012-10-17
175175
ManagedPolicyArns:
176176
- arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
@@ -189,7 +189,7 @@ Resources:
189189
- Action: sts:AssumeRole
190190
Effect: Allow
191191
Principal:
192-
Service: ec2.amazonaws.com
192+
Service: !Sub ec2.${AWS::URLSuffix}
193193
Version: 2012-10-17
194194
ManagedPolicyArns:
195195
- arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore

tests/iam_policies/cluster-roles.cfn.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Resources:
5959
- Action: sts:AssumeRole
6060
Effect: Allow
6161
Principal:
62-
Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
62+
Service: !Sub ec2.${AWS::URLSuffix}
6363
Version: '2012-10-17'
6464
Path: /parallelcluster/
6565
ManagedPolicyArns:
@@ -105,7 +105,7 @@ Resources:
105105
Condition:
106106
StringEquals:
107107
iam:PassedToService:
108-
- !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
108+
- !Sub ec2.${AWS::URLSuffix}
109109
- Action:
110110
- ec2:DescribeInstances
111111
- ec2:DescribeInstanceStatus
@@ -147,7 +147,7 @@ Resources:
147147
- Action: sts:AssumeRole
148148
Effect: Allow
149149
Principal:
150-
Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
150+
Service: !Sub ec2.${AWS::URLSuffix}
151151
Version: '2012-10-17'
152152
Path: /parallelcluster/
153153
ManagedPolicyArns:
@@ -235,7 +235,7 @@ Resources:
235235
- Action: sts:AssumeRole
236236
Effect: Allow
237237
Principal:
238-
Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
238+
Service: !Sub ec2.${AWS::URLSuffix}
239239
Version: '2012-10-17'
240240
Path: /parallelcluster/
241241
ManagedPolicyArns:

tests/integration-tests/tests/ad_integration/test_ad_integration/test_ad_integration_on_login_nodes/ad_stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Resources:
7373
- Action: sts:AssumeRole
7474
Effect: Allow
7575
Principal:
76-
Service: ec2.amazonaws.com
76+
Service: !Sub ec2.${AWS::URLSuffix}
7777
Version: "2012-10-17"
7878
ManagedPolicyArns:
7979
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore

0 commit comments

Comments
 (0)