OCM-13047 | fix: Oproles add path to hcpsharedvpc policy ARNs manual …

…mode
openshift · Dec 11, 2024 · 1fe59e9 · 1fe59e9
1 parent 0bbbd7b
commit 1fe59e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/create/operatorroles/by_clusterkey.go b/cmd/create/operatorroles/by_clusterkey.go
@@ -497,7 +497,8 @@ func buildCommands(r *rosa.Runtime, env string,
 
 			// Attach policies to roles
 			for _, policy := range policies {
-				arn := fmt.Sprintf("arn:%s:iam::%s:policy/%s", r.Creator.Partition, r.Creator.AccountID, policy)
+				arn := aws.GetPolicyArn(r.Creator.Partition, r.Creator.AccountID, policy, path)
+
 				attachSharedVpcRolePolicy = awscb.NewIAMCommandBuilder().
 					SetCommand(awscb.AttachRolePolicy).
 					AddParam(awscb.RoleName, roleName).

diff --git a/cmd/create/operatorroles/by_prefix.go b/cmd/create/operatorroles/by_prefix.go
@@ -584,7 +584,8 @@ func buildCommandsFromPrefix(r *rosa.Runtime, env string,
 
 			// Attach policies to roles
 			for _, policy := range policies {
-				arn := fmt.Sprintf("arn:%s:iam::%s:policy/%s", r.Creator.Partition, r.Creator.AccountID, policy)
+				arn := aws.GetPolicyArn(r.Creator.Partition, r.Creator.AccountID, policy, path)
+
 				attachSharedVpcRolePolicy = awscb.NewIAMCommandBuilder().
 					SetCommand(awscb.AttachRolePolicy).
 					AddParam(awscb.RoleName, roleName).