OCM-7415 | feat: Ensure account roles have expected attached policies

Signed-off-by: marcolan018 <llan@redhat.com>
openshift · May 9, 2024 · b6923f9 · b6923f9
1 parent da3615e
commit b6923f9
Show file tree

Hide file tree

Showing 9 changed files with 420 additions and 196 deletions.
diff --git a/cmd/upgrade/accountroles/cmd.go b/cmd/upgrade/accountroles/cmd.go
@@ -337,8 +337,6 @@ func buildCommands(prefix string, partition string, accountID string, isUpgradeN
 			_, err := awsClient.IsPolicyExists(policyARN)
 			hasPolicy := err == nil
 			policyName := aws.GetPolicyName(accRoleName)
-			_, err = awsClient.IsRolePolicyExists(accRoleName, policyName)
-			hasInlinePolicy := err == nil
 			upgradeAccountPolicyCommands := awscbRoles.ManualCommandsForUpgradeAccountRolePolicy(
 				awscbRoles.ManualCommandsForUpgradeAccountRolePolicyInput{
 					DefaultPolicyVersion: defaultPolicyVersion,
@@ -349,7 +347,6 @@ func buildCommands(prefix string, partition string, accountID string, isUpgradeN
 					PolicyName:           policyName,
 					AccountPolicyPath:    policyPath,
 					PolicyARN:            policyARN,
-					HasInlinePolicy:      hasInlinePolicy,
 				},
 			)
 			commands = append(commands, upgradeAccountPolicyCommands...)