OCM-12100 | fix: Only run oidcprovider command when mode=auto

openshift · Oct 25, 2024 · 5315fb6 · 5315fb6
1 parent 6f43e86
commit 5315fb6
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/cmd/create/oidcconfig/cmd.go b/cmd/create/oidcconfig/cmd.go
@@ -295,23 +295,25 @@ func run(cmd *cobra.Command, _ []string) {
 		os.Exit(1)
 	}
 	oidcConfigId := oidcConfigStrategy.execute(r)
-	if !args.rawFiles {
-		arguments.DisableRegionDeprecationWarning = true // disable region deprecation warning
-		providerArgs := []string{"", mode, oidcConfigInput.IssuerUrl}
-		if oidcConfigId != "" {
-			providerArgs = append(providerArgs, "--oidc-config-id", oidcConfigId)
-			err = oidcprovider.Cmd.Flags().Set("oidc-config-id", oidcConfigId)
-			if err != nil {
+	if mode == interactive.ModeAuto {
+		if !args.rawFiles {
+			arguments.DisableRegionDeprecationWarning = true // disable region deprecation warning
+			providerArgs := []string{"", mode, oidcConfigInput.IssuerUrl}
+			if oidcConfigId != "" {
+				providerArgs = append(providerArgs, "--oidc-config-id", oidcConfigId)
+				err = oidcprovider.Cmd.Flags().Set("oidc-config-id", oidcConfigId)
+				if err != nil {
+					r.Reporter.Errorf("Unable to attempt creation of OIDC provider; oidc config ID"+
+						" not found / not created successfully: %s", err)
+				}
+			} else {
 				r.Reporter.Errorf("Unable to attempt creation of OIDC provider; oidc config ID"+
 					" not found / not created successfully: %s", err)
+				os.Exit(1)
 			}
-		} else {
-			r.Reporter.Errorf("Unable to attempt creation of OIDC provider; oidc config ID"+
-				" not found / not created successfully: %s", err)
-			os.Exit(1)
+			oidcprovider.Cmd.Run(oidcprovider.Cmd, providerArgs)
+			arguments.DisableRegionDeprecationWarning = false // enable region deprecation again
 		}
-		oidcprovider.Cmd.Run(oidcprovider.Cmd, providerArgs)
-		arguments.DisableRegionDeprecationWarning = false // enable region deprecation again
 	}
 }