fix(kafka create): reduce number of calls made to AMS API

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/redhat-developer/app-services-sdk-go/accountmgmt v0.2.0
 	github.com/redhat-developer/app-services-sdk-go/connectormgmt v0.5.0
 	github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.6.0
-	github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.12.0
+	github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.12.1
 	github.com/redhat-developer/app-services-sdk-go/registryinstance v0.3.1
 	github.com/redhat-developer/app-services-sdk-go/registrymgmt v0.6.1
 	github.com/redhat-developer/service-binding-operator v0.9.0
@@ -39,7 +39,7 @@ require (
 	gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a
 	golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
 	golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect
-	golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
+	golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
 	golang.org/x/text v0.3.7
 	golang.org/x/tools v0.1.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect

go.sum

@@ -640,8 +640,8 @@ github.com/redhat-developer/app-services-sdk-go/connectormgmt v0.5.0 h1:cf+K96kW
 github.com/redhat-developer/app-services-sdk-go/connectormgmt v0.5.0/go.mod h1:JAedrXf/qLHd7lpOS+bOFh8nrOpp2j0sg4/VG/1um6c=
 github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.6.0 h1:ExEHQaihnPNxN2nKXB0q5nrmSv4p8b3Idzt7TChxv+Q=
 github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.6.0/go.mod h1:hMpejngP3BFnifCDH1gKRG9cU9Q4lr0WiQaW7A1LYo4=
-github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.12.0 h1:63UhOYB8TozKdnkkws2pXc0D1lEB+K3qX63/OxkjDas=
-github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.12.0/go.mod h1:m+m7d6xkC9WbSxemslyhjv0jVhquWLysRfdh+RQ5hH0=
+github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.12.1 h1:Gcyn2kLlslsVT6T8qoiCJpJFPrnD2i2KIFeKQJrXkTY=
+github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.12.1/go.mod h1:RoPo3tyHjv8apStFNVjChwWYdlWhg6hMzi1IrH3yQX8=
 github.com/redhat-developer/app-services-sdk-go/registryinstance v0.3.1 h1:xRq5XJzRDs/Z7e/9SDt6zbNRIyesC4LTqN9ajHKwjHo=
 github.com/redhat-developer/app-services-sdk-go/registryinstance v0.3.1/go.mod h1:Z/gr/snlpsqYg4vftmcx97vCR3qMQJhALGelDHx4pMA=
 github.com/redhat-developer/app-services-sdk-go/registrymgmt v0.6.1 h1:3sUmQ3nAawsYWg7ZCO2Q8HF2J7MW6YA38h/YFL3ao6o=
@@ -932,8 +932,9 @@ golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 h1:zwrSfklXn0gxyLRX/aR+q6cgHbV/ItVyzbPlbA+dkAw=
 golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb h1:8tDJ3aechhddbdPAxpycgXHJRMLpk/Ab+aa4OgdN5/g=
+golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

pkg/cmd/kafka/create/api_validators.go

@@ -3,6 +3,7 @@ package create
 import (
 	"strings"
 
+	"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil"
 	"github.com/redhat-developer/app-services-cli/pkg/core/localize"
 	"github.com/redhat-developer/app-services-cli/pkg/shared/accountmgmtutil"
 	"github.com/redhat-developer/app-services-cli/pkg/shared/connection"
@@ -13,17 +14,18 @@ import (
 )
 
 type ValidatorInput struct {
-	provider string
-	region   string
-	size     string
-
+	provider            string
+	region              string
+	size                string
 	userAMSInstanceType *accountmgmtutil.QuotaSpec
 
 	f         *factory.Factory
 	constants *remote.DynamicServiceConstants
 	conn      connection.Connection
 }
 
+var validBillingModels []string = []string{MarketplaceBillingModel, StandardBillingModel}
+
 func (input *ValidatorInput) ValidateProviderAndRegion() error {
 	f := input.f
 	f.Logger.Debug("Validating provider and region")
@@ -108,7 +110,7 @@ func (input *ValidatorInput) ValidateSize() error {
 		return nil
 	}
 
-	sizes, err := FetchValidKafkaSizesLabels(input.f, input.provider, input.region, *input.userAMSInstanceType)
+	sizes, err := FetchValidKafkaSizesLabels(input.f, input.provider, input.region, input.userAMSInstanceType)
 	if err != nil {
 		return err
 	}
@@ -119,3 +121,19 @@ func (input *ValidatorInput) ValidateSize() error {
 
 	return nil
 }
+
+// ValidateBillingModel validates if user provided a correct billing model
+func ValidateBillingModel(billingModel string) error {
+
+	if billingModel == "" {
+		return nil
+	}
+
+	isValid := flagutil.IsValidInput(billingModel, validBillingModels...)
+
+	if isValid {
+		return nil
+	}
+
+	return flagutil.InvalidValueError("billing-model", billingModel, validBillingModels...)
+}

pkg/cmd/kafka/create/completions.go

@@ -46,28 +46,28 @@ func GetKafkaSizeCompletionValues(f *factory.Factory, providerID string, regionI
 		return nil, directive
 	}
 
-	userInstanceType, _ := accountmgmtutil.GetUserSupportedInstanceType(f.Context, &constants.Kafka.Ams, conn)
+	userInstanceType, _ := accountmgmtutil.GetUserSupportedInstanceType(f.Context, &constants.Kafka.Ams, conn, "")
 
 	// Not including quota in this request as it takes very long time to list quota for all regions in suggestion mode
-	validRegions, _ = FetchValidKafkaSizesLabels(f, providerID, regionId, *userInstanceType)
+	validRegions, _ = FetchValidKafkaSizesLabels(f, providerID, regionId, userInstanceType)
 
 	return validRegions, cobra.ShellCompDirectiveNoSpace
 }
 
 // GetMarketplaceAcctIdCompletionValues returns a list of valid marketplace account IDs for the organization
-func GetMarketplaceAcctIdCompletionValues(f *factory.Factory) (validMarketplaceAcctIDs []string, directive cobra.ShellCompDirective) {
-	directive = cobra.ShellCompDirectiveNoSpace
+// func GetMarketplaceAcctIdCompletionValues(f *factory.Factory) (validMarketplaceAcctIDs []string, directive cobra.ShellCompDirective) {
+// 	directive = cobra.ShellCompDirectiveNoSpace
 
-	validMarketplaceAcctIDs, _ = accountmgmtutil.GetValidMarketplaceAcctIDs(f.Context, f.Connection, "")
+// 	validMarketplaceAcctIDs, _ = accountmgmtutil.GetValidMarketplaceAcctIDs(f.Context,)
 
-	return validMarketplaceAcctIDs, directive
-}
+// 	return validMarketplaceAcctIDs, directive
+// }
 
 // GetMarketplaceCompletionValues returns a list of valid marketplaces for the organization
-func GetMarketplaceCompletionValues(f *factory.Factory) (validMarketplaces []string, directive cobra.ShellCompDirective) {
-	directive = cobra.ShellCompDirectiveNoSpace
+// func GetMarketplaceCompletionValues(f *factory.Factory) (validMarketplaces []string, directive cobra.ShellCompDirective) {
+// 	directive = cobra.ShellCompDirectiveNoSpace
 
-	validMarketplaces, _ = accountmgmtutil.GetValidMarketplaces(f.Context, f.Connection)
+// 	validMarketplaces, _ = accountmgmtutil.GetValidMarketplaces(f.Context, f.Connection)
 
-	return validMarketplaces, directive
-}
+// 	return validMarketplaces, directive
+// }

pkg/cmd/kafka/create/create.go

@@ -52,6 +52,7 @@ type options struct {
 
 	marketplaceAcctId string
 	marketplace       string
+	billingModel      string
 
 	outputFormat string
 	autoUse      bool
@@ -93,7 +94,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 				}
 			}
 
-			if opts.bypassChecks && (opts.marketplace != "" || opts.marketplaceAcctId != "") {
+			if opts.bypassChecks && (opts.marketplace != "" || opts.marketplaceAcctId != "" || opts.billingModel != "") {
 				return f.Localizer.MustLocalizeError("kafka.create.error.bypassChecks.marketplace")
 			}
 
@@ -111,26 +112,6 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 				return flagutil.InvalidValueError("output", opts.outputFormat, validOutputFormats...)
 			}
 
-			if !opts.bypassChecks {
-				validMarketplaces, err := accountmgmtutil.GetValidMarketplaces(f.Context, f.Connection)
-				if err != nil {
-					return err
-				}
-
-				if opts.marketplace != "" && !flagutil.IsValidInput(opts.marketplace, validMarketplaces...) {
-					return flagutil.InvalidValueError(FlagMarketPlace, opts.marketplace, validMarketplaces...)
-				}
-
-				validMarketplaceAcctIDs, err := accountmgmtutil.GetValidMarketplaceAcctIDs(f.Context, f.Connection, opts.marketplace)
-				if err != nil {
-					return err
-				}
-
-				if opts.marketplaceAcctId != "" && !flagutil.IsValidInput(opts.marketplaceAcctId, validMarketplaceAcctIDs...) {
-					return flagutil.InvalidValueError(FlagMarketPlaceAcctID, opts.marketplaceAcctId, validMarketplaceAcctIDs...)
-				}
-			}
-
 			return runCreate(opts)
 		},
 	}
