task: clean some usages of the old sdk (#2711)

Gustavo Bazan · web-flow · commit c94d94d48897 · 2024-03-06T11:00:47.000Z
diff --git a/internal/cli/atlas/projects/settings/update.go b/internal/cli/atlas/projects/settings/update.go
@@ -23,7 +23,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/store"
 	"github.com/mongodb/mongodb-atlas-cli/internal/usage"
 	"github.com/spf13/cobra"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
+	atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"
 )
 
 const updateTemplate = "Project settings updated.\n"
@@ -61,8 +61,8 @@ func (opts *UpdateOpts) Run() error {
 	return opts.Print(r)
 }
 
-func (opts *UpdateOpts) newProjectSettings() *atlas.ProjectSettings {
-	return &atlas.ProjectSettings{
+func (opts *UpdateOpts) newProjectSettings() *atlasv2.GroupSettings {
+	return &atlasv2.GroupSettings{
 		IsCollectDatabaseSpecificsStatisticsEnabled: cli.ReturnValueForSetting(opts.enableCollectDatabaseSpecificsStatistics, opts.disableCollectDatabaseSpecificsStatistics),
 		IsDataExplorerEnabled:                       cli.ReturnValueForSetting(opts.enableDataExplorer, opts.disableDataExplorer),
 		IsPerformanceAdvisorEnabled:                 cli.ReturnValueForSetting(opts.enablePerformanceAdvisor, opts.disablePerformanceAdvisor),
diff --git a/internal/cli/require/require.go b/internal/cli/require/require.go
@@ -51,7 +51,7 @@ func ExactArgs(n int) cobra.PositionalArgs {
 	}
 }
 
-// ExactArgsObjectID returns an error if there are not exactly n args and
+// ExactObjectIDArgs returns an error if there are not exactly n args and
 // any of those args is not an ObjectID.
 func ExactObjectIDArgs(n int) cobra.PositionalArgs {
 	return func(cmd *cobra.Command, args []string) error {
diff --git a/internal/mocks/mock_project_settings.go b/internal/mocks/mock_project_settings.go
diff --git a/internal/store/project_settings.go b/internal/store/project_settings.go
@@ -16,7 +16,6 @@ package store
 
 import (
 	atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"
-	atlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 //go:generate mockgen -destination=../mocks/mock_project_settings.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store ProjectSettingsDescriber,ProjectSettingsUpdater
@@ -26,7 +25,7 @@ type ProjectSettingsDescriber interface {
 }
 
 type ProjectSettingsUpdater interface {
-	UpdateProjectSettings(string, *atlas.ProjectSettings) (*atlasv2.GroupSettings, error)
+	UpdateProjectSettings(string, *atlasv2.GroupSettings) (*atlasv2.GroupSettings, error)
 }
 
 // ProjectSettings encapsulates the logic of getting settings of a particular project.
@@ -36,14 +35,7 @@ func (s *Store) ProjectSettings(projectID string) (*atlasv2.GroupSettings, error
 }
 
 // UpdateProjectSettings encapsulates the logic of updating settings of a particular project.
-func (s *Store) UpdateProjectSettings(projectID string, projectSettings *atlas.ProjectSettings) (*atlasv2.GroupSettings, error) {
-	groupSettings := atlasv2.GroupSettings{
-		IsCollectDatabaseSpecificsStatisticsEnabled: projectSettings.IsCollectDatabaseSpecificsStatisticsEnabled,
-		IsDataExplorerEnabled:                       projectSettings.IsDataExplorerEnabled,
-		IsPerformanceAdvisorEnabled:                 projectSettings.IsPerformanceAdvisorEnabled,
-		IsRealtimePerformancePanelEnabled:           projectSettings.IsRealtimePerformancePanelEnabled,
-		IsSchemaAdvisorEnabled:                      projectSettings.IsSchemaAdvisorEnabled,
-	}
-	result, _, err := s.clientv2.ProjectsApi.UpdateProjectSettings(s.ctx, projectID, &groupSettings).Execute()
+func (s *Store) UpdateProjectSettings(projectID string, projectSettings *atlasv2.GroupSettings) (*atlasv2.GroupSettings, error) {
+	result, _, err := s.clientv2.ProjectsApi.UpdateProjectSettings(s.ctx, projectID, projectSettings).Execute()
 	return result, err
 }
diff --git a/test/e2e/atlas/helper_test.go b/test/e2e/atlas/helper_test.go
@@ -666,12 +666,12 @@ func createProjectWithoutAlertSettings(projectName string) (string, error) {
 		return "", fmt.Errorf("%s (%w)", string(resp), err)
 	}
 
-	var project mongodbatlas.Project
+	var project atlasv2.Group
 	if err := json.Unmarshal(resp, &project); err != nil {
 		return "", fmt.Errorf("invalid response: %s (%w)", string(resp), err)
 	}
 
-	return project.ID, nil
+	return project.GetId(), nil
 }
 
 func listClustersForProject(t *testing.T, cliPath, projectID string) atlasv2.PaginatedAdvancedClusterDescription {
diff --git a/test/e2e/helper.go b/test/e2e/helper.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"go.mongodb.org/atlas/mongodbatlas"
+	atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"
 )
 
 const (
@@ -45,12 +45,12 @@ func CreateProject(projectName string) (string, error) {
 		return "", fmt.Errorf("%w: %s", err, string(resp))
 	}
 
-	var project mongodbatlas.Project
+	var project atlasv2.Group
 	if err := json.Unmarshal(resp, &project); err != nil {
 		return "", fmt.Errorf("%w: %s", err, resp)
 	}
 
-	return project.ID, nil
+	return project.GetId(), nil
 }
 
 func deleteProject(projectID string) error {
diff --git a/test/e2e/iam/helper_test.go b/test/e2e/iam/helper_test.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 
 	"github.com/mongodb/mongodb-atlas-cli/test/e2e"
-	"go.mongodb.org/atlas/mongodbatlas"
+	atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"
 )
 
 const (
@@ -65,13 +65,13 @@ func createOrgAPIKey() (string, error) {
 		return "", fmt.Errorf("%w: %s", err, string(resp))
 	}
 
-	var key mongodbatlas.APIKey
+	var key atlasv2.ApiKeyUserDetails
 	if err := json.Unmarshal(resp, &key); err != nil {
 		return "", err
 	}
 
-	if key.ID != "" {
-		return key.ID, nil
+	if key.GetId() != "" {
+		return key.GetId(), nil
 	}
 
 	return "", errNoAPIKey
@@ -115,12 +115,12 @@ func createTeam(teamName string) (string, error) {
 		return "", fmt.Errorf("%w: %s", err, string(resp))
 	}
 
-	var team mongodbatlas.Team
+	var team atlasv2.Team
 	if err := json.Unmarshal(resp, &team); err != nil {
 		return "", err
 	}
 
-	return team.ID, nil
+	return team.GetId(), nil
 }
 
 func deleteTeam(teamID string) error {
@@ -160,14 +160,14 @@ func OrgNUser(n int) (username, userID string, err error) {
 		return "", "", fmt.Errorf("error loading org users: %w (%s)", err, string(resp))
 	}
 
-	var users mongodbatlas.AtlasUsersResponse
+	var users atlasv2.PaginatedAppUser
 	if err := json.Unmarshal(resp, &users); err != nil {
 		return "", "", err
 	}
 
-	if len(users.Results) <= n {
-		return "", "", fmt.Errorf("%w: %d for %d users", errInvalidIndex, n, len(users.Results))
+	if len(users.GetResults()) <= n {
+		return "", "", fmt.Errorf("%w: %d for %d users", errInvalidIndex, n, len(users.GetResults()))
 	}
 
-	return users.Results[n].Username, users.Results[n].ID, nil
+	return users.GetResults()[n].Username, users.GetResults()[n].GetId(), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func ExactArgs(n int) cobra.PositionalArgs {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-// ExactArgsObjectID returns an error if there are not exactly n args and`
	`54`	`+// ExactObjectIDArgs returns an error if there are not exactly n args and`
`55`	`55`	`// any of those args is not an ObjectID.`
`56`	`56`	`func ExactObjectIDArgs(n int) cobra.PositionalArgs {`
`57`	`57`	`return func(cmd *cobra.Command, args []string) error {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ package store`
`16`	`16`
`17`	`17`	`import (`
`18`	`18`	`atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"`
`19`		`- atlas "go.mongodb.org/atlas/mongodbatlas"`
`20`	`19`	`)`
`21`	`20`
`22`	`21`	`//go:generate mockgen -destination=../mocks/mock_project_settings.go -package=mocks github.com/mongodb/mongodb-atlas-cli/internal/store ProjectSettingsDescriber,ProjectSettingsUpdater`
`@@ -26,7 +25,7 @@ type ProjectSettingsDescriber interface {`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`type ProjectSettingsUpdater interface {`
`29`		`- UpdateProjectSettings(string, atlas.ProjectSettings) (atlasv2.GroupSettings, error)`
	`28`	`+ UpdateProjectSettings(string, atlasv2.GroupSettings) (atlasv2.GroupSettings, error)`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`// ProjectSettings encapsulates the logic of getting settings of a particular project.`
`@@ -36,14 +35,7 @@ func (s Store) ProjectSettings(projectID string) (atlasv2.GroupSettings, error`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`// UpdateProjectSettings encapsulates the logic of updating settings of a particular project.`
`39`		`-func (s Store) UpdateProjectSettings(projectID string, projectSettings atlas.ProjectSettings) (*atlasv2.GroupSettings, error) {`
`40`		`- groupSettings := atlasv2.GroupSettings{`
`41`		`- IsCollectDatabaseSpecificsStatisticsEnabled: projectSettings.IsCollectDatabaseSpecificsStatisticsEnabled,`
`42`		`- IsDataExplorerEnabled: projectSettings.IsDataExplorerEnabled,`
`43`		`- IsPerformanceAdvisorEnabled: projectSettings.IsPerformanceAdvisorEnabled,`
`44`		`- IsRealtimePerformancePanelEnabled: projectSettings.IsRealtimePerformancePanelEnabled,`
`45`		`- IsSchemaAdvisorEnabled: projectSettings.IsSchemaAdvisorEnabled,`
`46`		`- }`
`47`		`- result, _, err := s.clientv2.ProjectsApi.UpdateProjectSettings(s.ctx, projectID, &groupSettings).Execute()`
	`38`	`+func (s Store) UpdateProjectSettings(projectID string, projectSettings atlasv2.GroupSettings) (*atlasv2.GroupSettings, error) {`
	`39`	`+ result, _, err := s.clientv2.ProjectsApi.UpdateProjectSettings(s.ctx, projectID, projectSettings).Execute()`
`48`	`40`	`return result, err`
`49`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -666,12 +666,12 @@ func createProjectWithoutAlertSettings(projectName string) (string, error) {`
`666`	`666`	`return "", fmt.Errorf("%s (%w)", string(resp), err)`
`667`	`667`	`}`
`668`	`668`
`669`		`- var project mongodbatlas.Project`
	`669`	`+ var project atlasv2.Group`
`670`	`670`	`if err := json.Unmarshal(resp, &project); err != nil {`
`671`	`671`	`return "", fmt.Errorf("invalid response: %s (%w)", string(resp), err)`
`672`	`672`	`}`
`673`	`673`
`674`		`- return project.ID, nil`
	`674`	`+ return project.GetId(), nil`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`func listClustersForProject(t *testing.T, cliPath, projectID string) atlasv2.PaginatedAdvancedClusterDescription {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"testing"`
`23`	`23`	`"time"`
`24`	`24`
`25`		`- "go.mongodb.org/atlas/mongodbatlas"`
	`25`	`+ atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`const (`
`@@ -45,12 +45,12 @@ func CreateProject(projectName string) (string, error) {`
`45`	`45`	`return "", fmt.Errorf("%w: %s", err, string(resp))`
`46`	`46`	`}`
`47`	`47`
`48`		`- var project mongodbatlas.Project`
	`48`	`+ var project atlasv2.Group`
`49`	`49`	`if err := json.Unmarshal(resp, &project); err != nil {`
`50`	`50`	`return "", fmt.Errorf("%w: %s", err, resp)`
`51`	`51`	`}`
`52`	`52`
`53`		`- return project.ID, nil`
	`53`	`+ return project.GetId(), nil`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func deleteProject(projectID string) error {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"strconv"`
`25`	`25`
`26`	`26`	`"github.com/mongodb/mongodb-atlas-cli/test/e2e"`
`27`		`- "go.mongodb.org/atlas/mongodbatlas"`
	`27`	`+ atlasv2 "go.mongodb.org/atlas-sdk/v20231115007/admin"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const (`
`@@ -65,13 +65,13 @@ func createOrgAPIKey() (string, error) {`
`65`	`65`	`return "", fmt.Errorf("%w: %s", err, string(resp))`
`66`	`66`	`}`
`67`	`67`
`68`		`- var key mongodbatlas.APIKey`
	`68`	`+ var key atlasv2.ApiKeyUserDetails`
`69`	`69`	`if err := json.Unmarshal(resp, &key); err != nil {`
`70`	`70`	`return "", err`
`71`	`71`	`}`
`72`	`72`
`73`		`- if key.ID != "" {`
`74`		`- return key.ID, nil`
	`73`	`+ if key.GetId() != "" {`
	`74`	`+ return key.GetId(), nil`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return "", errNoAPIKey`
`@@ -115,12 +115,12 @@ func createTeam(teamName string) (string, error) {`
`115`	`115`	`return "", fmt.Errorf("%w: %s", err, string(resp))`
`116`	`116`	`}`
`117`	`117`
`118`		`- var team mongodbatlas.Team`
	`118`	`+ var team atlasv2.Team`
`119`	`119`	`if err := json.Unmarshal(resp, &team); err != nil {`
`120`	`120`	`return "", err`
`121`	`121`	`}`
`122`	`122`
`123`		`- return team.ID, nil`
	`123`	`+ return team.GetId(), nil`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`func deleteTeam(teamID string) error {`
`@@ -160,14 +160,14 @@ func OrgNUser(n int) (username, userID string, err error) {`
`160`	`160`	`return "", "", fmt.Errorf("error loading org users: %w (%s)", err, string(resp))`
`161`	`161`	`}`
`162`	`162`
`163`		`- var users mongodbatlas.AtlasUsersResponse`
	`163`	`+ var users atlasv2.PaginatedAppUser`
`164`	`164`	`if err := json.Unmarshal(resp, &users); err != nil {`
`165`	`165`	`return "", "", err`
`166`	`166`	`}`
`167`	`167`
`168`		`- if len(users.Results) <= n {`
`169`		`- return "", "", fmt.Errorf("%w: %d for %d users", errInvalidIndex, n, len(users.Results))`
	`168`	`+ if len(users.GetResults()) <= n {`
	`169`	`+ return "", "", fmt.Errorf("%w: %d for %d users", errInvalidIndex, n, len(users.GetResults()))`
`170`	`170`	`}`
`171`	`171`
`172`		`- return users.Results[n].Username, users.Results[n].ID, nil`
	`172`	`+ return users.GetResults()[n].Username, users.GetResults()[n].GetId(), nil`
`173`	`173`	`}`