chore: rebase changes

redhat-developer · Mar 7, 2023 · 9a6f27c · 9a6f27c
1 parent b89031b
commit 9a6f27c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 91 deletions.
diff --git a/pkg/cmd/dedicated/deregister/deregister.go b/pkg/cmd/dedicated/deregister/deregister.go
@@ -113,9 +113,13 @@ func runDeRegisterClusterCmd(opts *options) error {
 }
 
 func getListOfClusters(opts *options) ([]*clustersmgmtv1.Cluster, error) {
-	kfmClusterList, err := kafkautil.ListEnterpriseClusters(opts.f)
+	kfmClusterList, response, err := kafkautil.ListEnterpriseClusters(opts.f)
 	if err != nil {
-		return nil, err
+		if response.StatusCode == 403 {
+			return nil, opts.f.Localizer.MustLocalizeError("")
+		}
+
+		return nil, fmt.Errorf("%v, %v", response.Status, err)
 	}
 
 	ocmClusterList, err := clustermgmt.GetClusterListByIds(opts.f, opts.accessToken, opts.clusterManagementApiUrl, kafkautil.CreateClusterSearchStringFromKafkaList(kfmClusterList), len(kfmClusterList.Items))

diff --git a/pkg/cmd/dedicated/listclusters/list.go b/pkg/cmd/dedicated/listclusters/list.go
@@ -1,6 +1,7 @@
 package listclusters
 
 import (
+	"fmt"
 	clustersmgmtv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/dump"
 	"github.com/redhat-developer/app-services-cli/pkg/shared/connection/api/clustermgmt"

diff --git a/pkg/cmd/kafka/create/create.go b/pkg/cmd/kafka/create/create.go
@@ -612,83 +612,8 @@ func promptKafkaPayload(opts *options, constants *remote.DynamicServiceConstants
 		if err != nil {
 			return nil, err
 		}
-		userQuotaJSON, marshalErr := json.MarshalIndent(userQuota, "", "  ")
-		if marshalErr != nil {
-			f.Logger.Debug(marshalErr)
-		} else {
-			f.Logger.Debug("Selected Quota object:")
-			f.Logger.Debug(string(userQuotaJSON))
-		}
-
-		regionIDs, err := GetEnabledCloudRegionIDs(opts.f, answers.CloudProvider, userQuota)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(regionIDs) == 0 {
-			return nil, f.Localizer.MustLocalizeError("kafka.create.error.noRegionSupported")
-		}
-
-		regionPrompt := &survey.Select{
-			Message: f.Localizer.MustLocalize("kafka.create.input.cloudRegion.message"),
-			Options: regionIDs,
-			Help:    f.Localizer.MustLocalize("kafka.create.input.cloudRegion.help"),
-		}
-
-		err = survey.AskOne(regionPrompt, &answers.Region)
-		if err != nil {
-			return nil, err
-		}
-
-		sizes, err = FetchValidKafkaSizes(opts.f, answers.CloudProvider, answers.Region, *userQuota)
-		if err != nil {
-			return nil, err
-		}
-
-		index, err := promptUserForSizes(opts.f, &sizes)
-		if err == nil {
-			return nil, err
-		}
-
-		answers.Size = sizes[index].GetId()
-
-		accountIDNullable := kafkamgmtclient.NullableString{}
-		marketplaceProviderNullable := kafkamgmtclient.NullableString{}
-		billingNullable := kafkamgmtclient.NullableString{}
-
-		if answers.BillingModel != "" {
-			billingNullable.Set(&answers.BillingModel)
-		}
-
-		if answers.Marketplace != "" {
-			marketplaceProviderNullable.Set(&answers.Marketplace)
-		}
-
-		if answers.MarketplaceAcctID != "" {
-			accountIDNullable.Set(&answers.MarketplaceAcctID)
-		}
-		payload = &kafkamgmtclient.KafkaRequestPayload{
-			Name:                  answers.Name,
-			Region:                &answers.Region,
-			CloudProvider:         &answers.CloudProvider,
-			BillingModel:          billingNullable,
-			BillingCloudAccountId: accountIDNullable,
-			Marketplace:           marketplaceProviderNullable,
-		}
-		printSizeWarningIfNeeded(opts.f, answers.Size, sizes)
-		payload.SetPlan(mapAmsTypeToBackendType(userQuota) + "." + answers.Size)
-
 	}
 
-	if opts.useEnterpriseCluster {
-		if len(orgQuota.EnterpriseQuotas) == 0 {
-			return nil, fmt.Errorf("No enterprise quota available")
-		}
-
-		// casting to nullable string
-		var clusterIdSNS kafkamgmtclient.NullableString
-		clusterIdSNS.Set(opts.selectedCluster.ClusterId)
-
 	var sizes []kafkamgmtclient.SupportedKafkaSize
 	payload := &kafkamgmtclient.KafkaRequestPayload{}
 
@@ -710,20 +635,9 @@ func promptKafkaPayload(opts *options, constants *remote.DynamicServiceConstants
 
 		sizes = supportedKafkaTypes[0].Sizes
 
-		if opts.size == "" {
-			index, err := promptUserForSizes(opts.f, &sizes)
-			if err != nil {
-				return nil, err
-			}
-
-			selectedSize := sizes[index]
-
-			if selectedSize.GetCapacityConsumed() > cluster.CapacityInformation.RemainingKafkaStreamingUnits {
-				return nil, opts.f.Localizer.MustLocalizeError("kafka.create.cluster.error.noEnoughCapacity", localize.NewEntry("Size", selectedSize.GetId()))
-			}
-
-			answers.Size = selectedSize.GetId()
-
+		index, err := promptUserForSizes(opts.f, &sizes)
+		if err != nil {
+			return nil, err
 		}
 
 		selectedSize := sizes[index]