Merge branch 'main' into ocm-3993

cmd/ocm/create/cluster/cmd.go

@@ -521,9 +521,10 @@ func preRun(cmd *cobra.Command, argv []string) error {
 	// If marketplace-gcp subscription type is used, provider can only be GCP
 	gcpBillingModel, _ := billing.GetBillingModel(connection, billing.MarketplaceGcpSubscriptionType)
 	gcpSubscriptionTypeTemplate := subscriptionTypeOption(gcpBillingModel.ID(), gcpBillingModel.Description())
-	isGcpMarketplaceSubscriptionType := args.subscriptionType == gcpSubscriptionTypeTemplate.Value
+	isGcpMarketplace :=
+		parseSubscriptionType(args.subscriptionType) == parseSubscriptionType(gcpSubscriptionTypeTemplate.Value)
 
-	if isGcpMarketplaceSubscriptionType {
+	if isGcpMarketplace {
 		fmt.Println("setting provider to", c.ProviderGCP)
 		args.provider = c.ProviderGCP
 	} else {
@@ -540,7 +541,7 @@ func preRun(cmd *cobra.Command, argv []string) error {
 	}
 
 	// If marketplace-gcp subscription type is used, ccs should by default be true
-	if isGcpMarketplaceSubscriptionType {
+	if isGcpMarketplace {
 		fmt.Println("setting ccs to 'true'")
 		args.ccs.Enabled = true
 		fmt.Println("Review and accept Google Terms and Agreements on", gcpTermsAgreementsHyperlink)
@@ -572,8 +573,8 @@ func preRun(cmd *cobra.Command, argv []string) error {
 	}
 
 	var gcpMarketplaceEnabled string
-	if isGcpMarketplaceSubscriptionType {
-		gcpMarketplaceEnabled = strconv.FormatBool(isGcpMarketplaceSubscriptionType)
+	if isGcpMarketplace {
+		gcpMarketplaceEnabled = strconv.FormatBool(isGcpMarketplace)
 	}
 	versions, defaultVersion, err := getVersionOptionsWithDefault(connection, args.channelGroup,
 		gcpMarketplaceEnabled)