CLOUDP-172196: migrate ListCloudProviderRegions (#1950)

internal/cli/atlas/clusters/availableregions/list.go

@@ -22,6 +22,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/internal/flag"
+	"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/internal/store"
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/cobra"
@@ -49,9 +50,9 @@ var listTemplate = `PROVIDER	INSTANCE SIZE	REGIONS{{range .Results}}{{ $provider
 
 func (opts *ListOpts) Run() error {
 	// Set provider if existent
-	var provider []*string
+	var provider *[]string
 	if opts.provider != "" {
-		provider = []*string{&opts.provider}
+		provider = pointer.Get([]string{opts.provider})
 	}
 
 	r, err := opts.store.CloudProviderRegions(opts.ConfigProjectID(), opts.tier, provider)

internal/cli/atlas/clusters/availableregions/list_test.go

@@ -22,16 +22,17 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/internal/mocks"
+	"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/internal/test"
-	"go.mongodb.org/atlas/mongodbatlas"
+	atlasv2 "go.mongodb.org/atlas-sdk/admin"
 )
 
 func TestList_Run_NoFlags(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockCloudProviderRegionsLister(ctrl)
 
-	var expected *mongodbatlas.CloudProviders
-	var empty []*string
+	var expected *atlasv2.PaginatedApiAtlasProviderRegions
+	var empty *[]string
 
 	listOpts := &ListOpts{
 		store: mockStore,
@@ -52,7 +53,7 @@ func TestList_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockCloudProviderRegionsLister(ctrl)
 
-	var expected *mongodbatlas.CloudProviders
+	var expected *atlasv2.PaginatedApiAtlasProviderRegions
 
 	listOpts := &ListOpts{
 		store:    mockStore,
@@ -62,7 +63,7 @@ func TestList_Run(t *testing.T) {
 
 	mockStore.
 		EXPECT().
-		CloudProviderRegions(listOpts.ProjectID, listOpts.tier, []*string{&listOpts.provider}).
+		CloudProviderRegions(listOpts.ProjectID, listOpts.tier, pointer.Get([]string{listOpts.provider})).
 		Return(expected, nil).
 		Times(1)
 

internal/cli/atlas/clusters/region_tier_autocomplete.go

@@ -22,6 +22,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/cli"
 	"github.com/mongodb/mongodb-atlas-cli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/internal/flag"
+	"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/internal/store"
 	"github.com/mongodb/mongodb-atlas-cli/internal/validate"
 	"github.com/spf13/cobra"
@@ -31,7 +32,7 @@ type autoFunc func(cmd *cobra.Command, args []string, toComplete string) ([]stri
 
 type autoCompleteOpts struct {
 	cli.GlobalOpts
-	providers []*string
+	providers *[]string
 	tier      string
 	store     store.CloudProviderRegionsLister
 }
@@ -69,8 +70,8 @@ func (opts *autoCompleteOpts) tierSuggestions(toComplete string) ([]string, erro
 	availableTiers := map[string]bool{}
 	for _, p := range result.Results {
 		for _, i := range p.InstanceSizes {
-			if _, ok := availableTiers[i.Name]; !ok && strings.HasPrefix(i.Name, strings.ToUpper(toComplete)) {
-				availableTiers[i.Name] = true
+			if _, ok := availableTiers[*i.Name]; !ok && strings.HasPrefix(*i.Name, strings.ToUpper(toComplete)) {
+				availableTiers[*i.Name] = true
 			}
 		}
 	}
@@ -117,8 +118,8 @@ func (opts *autoCompleteOpts) regionSuggestions(toComplete string) ([]string, er
 	for _, p := range result.Results {
 		for _, i := range p.InstanceSizes {
 			for _, r := range i.AvailableRegions {
-				if _, ok := availableRegions[r.Name]; !ok && strings.HasPrefix(r.Name, strings.ToUpper(toComplete)) {
-					availableRegions[r.Name] = true
+				if _, ok := availableRegions[*r.Name]; !ok && strings.HasPrefix(*r.Name, strings.ToUpper(toComplete)) {
+					availableRegions[*r.Name] = true
 				}
 			}
 		}
@@ -151,9 +152,9 @@ func (opts *autoCompleteOpts) parseFlags(cmd *cobra.Command) {
 	if project := cmd.Flag(flag.ProjectID).Value.String(); project != "" {
 		opts.ProjectID = project
 	}
-	opts.providers = make([]*string, 0, 1)
+	providers := make([]string, 0, 1)
 	if provider := cmd.Flag(flag.Provider).Value.String(); provider != "" {
-		opts.providers = append(opts.providers, &provider)
+		opts.providers = pointer.Get(append(providers, provider))
 	}
 
 	if tier := cmd.Flag(flag.Tier).Value.String(); tier != "" {

internal/cli/atlas/clusters/region_tier_autocomplete_test.go

@@ -21,8 +21,9 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/internal/mocks"
+	"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
 	"github.com/stretchr/testify/require"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
+	atlasv2 "go.mongodb.org/atlas-sdk/admin"
 )
 
 func Test_autoCompleteOpts_tierSuggestions(t *testing.T) {
@@ -33,13 +34,13 @@ func Test_autoCompleteOpts_tierSuggestions(t *testing.T) {
 
 		store: mockStore,
 	}
-	expected := &atlas.CloudProviders{
-		Results: []*atlas.CloudProvider{
+	expected := &atlasv2.PaginatedApiAtlasProviderRegions{
+		Results: []atlasv2.ProviderRegions{
 			{
-				Provider: "AWS",
-				InstanceSizes: []*atlas.InstanceSize{
+				Provider: pointer.Get("AWS"),
+				InstanceSizes: []atlasv2.ProviderInstanceSize{
 					{
-						Name:             "M0",
+						Name:             pointer.Get("M0"),
 						AvailableRegions: nil,
 					},
 				},
@@ -65,17 +66,17 @@ func Test_autoCompleteOpts_regionSuggestions(t *testing.T) {
 
 		store: mockStore,
 	}
-	expected := &atlas.CloudProviders{
-		Results: []*atlas.CloudProvider{
+	expected := &atlasv2.PaginatedApiAtlasProviderRegions{
+		Results: []atlasv2.ProviderRegions{
 			{
-				Provider: "AWS",
-				InstanceSizes: []*atlas.InstanceSize{
+				Provider: pointer.Get("AWS"),
+				InstanceSizes: []atlasv2.ProviderInstanceSize{
 					{
-						Name: "M0",
-						AvailableRegions: []*atlas.AvailableRegion{
+						Name: pointer.Get("M0"),
+						AvailableRegions: []atlasv2.AvailableRegion{
 							{
-								Name:    "EU_EAST",
-								Default: false,
+								Name:    pointer.Get("EU_EAST"),
+								Default: pointer.Get(false),
 							},
 						},
 					},

internal/cli/atlas/quickstart/cluster_setup.go

@@ -22,6 +22,7 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/mongodb/mongodb-atlas-cli/internal/cli"
 	"github.com/mongodb/mongodb-atlas-cli/internal/flag"
+	"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/internal/search"
 	"github.com/mongodb/mongodb-atlas-cli/internal/telemetry"
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
@@ -182,7 +183,7 @@ func (opts *Opts) defaultRegions() ([]string, error) {
 	cloudProviders, err := opts.store.CloudProviderRegions(
 		opts.ConfigProjectID(),
 		opts.Tier,
-		[]*string{&opts.Provider},
+		pointer.Get([]string{opts.Provider}),
 	)
 
 	if err != nil {
@@ -201,14 +202,14 @@ func (opts *Opts) defaultRegions() ([]string, error) {
 	if popularRegionIndex != -1 {
 		// the most popular region must be the first in the list
 		popularRegion := availableRegions[popularRegionIndex]
-		defaultRegions = append(defaultRegions, popularRegion.Name)
+		defaultRegions = append(defaultRegions, *popularRegion.Name)
 
 		// remove popular region from availableRegions
 		availableRegions = append(availableRegions[:popularRegionIndex], availableRegions[popularRegionIndex+1:]...)
 	}
 
 	for _, v := range availableRegions {
-		defaultRegions = append(defaultRegions, v.Name)
+		defaultRegions = append(defaultRegions, *v.Name)
 	}
 
 	return defaultRegions, nil

internal/search/search.go

@@ -15,6 +15,7 @@
 package search
 
 import (
+	"go.mongodb.org/atlas-sdk/admin"
 	atlas "go.mongodb.org/atlas/mongodbatlas"
 	"go.mongodb.org/ops-manager/opsmngr"
 	"go.mongodb.org/ops-manager/search"
@@ -54,9 +55,9 @@ func AtlasClusterExists(clusters []atlas.Cluster, name string) bool {
 }
 
 // DefaultRegion returns the index of the default region.
-func DefaultRegion(regions []*atlas.AvailableRegion) int {
+func DefaultRegion(regions []admin.AvailableRegion) int {
 	for i, v := range regions {
-		if v.Default {
+		if v.Default != nil && *v.Default {
 			return i
 		}
 	}

internal/search/search_test.go

@@ -19,7 +19,9 @@ package search
 import (
 	"testing"
 
+	"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/internal/test/fixture"
+	atlasv2 "go.mongodb.org/atlas-sdk/admin"
 	atlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
@@ -126,61 +128,61 @@ func TestAtlasClusterExists(t *testing.T) {
 
 func TestDefaultRegion(t *testing.T) {
 	tests := []struct {
-		input []*atlas.AvailableRegion
+		input []atlasv2.AvailableRegion
 		want  int
 	}{
 		{
-			input: []*atlas.AvailableRegion{},
+			input: []atlasv2.AvailableRegion{},
 			want:  -1,
 		},
 		{
-			input: []*atlas.AvailableRegion{
+			input: []atlasv2.AvailableRegion{
 				{
-					Name:    "test",
-					Default: false,
+					Name:    pointer.Get("test"),
+					Default: pointer.Get(false),
 				},
 			},
 			want: -1,
 		},
 		{
-			input: []*atlas.AvailableRegion{
+			input: []atlasv2.AvailableRegion{
 				{
-					Name:    "test",
-					Default: true,
+					Name:    pointer.Get("test"),
+					Default: pointer.Get(true),
 				},
 			},
 			want: 0,
 		},
 		{
-			input: []*atlas.AvailableRegion{
+			input: []atlasv2.AvailableRegion{
 				{
-					Name:    "test",
-					Default: false,
+					Name:    pointer.Get("test"),
+					Default: pointer.Get(false),
 				},
 				{
-					Name:    "test2",
-					Default: true,
+					Name:    pointer.Get("test2"),
+					Default: pointer.Get(true),
 				},
 				{
-					Name:    "test1",
-					Default: false,
+					Name:    pointer.Get("test1"),
+					Default: pointer.Get(false),
 				},
 			},
 			want: 1,
 		},
 		{
-			input: []*atlas.AvailableRegion{
+			input: []atlasv2.AvailableRegion{
 				{
-					Name:    "test",
-					Default: false,
+					Name:    pointer.Get("test"),
+					Default: pointer.Get(false),
 				},
 				{
-					Name:    "test2",
-					Default: false,
+					Name:    pointer.Get("test2"),
+					Default: pointer.Get(false),
 				},
 				{
-					Name:    "test1",
-					Default: false,
+					Name:    pointer.Get("test1"),
+					Default: pointer.Get(false),
 				},
 			},
 			want: -1,

internal/store/cloud_provider_regions.go

@@ -18,24 +18,26 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/internal/config"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
+	atlasv2 "go.mongodb.org/atlas-sdk/admin"
 )
 
 //go:generate mockgen -destination=../mocks/mock_cloud_provider_regions.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store CloudProviderRegionsLister
 
 type CloudProviderRegionsLister interface {
-	CloudProviderRegions(string, string, []*string) (*atlas.CloudProviders, error)
+	CloudProviderRegions(string, string, *[]string) (*atlasv2.PaginatedApiAtlasProviderRegions, error)
 }
 
 // CloudProviderRegions encapsulates the logic to manage different cloud providers.
-func (s *Store) CloudProviderRegions(projectID, tier string, providerName []*string) (*atlas.CloudProviders, error) {
-	options := &atlas.CloudProviderRegionsOptions{
+func (s *Store) CloudProviderRegions(projectID, tier string, providerName *[]string) (*atlasv2.PaginatedApiAtlasProviderRegions, error) {
+	params := &atlasv2.ListCloudProviderRegionsApiParams{
+		GroupId:   projectID,
 		Providers: providerName,
-		Tier:      tier,
+		Tier:      &tier,
 	}
+
 	switch s.service {
 	case config.CloudService, config.CloudGovService:
-		result, _, err := s.client.(*atlas.Client).Clusters.ListCloudProviderRegions(s.ctx, projectID, options)
+		result, _, err := s.clientv2.ClustersApi.ListCloudProviderRegionsWithParams(s.ctx, params).Execute()
 		return result, err
 	default:
 		return nil, fmt.Errorf("%w: %s", errUnsupportedService, s.service)