task: clean some references to the old atlas client (#2377)

Gustavo Bazan · web-flow · commit 811c672ba8e9 · 2023-10-17T17:16:37.000+01:00
diff --git a/internal/cli/iam/organizations/create_test.go b/internal/cli/iam/organizations/create_test.go
@@ -23,14 +23,14 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/internal/test"
-	"go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/ops-manager/opsmngr"
 )
 
 func TestCreate_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockOrganizationCreator(ctrl)
 
-	expected := &mongodbatlas.Organization{}
+	expected := &opsmngr.Organization{}
 
 	mockStore.
 		EXPECT().
diff --git a/internal/cli/iam/organizations/describe_test.go b/internal/cli/iam/organizations/describe_test.go
@@ -25,14 +25,14 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/internal/test"
 	"github.com/stretchr/testify/assert"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/ops-manager/opsmngr"
 )
 
 func TestDescribe_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockOrganizationDescriber(ctrl)
 	stringVal := "test"
-	expected := &atlas.Organization{
+	expected := &opsmngr.Organization{
 		Links: nil,
 		ID:    stringVal,
 		Name:  stringVal,
diff --git a/internal/cli/iam/organizations/list.go b/internal/cli/iam/organizations/list.go
@@ -26,6 +26,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/cobra"
 	atlas "go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/ops-manager/opsmngr"
 )
 
 const listTemplate = `ID	NAME{{range .Results}}
@@ -57,7 +58,7 @@ func (opts *ListOpts) Run() error {
 	return opts.Print(r)
 }
 
-func (opts *ListOpts) newOrganizationListOptions() *atlas.OrganizationsListOptions {
+func (opts *ListOpts) newOrganizationListOptions() *opsmngr.OrganizationsListOptions {
 	return &atlas.OrganizationsListOptions{
 		Name:               opts.name,
 		IncludeDeletedOrgs: &opts.includeDeletedOrgs,
diff --git a/internal/cli/parse_service_version.go b/internal/cli/parse_service_version.go
@@ -18,11 +18,11 @@ import (
 	"strings"
 
 	"github.com/Masterminds/semver/v3"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/ops-manager/opsmngr"
 )
 
 // ParseServiceVersion parses service version into semver.Version.
-func ParseServiceVersion(v *atlas.ServiceVersion) (*semver.Version, error) {
+func ParseServiceVersion(v *opsmngr.ServiceVersion) (*semver.Version, error) {
 	versionParts := strings.Split(v.Version, ".")
 
 	const maxVersionParts = 2
diff --git a/internal/cli/parse_service_version_test.go b/internal/cli/parse_service_version_test.go
@@ -19,43 +19,43 @@ package cli
 import (
 	"testing"
 
-	"go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/ops-manager/opsmngr"
 )
 
 func TestParseServiceVersion(t *testing.T) {
 	tests := []struct {
 		name           string
-		serviceVersion *mongodbatlas.ServiceVersion
+		serviceVersion *opsmngr.ServiceVersion
 		expected       string
 		wantErr        bool
 	}{
 		{
 			name:           "OM 5.0",
-			serviceVersion: &mongodbatlas.ServiceVersion{Version: "5.0.0.100.20210101T0000Z"},
+			serviceVersion: &opsmngr.ServiceVersion{Version: "5.0.0.100.20210101T0000Z"},
 			expected:       "5.0.0",
 			wantErr:        false,
 		},
 		{
 			name:           "OM 5.0-rc1",
-			serviceVersion: &mongodbatlas.ServiceVersion{Version: "5.0.0-rc1.100.20210101T0000Z"},
+			serviceVersion: &opsmngr.ServiceVersion{Version: "5.0.0-rc1.100.20210101T0000Z"},
 			expected:       "5.0.0",
 			wantErr:        false,
 		},
 		{
 			name:           "OM 5.0.1",
-			serviceVersion: &mongodbatlas.ServiceVersion{Version: "5.0.1.100.20210101T0000Z"},
+			serviceVersion: &opsmngr.ServiceVersion{Version: "5.0.1.100.20210101T0000Z"},
 			expected:       "5.0.0",
 			wantErr:        false,
 		},
 		{
 			name:           "master",
-			serviceVersion: &mongodbatlas.ServiceVersion{Version: "master"},
+			serviceVersion: &opsmngr.ServiceVersion{Version: "master"},
 			expected:       "",
 			wantErr:        true,
 		},
 		{
 			name:           "v20210101",
-			serviceVersion: &mongodbatlas.ServiceVersion{Version: "v20210101"},
+			serviceVersion: &opsmngr.ServiceVersion{Version: "v20210101"},
 			expected:       "20210101.0.0",
 			wantErr:        false,
 		},
diff --git a/internal/store/agents.go b/internal/store/agents.go
@@ -18,14 +18,13 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/internal/config"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
 	"go.mongodb.org/ops-manager/opsmngr"
 )
 
 //go:generate mockgen -destination=../mocks/mock_agents.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store AgentLister,AgentUpgrader,AgentAPIKeyLister,AgentAPIKeyCreator,AgentAPIKeyDeleter,AgentGlobalVersionsLister,AgentProjectVersionsLister
 
 type AgentLister interface {
-	Agents(string, string, *atlas.ListOptions) (*opsmngr.Agents, error)
+	Agents(string, string, *opsmngr.ListOptions) (*opsmngr.Agents, error)
 }
 
 type AgentGlobalVersionsLister interface {
@@ -53,7 +52,7 @@ type AgentAPIKeyDeleter interface {
 }
 
 // Agents encapsulates the logic to manage different cloud providers.
-func (s *Store) Agents(projectID, agentType string, opts *atlas.ListOptions) (*opsmngr.Agents, error) {
+func (s *Store) Agents(projectID, agentType string, opts *opsmngr.ListOptions) (*opsmngr.Agents, error) {
 	switch s.service {
 	case config.OpsManagerService, config.CloudManagerService:
 		result, _, err := s.client.(*opsmngr.Client).Agents.ListAgentsByType(s.ctx, projectID, agentType, opts)
@@ -107,7 +106,7 @@ func (s *Store) DeleteAgentAPIKey(projectID, keyID string) error {
 	}
 }
 
-// Agents encapsulates the logic to manage different cloud providers.
+// AgentGlobalVersions encapsulates the logic to manage different cloud providers.
 func (s *Store) AgentGlobalVersions() (*opsmngr.SoftwareVersions, error) {
 	switch s.service {
 	case config.OpsManagerService:
@@ -118,7 +117,7 @@ func (s *Store) AgentGlobalVersions() (*opsmngr.SoftwareVersions, error) {
 	}
 }
 
-// Agents encapsulates the logic to manage different cloud providers.
+// AgentProjectVersions encapsulates the logic to manage different cloud providers.
 func (s *Store) AgentProjectVersions(projectID string) (*opsmngr.AgentVersions, error) {
 	switch s.service {
 	case config.OpsManagerService, config.CloudManagerService:
diff --git a/internal/store/alert_configuration.go b/internal/store/alert_configuration.go
@@ -26,7 +26,7 @@ import (
 //go:generate mockgen -destination=../mocks/mock_alert_configuration.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store AlertConfigurationLister,AlertConfigurationCreator,AlertConfigurationDeleter,AlertConfigurationUpdater,MatcherFieldsLister,AlertConfigurationEnabler,AlertConfigurationDisabler
 
 type AlertConfigurationLister interface {
-	AlertConfigurations(string, *atlas.ListOptions) ([]atlas.AlertConfiguration, error)
+	AlertConfigurations(string, *opsmngr.ListOptions) ([]atlas.AlertConfiguration, error)
 }
 
 type AlertConfigurationCreator interface {
diff --git a/internal/store/alerts.go b/internal/store/alerts.go
@@ -25,23 +25,20 @@ import (
 //go:generate mockgen -destination=../mocks/mock_alerts.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store AlertDescriber,AlertLister,AlertAcknowledger
 
 type AlertDescriber interface {
-	Alert(string, string) (*atlas.Alert, error)
+	Alert(string, string) (*opsmngr.Alert, error)
 }
 
 type AlertLister interface {
-	Alerts(string, *atlas.AlertsListOptions) (*atlas.AlertsResponse, error)
+	Alerts(string, *opsmngr.AlertsListOptions) (*atlas.AlertsResponse, error)
 }
 
 type AlertAcknowledger interface {
-	AcknowledgeAlert(string, string, *atlas.AcknowledgeRequest) (*atlas.Alert, error)
+	AcknowledgeAlert(string, string, *opsmngr.AcknowledgeRequest) (*atlas.Alert, error)
 }
 
 // Alert encapsulate the logic to manage different cloud providers.
 func (s *Store) Alert(projectID, alertID string) (*atlas.Alert, error) {
 	switch s.service {
-	case config.CloudService, config.CloudGovService:
-		result, _, err := s.client.(*atlas.Client).Alerts.Get(s.ctx, projectID, alertID)
-		return result, err
 	case config.OpsManagerService, config.CloudManagerService:
 		result, _, err := s.client.(*opsmngr.Client).Alerts.Get(s.ctx, projectID, alertID)
 		return result, err
@@ -51,11 +48,8 @@ func (s *Store) Alert(projectID, alertID string) (*atlas.Alert, error) {
 }
 
 // Alerts encapsulate the logic to manage different cloud providers.
-func (s *Store) Alerts(projectID string, opts *atlas.AlertsListOptions) (*atlas.AlertsResponse, error) {
+func (s *Store) Alerts(projectID string, opts *opsmngr.AlertsListOptions) (*opsmngr.AlertsResponse, error) {
 	switch s.service {
-	case config.CloudService, config.CloudGovService:
-		result, _, err := s.client.(*atlas.Client).Alerts.List(s.ctx, projectID, opts)
-		return result, err
 	case config.OpsManagerService, config.CloudManagerService:
 		result, _, err := s.client.(*opsmngr.Client).Alerts.List(s.ctx, projectID, opts)
 		return result, err
@@ -65,11 +59,8 @@ func (s *Store) Alerts(projectID string, opts *atlas.AlertsListOptions) (*atlas.
 }
 
 // Acknowledge encapsulate the logic to manage different cloud providers.
-func (s *Store) AcknowledgeAlert(projectID, alertID string, body *atlas.AcknowledgeRequest) (*atlas.Alert, error) {
+func (s *Store) AcknowledgeAlert(projectID, alertID string, body *opsmngr.AcknowledgeRequest) (*atlas.Alert, error) {
 	switch s.service {
-	case config.CloudService, config.CloudGovService:
-		result, _, err := s.client.(*atlas.Client).Alerts.Acknowledge(s.ctx, projectID, alertID, body)
-		return result, err
 	case config.OpsManagerService, config.CloudManagerService:
 		result, _, err := s.client.(*opsmngr.Client).Alerts.Acknowledge(s.ctx, projectID, alertID, body)
 		return result, err
diff --git a/internal/store/api_keys_access_list.go b/internal/store/api_keys_access_list.go
@@ -25,7 +25,7 @@ import (
 //go:generate mockgen -destination=../mocks/mock_api_keys_access_list.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store OrganizationAPIKeyAccessListCreator,OrganizationAPIKeyAccessListDeleter,OrganizationAPIKeyAccessListLister
 
 type OrganizationAPIKeyAccessListLister interface {
-	OrganizationAPIKeyAccessLists(string, string, *atlas.ListOptions) (*atlas.AccessListAPIKeys, error)
+	OrganizationAPIKeyAccessLists(string, string, *opsmngr.ListOptions) (*atlas.AccessListAPIKeys, error)
 }
 
 type OrganizationAPIKeyAccessListDeleter interface {
diff --git a/internal/store/backup_configs.go b/internal/store/backup_configs.go
@@ -18,7 +18,6 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/internal/config"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
 	"go.mongodb.org/ops-manager/opsmngr"
 )
 
@@ -29,7 +28,7 @@ type BackupConfigGetter interface {
 }
 
 type BackupConfigLister interface {
-	ListBackupConfigs(string, *atlas.ListOptions) (*opsmngr.BackupConfigs, error)
+	ListBackupConfigs(string, *opsmngr.ListOptions) (*opsmngr.BackupConfigs, error)
 }
 
 type BackupConfigUpdater interface {
@@ -48,7 +47,7 @@ func (s *Store) GetBackupConfig(projectID, clusterID string) (*opsmngr.BackupCon
 }
 
 // ListBackupConfigs encapsulates the logic to manage different cloud providers.
-func (s *Store) ListBackupConfigs(projectID string, options *atlas.ListOptions) (*opsmngr.BackupConfigs, error) {
+func (s *Store) ListBackupConfigs(projectID string, options *opsmngr.ListOptions) (*opsmngr.BackupConfigs, error) {
 	switch s.service {
 	case config.CloudManagerService, config.OpsManagerService:
 		result, _, err := s.client.(*opsmngr.Client).BackupConfigs.List(s.ctx, projectID, options)
diff --git a/internal/test/fixture/all_clusters.go b/internal/test/fixture/all_clusters.go
diff --git a/internal/test/fixture/continuous_snapshots.go b/internal/test/fixture/continuous_snapshots.go
diff --git a/internal/test/fixture/global_alerts.go b/internal/test/fixture/global_alerts.go

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"github.com/mongodb/mongodb-atlas-cli/internal/usage"`
`27`	`27`	`"github.com/spf13/cobra"`
`28`	`28`	`atlas "go.mongodb.org/atlas/mongodbatlas"`
	`29`	`+ "go.mongodb.org/ops-manager/opsmngr"`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	const listTemplate = `ID NAME{{range .Results}}
`@@ -57,7 +58,7 @@ func (opts *ListOpts) Run() error {`
`57`	`58`	`return opts.Print(r)`
`58`	`59`	`}`
`59`	`60`
`60`		`-func (opts ListOpts) newOrganizationListOptions() atlas.OrganizationsListOptions {`
	`61`	`+func (opts ListOpts) newOrganizationListOptions() opsmngr.OrganizationsListOptions {`
`61`	`62`	`return &atlas.OrganizationsListOptions{`
`62`	`63`	`Name: opts.name,`
`63`	`64`	`IncludeDeletedOrgs: &opts.includeDeletedOrgs,`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,13 @@ import (`
`18`	`18`	`"fmt"`
`19`	`19`
`20`	`20`	`"github.com/mongodb/mongodb-atlas-cli/internal/config"`
`21`		`- atlas "go.mongodb.org/atlas/mongodbatlas"`
`22`	`21`	`"go.mongodb.org/ops-manager/opsmngr"`
`23`	`22`	`)`
`24`	`23`
`25`	`24`	`//go:generate mockgen -destination=../mocks/mock_agents.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store AgentLister,AgentUpgrader,AgentAPIKeyLister,AgentAPIKeyCreator,AgentAPIKeyDeleter,AgentGlobalVersionsLister,AgentProjectVersionsLister`
`26`	`25`
`27`	`26`	`type AgentLister interface {`
`28`		`- Agents(string, string, atlas.ListOptions) (opsmngr.Agents, error)`
	`27`	`+ Agents(string, string, opsmngr.ListOptions) (opsmngr.Agents, error)`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`type AgentGlobalVersionsLister interface {`
`@@ -53,7 +52,7 @@ type AgentAPIKeyDeleter interface {`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`// Agents encapsulates the logic to manage different cloud providers.`
`56`		`-func (s Store) Agents(projectID, agentType string, opts atlas.ListOptions) (*opsmngr.Agents, error) {`
	`55`	`+func (s Store) Agents(projectID, agentType string, opts opsmngr.ListOptions) (*opsmngr.Agents, error) {`
`57`	`56`	`switch s.service {`
`58`	`57`	`case config.OpsManagerService, config.CloudManagerService:`
`59`	`58`	`result, _, err := s.client.(*opsmngr.Client).Agents.ListAgentsByType(s.ctx, projectID, agentType, opts)`
`@@ -107,7 +106,7 @@ func (s *Store) DeleteAgentAPIKey(projectID, keyID string) error {`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`
`110`		`-// Agents encapsulates the logic to manage different cloud providers.`
	`109`	`+// AgentGlobalVersions encapsulates the logic to manage different cloud providers.`
`111`	`110`	`func (s Store) AgentGlobalVersions() (opsmngr.SoftwareVersions, error) {`
`112`	`111`	`switch s.service {`
`113`	`112`	`case config.OpsManagerService:`
`@@ -118,7 +117,7 @@ func (s Store) AgentGlobalVersions() (opsmngr.SoftwareVersions, error) {`
`118`	`117`	`}`
`119`	`118`	`}`
`120`	`119`
`121`		`-// Agents encapsulates the logic to manage different cloud providers.`
	`120`	`+// AgentProjectVersions encapsulates the logic to manage different cloud providers.`
`122`	`121`	`func (s Store) AgentProjectVersions(projectID string) (opsmngr.AgentVersions, error) {`
`123`	`122`	`switch s.service {`
`124`	`123`	`case config.OpsManagerService, config.CloudManagerService:`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`//go:generate mockgen -destination=../mocks/mock_alert_configuration.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store AlertConfigurationLister,AlertConfigurationCreator,AlertConfigurationDeleter,AlertConfigurationUpdater,MatcherFieldsLister,AlertConfigurationEnabler,AlertConfigurationDisabler`
`27`	`27`
`28`	`28`	`type AlertConfigurationLister interface {`
`29`		`- AlertConfigurations(string, *atlas.ListOptions) ([]atlas.AlertConfiguration, error)`
	`29`	`+ AlertConfigurations(string, *opsmngr.ListOptions) ([]atlas.AlertConfiguration, error)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`type AlertConfigurationCreator interface {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`//go:generate mockgen -destination=../mocks/mock_api_keys_access_list.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store OrganizationAPIKeyAccessListCreator,OrganizationAPIKeyAccessListDeleter,OrganizationAPIKeyAccessListLister`
`26`	`26`
`27`	`27`	`type OrganizationAPIKeyAccessListLister interface {`
`28`		`- OrganizationAPIKeyAccessLists(string, string, atlas.ListOptions) (atlas.AccessListAPIKeys, error)`
	`28`	`+ OrganizationAPIKeyAccessLists(string, string, opsmngr.ListOptions) (atlas.AccessListAPIKeys, error)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`type OrganizationAPIKeyAccessListDeleter interface {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`	`"fmt"`
`19`	`19`
`20`	`20`	`"github.com/mongodb/mongodb-atlas-cli/internal/config"`
`21`		`- atlas "go.mongodb.org/atlas/mongodbatlas"`
`22`	`21`	`"go.mongodb.org/ops-manager/opsmngr"`
`23`	`22`	`)`
`24`	`23`
`@@ -29,7 +28,7 @@ type BackupConfigGetter interface {`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`type BackupConfigLister interface {`
`32`		`- ListBackupConfigs(string, atlas.ListOptions) (opsmngr.BackupConfigs, error)`
	`31`	`+ ListBackupConfigs(string, opsmngr.ListOptions) (opsmngr.BackupConfigs, error)`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`type BackupConfigUpdater interface {`
`@@ -48,7 +47,7 @@ func (s Store) GetBackupConfig(projectID, clusterID string) (opsmngr.BackupCon`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`// ListBackupConfigs encapsulates the logic to manage different cloud providers.`
`51`		`-func (s Store) ListBackupConfigs(projectID string, options atlas.ListOptions) (*opsmngr.BackupConfigs, error) {`
	`50`	`+func (s Store) ListBackupConfigs(projectID string, options opsmngr.ListOptions) (*opsmngr.BackupConfigs, error) {`
`52`	`51`	`switch s.service {`
`53`	`52`	`case config.CloudManagerService, config.OpsManagerService:`
`54`	`53`	`result, _, err := s.client.(*opsmngr.Client).BackupConfigs.List(s.ctx, projectID, options)`