CLOUDP-177525: Migrate operator to new sdk at store/atlas (#2337)

Signed-off-by: Jose Vazquez <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: josvazg

internal/cli/atlas/datafederation/list.go

@@ -50,7 +50,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *ListOpts) Run() error {
-	r, err := opts.store.DataFederationList(opts.ConfigProjectID(), opts.typeFlag)
+	r, err := opts.store.DataFederationList(opts.ConfigProjectID())
 	if err != nil {
 		return err
 	}

internal/cli/atlas/datafederation/list_test.go

@@ -53,7 +53,7 @@ func TestListOpts_Run(t *testing.T) {
 
 	mockStore.
 		EXPECT().
-		DataFederationList(listOpts.ProjectID, listOpts.typeFlag).
+		DataFederationList(listOpts.ProjectID).
 		Return(expected, nil).
 		Times(1)
 

internal/cli/atlas/kubernetes/config/generate.go

@@ -26,6 +26,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/crds"
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/features"
 	"github.com/mongodb/mongodb-atlas-cli/internal/store"
+	"github.com/mongodb/mongodb-atlas-cli/internal/store/atlas"
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/validation"
@@ -41,7 +42,7 @@ type GenerateOpts struct {
 	includeSecrets     bool
 	targetNamespace    string
 	operatorVersion    string
-	store              store.AtlasOperatorGenericStore
+	store              atlas.OperatorGenericStore
 	credsStore         store.CredentialsGetter
 	crdsProvider       crds.AtlasOperatorCRDProvider
 }
@@ -65,7 +66,7 @@ func (opts *GenerateOpts) initStores(ctx context.Context) func() error {
 		var err error
 
 		profile := config.Default()
-		opts.store, err = store.New(store.AuthenticatedPreset(profile), store.WithContext(ctx))
+		opts.store, err = atlas.New(atlas.AuthenticatedPreset(profile), atlas.WithContext(ctx))
 		if err != nil {
 			return err
 		}

internal/cli/atlas/kubernetes/operator/install.go

@@ -28,7 +28,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/crds"
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/features"
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/version"
-	"github.com/mongodb/mongodb-atlas-cli/internal/store"
+	"github.com/mongodb/mongodb-atlas-cli/internal/store/atlas"
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/validation"
@@ -109,7 +109,7 @@ func (opts *InstallOpts) Run(ctx context.Context) error {
 	installer := operator.NewInstaller(opts.versionProvider, kubeCtl)
 
 	profile := config.Default()
-	atlasStore, err := store.New(store.AuthenticatedPreset(profile), store.WithContext(ctx))
+	atlasStore, err := atlas.New(atlas.AuthenticatedPreset(profile), atlas.WithContext(ctx))
 	if err != nil {
 		return err
 	}

internal/cli/atlas/projects/list.go

@@ -47,7 +47,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *ListOpts) Run() error {
-	listOptions := opts.NewListOptions()
+	listOptions := opts.NewAtlasListOptions()
 	var r interface{}
 	var err error
 	if opts.OrgID != "" {

internal/cli/atlas/projects/list_test.go

@@ -37,7 +37,7 @@ func TestList_Run(t *testing.T) {
 		}
 		mockStore.
 			EXPECT().
-			Projects(listOpts.NewListOptions()).
+			Projects(listOpts.NewAtlasListOptions()).
 			Return(expected, nil).
 			Times(1)
 
@@ -54,7 +54,7 @@ func TestList_Run(t *testing.T) {
 
 		mockStore.
 			EXPECT().
-			GetOrgProjects(listOpts.OrgID, listOpts.NewListOptions()).
+			GetOrgProjects(listOpts.OrgID, listOpts.NewAtlasListOptions()).
 			Return(expected, nil).
 			Times(1)
 

internal/cli/atlas/projects/users/list.go

@@ -48,7 +48,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *ListOpts) Run() error {
-	listOptions := opts.NewListOptions()
+	listOptions := opts.NewAtlasListOptions()
 
 	r, err := opts.store.ProjectUsers(opts.ConfigProjectID(), listOptions)
 	if err != nil {

internal/cli/atlas/projects/users/list_test.go

@@ -43,7 +43,7 @@ func TestList_Run(t *testing.T) {
 
 	mockStore.
 		EXPECT().
-		ProjectUsers(listOpts.ProjectID, listOpts.NewListOptions()).
+		ProjectUsers(listOpts.ProjectID, listOpts.NewAtlasListOptions()).
 		Return(&expected, nil).
 		Times(1)
 

internal/cli/list_opts.go

@@ -14,7 +14,10 @@
 
 package cli
 
-import "go.mongodb.org/atlas/mongodbatlas"
+import (
+	"github.com/mongodb/mongodb-atlas-cli/internal/store/atlas"
+	"go.mongodb.org/atlas/mongodbatlas"
+)
 
 const (
 	DefaultPage      = 1
@@ -32,3 +35,10 @@ func (opts *ListOpts) NewListOptions() *mongodbatlas.ListOptions {
 		ItemsPerPage: opts.ItemsPerPage,
 	}
 }
+
+func (opts *ListOpts) NewAtlasListOptions() *atlas.ListOptions {
+	return &atlas.ListOptions{
+		PageNum:      opts.PageNum,
+		ItemsPerPage: opts.ItemsPerPage,
+	}
+}

internal/kubernetes/operator/config_exporter.go

@@ -27,8 +27,8 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/project"
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/resources"
 	"github.com/mongodb/mongodb-atlas-cli/internal/store"
+	"github.com/mongodb/mongodb-atlas-cli/internal/store/atlas"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20230201008/admin"
-	"go.mongodb.org/atlas/mongodbatlas"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -42,7 +42,7 @@ const (
 
 type ConfigExporter struct {
 	featureValidator        features.FeatureValidator
-	dataProvider            store.AtlasOperatorGenericStore
+	dataProvider            atlas.OperatorGenericStore
 	credsProvider           store.CredentialsGetter
 	projectID               string
 	clusterNames            []string
@@ -59,7 +59,7 @@ var (
 	ErrNoCloudManagerClusters = errors.New("can not get 'advanced clusters' object")
 )
 
-func NewConfigExporter(dataProvider store.AtlasOperatorGenericStore, credsProvider store.CredentialsGetter, projectID, orgID string) *ConfigExporter {
+func NewConfigExporter(dataProvider atlas.OperatorGenericStore, credsProvider store.CredentialsGetter, projectID, orgID string) *ConfigExporter {
 	return &ConfigExporter{
 		dataProvider:            dataProvider,
 		credsProvider:           credsProvider,
@@ -226,9 +226,9 @@ func (e *ConfigExporter) exportDeployments(projectName string) ([]runtime.Object
 	return result, nil
 }
 
-func fetchClusterNames(clustersProvider store.AtlasAllClustersLister, projectID string) ([]string, error) {
+func fetchClusterNames(clustersProvider atlas.AllClustersLister, projectID string) ([]string, error) {
 	result := make([]string, 0, DefaultClustersCount)
-	response, err := clustersProvider.ProjectClusters(projectID, &mongodbatlas.ListOptions{ItemsPerPage: maxClusters})
+	response, err := clustersProvider.ProjectClusters(projectID, &atlas.ListOptions{ItemsPerPage: maxClusters})
 	if err != nil {
 		return nil, err
 	}
@@ -247,7 +247,7 @@ func fetchClusterNames(clustersProvider store.AtlasAllClustersLister, projectID
 		}
 	}
 
-	serverlessInstances, err := clustersProvider.ServerlessInstances(projectID, &mongodbatlas.ListOptions{ItemsPerPage: maxClusters})
+	serverlessInstances, err := clustersProvider.ServerlessInstances(projectID, &atlas.ListOptions{ItemsPerPage: maxClusters})
 	if err != nil {
 		return nil, err
 	}