@@ -147,6 +128,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 	flags.BoolVar(&opts.autoUse, "use", true, f.Localizer.MustLocalize("kafka.create.flag.autoUse.description"))
 	flags.BoolVarP(&opts.wait, "wait", "w", false, f.Localizer.MustLocalize("kafka.create.flag.wait.description"))
 	flags.BoolVarP(&opts.dryRun, "dry-run", "", false, f.Localizer.MustLocalize("kafka.create.flag.dryrun.description"))
+	flags.StringVar(&opts.billingModel, "billing-model", "", f.Localizer.MustLocalize("kafka.create.flag.billingModel.description"))
 	flags.AddBypassTermsCheck(&opts.bypassChecks)
 
 	_ = cmd.RegisterFlagCompletionFunc(FlagProvider, func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
@@ -161,13 +143,13 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 		return GetKafkaSizeCompletionValues(f, opts.provider, opts.region)
 	})
 
-	_ = cmd.RegisterFlagCompletionFunc(FlagMarketPlaceAcctID, func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
-		return GetMarketplaceAcctIdCompletionValues(f)
-	})
+	// _ = cmd.RegisterFlagCompletionFunc(FlagMarketPlaceAcctID, func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
+	// 	return GetMarketplaceAcctIdCompletionValues(f)
+	// })
 
