CLOUDP-86339: update region step in quickstart to use correctly the atlas service (#645)

andreaangiolillo · web-flow · commit b35e0e0bee06 · 2021-03-30T14:55:29.000+01:00
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
 	github.com/tangzero/inflector v1.0.0
-	go.mongodb.org/atlas v0.7.3-0.20210329080711-50ae4381af6f
+	go.mongodb.org/atlas v0.7.3-0.20210330132131-9297afb20e18
 	go.mongodb.org/ops-manager v0.18.1-0.20210330081921-8eafa855b149
 	golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
diff --git a/go.sum b/go.sum
@@ -243,8 +243,9 @@ github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyh
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.mongodb.org/atlas v0.7.3-0.20210329080711-50ae4381af6f h1:lT5d8KrJYMOdiXbHsEd5fGJlBc71mVD4GnheebcRyDs=
 go.mongodb.org/atlas v0.7.3-0.20210329080711-50ae4381af6f/go.mod h1:MMWDsc2akjTDSG4tVQrxv/82p3QbBnqeELbtTl45sbg=
+go.mongodb.org/atlas v0.7.3-0.20210330132131-9297afb20e18 h1:3sDlRQrpqjeVZjrNxMZSKJEhGFL6iuroY3MjDqhn9y0=
+go.mongodb.org/atlas v0.7.3-0.20210330132131-9297afb20e18/go.mod h1:MMWDsc2akjTDSG4tVQrxv/82p3QbBnqeELbtTl45sbg=
 go.mongodb.org/ops-manager v0.18.1-0.20210330081921-8eafa855b149 h1:/vg09kKcTDVuRHSGtRQe/nhkd6XQud2uWdd46xzZAec=
 go.mongodb.org/ops-manager v0.18.1-0.20210330081921-8eafa855b149/go.mod h1:w9v20jgrQQ9HYievQfMReSPPLvXcQYkp9R4sNUsdZxk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
diff --git a/internal/cli/atlas/quickstart/quick_start.go b/internal/cli/atlas/quickstart/quick_start.go
@@ -281,7 +281,7 @@ func (opts *Opts) askClusterOptions() error {
 }
 
 func (opts *Opts) defaultRegions() ([]string, error) {
-	cloudProviders, err := opts.store.CloudProviderRegions(opts.ConfigProjectID(), opts.Provider, tier, false)
+	cloudProviders, err := opts.store.CloudProviderRegions(opts.ConfigProjectID(), tier, []*string{&opts.Provider})
 
 	if err != nil {
 		return nil, err
diff --git a/internal/mocks/mock_cloud_provider_regions.go b/internal/mocks/mock_cloud_provider_regions.go
diff --git a/internal/mocks/mock_clusters.go b/internal/mocks/mock_clusters.go
diff --git a/internal/store/cloud_provider_regions.go b/internal/store/cloud_provider_regions.go
@@ -25,15 +25,14 @@ import (
 //go:generate mockgen -destination=../mocks/mock_cloud_provider_regions.go -package=mocks github.com/mongodb/mongocli/internal/store CloudProviderRegionsLister
 
 type CloudProviderRegionsLister interface {
-	CloudProviderRegions(string, string, string, bool) (*atlas.CloudProviders, error)
+	CloudProviderRegions(string, string, []*string) (*atlas.CloudProviders, error)
 }
 
 // CloudProviderRegions encapsulates the logic to manage different cloud providers
-func (s *Store) CloudProviderRegions(projectID, provierName, tier string, crossCloudProvider bool) (*atlas.CloudProviders, error) {
+func (s *Store) CloudProviderRegions(projectID, tier string, providerName []*string) (*atlas.CloudProviders, error) {
 	options := &atlas.CloudProviderRegionsOptions{
-		Provider:           provierName,
-		Tier:               tier,
-		CrossCloudProvider: crossCloudProvider,
+		Providers: providerName,
+		Tier:      tier,
 	}
 	switch s.service {
 	case config.CloudService:

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func (opts *Opts) askClusterOptions() error {`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`func (opts *Opts) defaultRegions() ([]string, error) {`
`284`		`- cloudProviders, err := opts.store.CloudProviderRegions(opts.ConfigProjectID(), opts.Provider, tier, false)`
	`284`	`+ cloudProviders, err := opts.store.CloudProviderRegions(opts.ConfigProjectID(), tier, []*string{&opts.Provider})`
`285`	`285`
`286`	`286`	`if err != nil {`
`287`	`287`	`return nil, err`