Skip to content

Revert "Using Pseudo Function to get Service URL Domain (#6632)" #6946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

Revert "Using Pseudo Function to get Service URL Domain (#6632)" #6946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudformation/ad/ad-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: ec2.amazonaws.com
Version: "2012-10-17"
ManagedPolicyArns:
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore
Expand Down
4 changes: 2 additions & 2 deletions cloudformation/proxy/proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: ec2.amazonaws.com
Version: 2012-10-17
ManagedPolicyArns:
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore
Expand All @@ -189,7 +189,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: ec2.amazonaws.com
Version: 2012-10-17
ManagedPolicyArns:
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore
Expand Down
8 changes: 4 additions & 4 deletions tests/iam_policies/cluster-roles.cfn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
Version: '2012-10-17'
Path: /parallelcluster/
ManagedPolicyArns:
Expand Down Expand Up @@ -105,7 +105,7 @@ Resources:
Condition:
StringEquals:
iam:PassedToService:
- !Sub ec2.${AWS::URLSuffix}
- !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
- Action:
- ec2:DescribeInstances
- ec2:DescribeInstanceStatus
Expand Down Expand Up @@ -147,7 +147,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
Version: '2012-10-17'
Path: /parallelcluster/
ManagedPolicyArns:
Expand Down Expand Up @@ -235,7 +235,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]
Version: '2012-10-17'
Path: /parallelcluster/
ManagedPolicyArns:
Expand Down
2 changes: 1 addition & 1 deletion ...tests/ad_integration/test_ad_integration/test_ad_integration_on_login_nodes/ad_stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Resources:
- Action: sts:AssumeRole
Effect: Allow
Principal:
Service: !Sub ec2.${AWS::URLSuffix}
Service: ec2.amazonaws.com
Copy link
Contributor

@gmarciani gmarciani Aug 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not applying the same approach we did for the other template?

Service: !If [ GovCloud, 'ec2.amazonaws-us-gov.com', !If [ China, 'ec2.amazonaws.cn', 'ec2.amazonaws.com']]

Copy link
Contributor Author

@himani2411 himani2411 Aug 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was something that I reverted so i prefer to revert to the original value that was existing instead of changing it now and re-testing it again in isolated regions.

I have already created a backlog task for deep diving on why we should keep the SP at all especially in isolated regions.

Version: "2012-10-17"
ManagedPolicyArns:
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore
Expand Down
Loading