-	_ = cmd.RegisterFlagCompletionFunc(FlagMarketPlace, func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
-		return GetMarketplaceCompletionValues(f)
-	})
+	// _ = cmd.RegisterFlagCompletionFunc(FlagMarketPlace, func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
+	// 	return GetMarketplaceCompletionValues(f)
+	// })
 
 	return cmd
 }
@@ -212,10 +194,37 @@ func runCreate(opts *options) error {
 			return nil
 		}
 
-		userInstanceType, err = accountmgmtutil.GetUserSupportedInstanceType(f.Context, &constants.Kafka.Ams, conn)
+		err = ValidateBillingModel(opts.billingModel)
+		if err != nil {
+			return err
+		}
+
+		userInstanceType, err = accountmgmtutil.GetUserSupportedInstanceType(f.Context, &constants.Kafka.Ams, conn, opts.billingModel)
 		if err != nil || userInstanceType == nil {
 			return f.Localizer.MustLocalizeError("kafka.create.error.userInstanceType.notFound")
 		}
+
+		if opts.billingModel == "marketplace" {
+
+			validMarketplaces, newErr := accountmgmtutil.GetValidMarketplaces(userInstanceType)
+			if newErr != nil {
+				return newErr
+			}
+
+			if opts.marketplace != "" && !flagutil.IsValidInput(opts.marketplace, validMarketplaces...) {
+				return flagutil.InvalidValueError(FlagMarketPlace, opts.marketplace, validMarketplaces...)
+			}
+
+			validMarketplaceAcctIDs, newErr := accountmgmtutil.GetValidMarketplaceAcctIDs(userInstanceType, opts.marketplace)
+			if newErr != nil {
+				return newErr
+			}
+
+			if opts.marketplaceAcctId != "" && !flagutil.IsValidInput(opts.marketplaceAcctId, validMarketplaceAcctIDs...) {
+				return flagutil.InvalidValueError(FlagMarketPlaceAcctID, opts.marketplaceAcctId, validMarketplaceAcctIDs...)
+			}
+
+		}
 	}
 
 	var payload *kafkamgmtclient.KafkaRequestPayload
@@ -225,7 +234,7 @@ func runCreate(opts *options) error {
 			return f.Localizer.MustLocalizeError("kafka.create.error.noInteractiveMode")
 		}
 
-		payload, err = promptKafkaPayload(opts, *userInstanceType)
+		payload, err = promptKafkaPayload(opts, userInstanceType)
 		if err != nil {
 			return err
 		}
