remove inline

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

Hide file tree

Showing 3 changed files with 0 additions and 21 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...)

diff --git a/cmd/upgrade/roles/cmd.go b/cmd/upgrade/roles/cmd.go
@@ -669,8 +669,6 @@ func buildAccountRoleCommandsFromCluster(
 			_, 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,
@@ -681,7 +679,6 @@ func buildAccountRoleCommandsFromCluster(
 					PolicyName:           policyName,
 					AccountPolicyPath:    accountPolicyPath,
 					PolicyARN:            policyARN,
-					HasInlinePolicy:      hasInlinePolicy,
 				},
 			)
 			commands = append(commands, upgradeAccountPolicyCommands...)
@@ -852,11 +849,6 @@ func upgradeOperatorRolePoliciesFromCluster(
 			if err != nil {
 				return err
 			}
-			//Delete if present else continue
-			err = awsClient.DeleteInlineRolePolicies(operatorRoleName)
-			if err != nil {
-				reporter.Debugf("Error deleting inline role policy %s : %s", policyARN, err)
-			}
 		}
 		reporter.Infof("Upgraded policy with ARN '%s' to version '%s'", policyARN, defaultPolicyVersion)
 	}

diff --git a/pkg/aws/commandbuilder/helper/roles/roles.go b/pkg/aws/commandbuilder/helper/roles/roles.go
@@ -112,7 +112,6 @@ type ManualCommandsForUpgradeAccountRolePolicyInput struct {
 	PolicyName           string
 	AccountPolicyPath    string
 	PolicyARN            string
-	HasInlinePolicy      bool
 }
 
 func ManualCommandsForUpgradeAccountRolePolicy(input ManualCommandsForUpgradeAccountRolePolicyInput) []string {
@@ -146,15 +145,6 @@ func ManualCommandsForUpgradeAccountRolePolicy(input ManualCommandsForUpgradeAcc
 			AddTags(iamTags).
 			AddParam(awscb.Path, input.AccountPolicyPath).
 			Build()
-
-		if input.HasInlinePolicy {
-			deletePolicy := awscb.NewIAMCommandBuilder().
-				SetCommand(awscb.DeleteRolePolicy).
-				AddParam(awscb.RoleName, input.RoleName).
-				AddParam(awscb.PolicyName, input.PolicyName).
-				Build()
-			commands = append(commands, deletePolicy)
-		}
 		commands = append(commands, createPolicy, attachRolePolicy, tagRole)
 	} else {
 		createPolicyVersion := awscb.NewIAMCommandBuilder().