refactor: moving list enterprise clusters to util package

pkg/cmd/dedicated/listclusters/list.go

@@ -1,8 +1,8 @@
 package listclusters
 
 import (
-	"context"
 	"fmt"
+	"github.com/redhat-developer/app-services-cli/pkg/shared/kafkautil"
 
 	clustersmgmtv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/dump"
@@ -50,40 +50,24 @@ func NewListClusterCommand(f *factory.Factory) *cobra.Command {
 }
 
 func runListClusters(opts *options, f *factory.Factory) error {
-	err := listEnterpriseClusters(opts, f)
+	kfmClusterList, err := kafkautil.ListEnterpriseClusters(f)
+	opts.kfmClusterList = kfmClusterList
 	if err != nil {
 		return err
 	}
-	clist, err := getPaginatedClusterList(opts)
+	clist, err := clustermgmt.GetClusterListByIds(opts.f, opts.accessToken, opts.clusterManagementApiUrl, createSearchString(opts), len(opts.kfmClusterList.Items))
 	if err != nil {
 		return err
 	}
+	if clist == nil {
+		return opts.f.Localizer.MustLocalizeError("dedicated.list.error.noRegisteredClustersFound")
+	}
 	opts.clustermgmtClusterList = clist
 	opts.registeredClusters = kfmListToClusterRowList(opts)
 	displayRegisteredClusters(opts)
 	return nil
 }
 
-func listEnterpriseClusters(opts *options, f *factory.Factory) error {
-	conn, err := f.Connection()
-	if err != nil {
-		return err
-	}
-	ctx := context.Background()
-	api := conn.API()
-	cl := api.KafkaMgmtEnterprise().GetEnterpriseOsdClusters(ctx)
-	clist, response, err := cl.Execute()
-	if err != nil {
-		return err
-	}
-	opts.kfmClusterList = &clist
-	f.Logger.Debug(response)
-	if len(opts.kfmClusterList.Items) == 0 {
-		return f.Localizer.MustLocalizeError("dedicated.list.cmd.errorNoRegisteredClusters")
-	}
-	return nil
-}
-
 func createSearchString(opts *options) string {
 	searchString := ""
 	for idx, kfmcluster := range opts.kfmClusterList.Items {
@@ -95,15 +79,6 @@ func createSearchString(opts *options) string {
 	return searchString
 }
 
-func getPaginatedClusterList(opts *options) (*clustersmgmtv1.ClusterList, error) {
-	// get ids of clusters and create an ocm call filtering by those ids
-	ocmcl, err := clustermgmt.GetClusterListByIds(opts.f, opts.accessToken, opts.clusterManagementApiUrl, createSearchString(opts), len(opts.kfmClusterList.Items))
-	if err != nil {
-		return nil, err
-	}
-	return ocmcl, nil
-}
-
 func kfmListToClusterRowList(opts *options) []clusterRow {
 	var crl []clusterRow
 

pkg/shared/kafkautil/dedicated_utils.go

@@ -0,0 +1,26 @@
+package kafkautil
+
+import (
+	"context"
+	"github.com/redhat-developer/app-services-cli/pkg/shared/factory"
+	kafkamgmtclient "github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkamgmt/apiv1/client"
+)
+
+func ListEnterpriseClusters(f *factory.Factory) (*kafkamgmtclient.EnterpriseClusterList, error) {
+	conn, err := f.Connection()
+	if err != nil {
+		return nil, err
+	}
+	ctx := context.Background()
+	api := conn.API()
+	cl := api.KafkaMgmtEnterprise().GetEnterpriseOsdClusters(ctx)
+	clist, response, err := cl.Execute()
+	if err != nil {
+		return nil, err
+	}
+	if len(clist.Items) == 0 {
+		return &clist, nil
+	}
+	f.Logger.Debug(response)
+	return &clist, nil
+}