@@ -249,6 +258,8 @@ func runCreate(opts *options) error {
 			payload.Marketplace.Set(&opts.marketplace)
 			payload.BillingCloudAccountId = kafkamgmtclient.NullableString{}
 			payload.BillingCloudAccountId.Set(&opts.marketplaceAcctId)
+			payload.BillingModel = kafkamgmtclient.NullableString{}
+			payload.BillingModel.Set(&opts.billingModel)
 		}
 
 		if !opts.bypassChecks {
@@ -271,7 +282,7 @@ func runCreate(opts *options) error {
 				return err1
 			}
 			if opts.size != "" {
-				sizes, err1 := FetchValidKafkaSizes(opts.f, opts.provider, opts.region, *userInstanceType)
+				sizes, err1 := FetchValidKafkaSizes(opts.f, opts.provider, opts.region, userInstanceType)
 				if err1 != nil {
 					return err1
 				}
@@ -400,7 +411,7 @@ type promptAnswers struct {
 
 // Show a prompt to allow the user to interactively insert the data for their Kafka
 // nolint:funlen
-func promptKafkaPayload(opts *options, userQuotaType accountmgmtutil.QuotaSpec) (*kafkamgmtclient.KafkaRequestPayload, error) {
+func promptKafkaPayload(opts *options, userQuotaType *accountmgmtutil.QuotaSpec) (*kafkamgmtclient.KafkaRequestPayload, error) {
 	f := opts.f
 
 	accountIDNullable := kafkamgmtclient.NullableString{}
@@ -438,7 +449,7 @@ func promptKafkaPayload(opts *options, userQuotaType accountmgmtutil.QuotaSpec)
 		return nil, err
 	}
 
-	regionIDs, err := GetEnabledCloudRegionIDs(opts.f, answers.CloudProvider, &userQuotaType)
+	regionIDs, err := GetEnabledCloudRegionIDs(opts.f, answers.CloudProvider, userQuotaType)
 	if err != nil {
 		return nil, err
 	}
@@ -474,29 +485,38 @@ func promptKafkaPayload(opts *options, userQuotaType accountmgmtutil.QuotaSpec)
 		}
 	}
 
-	marketplaces, err := accountmgmtutil.GetValidMarketplaces(f.Context, f.Connection)
-	if err != nil {
-		return nil, err
-	}
+	if !opts.bypassChecks && userQuotaType.BillingModel == "marketplace" {
 
-	if !opts.bypassChecks && len(marketplaces) > 0 {
-		if err = promptMarketplaceSelect(f.Localizer, marketplaces, answers); err != nil {
-			return nil, err
-		}
-
-		marketplaceAcctIDs, err := accountmgmtutil.GetValidMarketplaceAcctIDs(f.Context, f.Connection, answers.Marketplace)
+		marketplaces, err := accountmgmtutil.GetValidMarketplaces(userQuotaType)
 		if err != nil {
 			return nil, err
 		}
 
-		if len(marketplaceAcctIDs) > 0 {
-			if err = promptMarketplaceAcctIDSelect(f.Localizer, marketplaceAcctIDs, answers); err != nil {
+		if len(marketplaces) > 0 {
+
+			if err = promptBillingModelSelect(f.Localizer, answers); err != nil {
+				return nil, err
+			}
+
+			if err = promptMarketplaceSelect(f.Localizer, marketplaces, answers); err != nil {
+				return nil, err
+			}
+
+			marketplaceAcctIDs, err := accountmgmtutil.GetValidMarketplaceAcctIDs(userQuotaType, answers.Marketplace)
+			if err != nil {
 				return nil, err
 			}
-		}
 
-		accountIDNullable.Set(&answers.MarketplaceAcctID)
-		marketplaceProviderNullable.Set(&answers.Marketplace)
+			if len(marketplaceAcctIDs) > 0 {
+				if err = promptMarketplaceAcctIDSelect(f.Localizer, marketplaceAcctIDs, answers); err != nil {
+					return nil, err
+				}
+			}
+
+			accountIDNullable.Set(&answers.MarketplaceAcctID)
+			marketplaceProviderNullable.Set(&answers.Marketplace)
+
+		}
 	}
 
 	payload := &kafkamgmtclient.KafkaRequestPayload{
@@ -507,11 +527,26 @@ func promptKafkaPayload(opts *options, userQuotaType accountmgmtutil.QuotaSpec)
 		Marketplace:           marketplaceProviderNullable,
 	}
 	printSizeWarningIfNeeded(opts.f, answers.Size, sizes)
-	payload.SetPlan(mapAmsTypeToBackendType(&userQuotaType) + "." + answers.Size)
+	payload.SetPlan(mapAmsTypeToBackendType(userQuotaType) + "." + answers.Size)
 
 	return payload, nil
 }
 
+func promptBillingModelSelect(localizer localize.Localizer, answers *promptAnswers) error {
+
+	billingModelPrompt := &survey.Select{
+		Message: "Billing model:",
+		Options: kafkacmdutil.ValidBillingModels,
+		Help:    localizer.MustLocalize("kafka.create.flag.billingModel.description"),
+	}
+
+	if err := survey.AskOne(billingModelPrompt, &answers.Marketplace); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func promptMarketplaceSelect(localizer localize.Localizer, marketplaceAcctIDs []string, answers *promptAnswers) error {
 
 	marketplacePrompt := &survey.Select{