Merge pull request #1641 from oriAdler/OCM-4883

Revert "OCM-4883 | fix: fetch passed arn in all roles"
openshift · Dec 4, 2023 · b0d23be · b0d23be
2 parents 373e4c2 + 03e8303
commit b0d23be
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/cmd/create/operatorroles/by_prefix.go b/cmd/create/operatorroles/by_prefix.go
@@ -67,17 +67,12 @@ func handleOperatorRolesPrefixOptions(r *rosa.Runtime, cmd *cobra.Command) {
 		}
 	}
 	args.hostedCp = isHostedCP
-	if args.installerRoleArn == "" {
-		if args.hostedCp {
-			args.installerRoleArn = interactiveRoles.GetInstallerRoleArn(r, cmd, args.installerRoleArn, "",
-				r.AWSClient.FindRoleARNsHostedCp)
-		} else {
-			args.installerRoleArn = interactiveRoles.GetInstallerRoleArn(r, cmd, args.installerRoleArn, "",
-				r.AWSClient.FindRoleARNsClassic)
-		}
+	if args.hostedCp {
+		args.installerRoleArn = interactiveRoles.GetInstallerRoleArn(r, cmd, args.installerRoleArn, "",
+			r.AWSClient.FindRoleARNsHostedCp)
 	} else {
 		args.installerRoleArn = interactiveRoles.GetInstallerRoleArn(r, cmd, args.installerRoleArn, "",
-			r.AWSClient.FindRoleARNs)
+			r.AWSClient.FindRoleARNsClassic)
 	}
 }