CLOUDP-58790: Take database name from a flag when handling dbusers, Atlas (#53)

Author: andreaangiolillo

e2e/atlas_dbusers_test.go

@@ -125,7 +125,7 @@ func TestAtlasDBUsers(t *testing.T) {
 	})
 
 	t.Run("Delete", func(t *testing.T) {
-		cmd := exec.Command(cliPath, atlasEntity, dbusersEntity, "delete", username, "--force")
+		cmd := exec.Command(cliPath, atlasEntity, dbusersEntity, "delete", username, "--force", "--authDB", "admin")
 		cmd.Env = os.Environ()
 		resp, err := cmd.CombinedOutput()
 

internal/cli/atlas_alert_config_delete_test.go

@@ -30,8 +30,9 @@ func TestAtlasAlertConfigsDelete_Run(t *testing.T) {
 	deleteOpts := &atlasAlertConfigDeleteOpts{
 		globalOpts: newGlobalOpts(),
 		deleteOpts: &deleteOpts{
-			confirm: true,
-			entry:   "test",
+			confirm:        true,
+			entry:          "test",
+			successMessage: "Alert config '%s' deleted\n",
 		},
 		store: mockStore,
 	}

internal/cli/atlas_clusters_delete_test.go

@@ -30,8 +30,9 @@ func TestAtlasClustersDelete_Run(t *testing.T) {
 	deleteOpts := &atlasClustersDeleteOpts{
 		globalOpts: newGlobalOpts(),
 		deleteOpts: &deleteOpts{
-			confirm: true,
-			entry:   "test",
+			confirm:        true,
+			entry:          "test",
+			successMessage: "Cluster '%s' deleted\n",
 		},
 		store: mockStore,
 	}

internal/cli/atlas_dbusers_delete.go

@@ -24,7 +24,8 @@ import (
 type atlasDBUsersDeleteOpts struct {
 	*globalOpts
 	*deleteOpts
-	store store.DatabaseUserDeleter
+	authDB string
+	store  store.DatabaseUserDeleter
 }
 
 func (opts *atlasDBUsersDeleteOpts) init() error {
@@ -38,7 +39,7 @@ func (opts *atlasDBUsersDeleteOpts) init() error {
 }
 
 func (opts *atlasDBUsersDeleteOpts) Run() error {
-	return opts.DeleteFromProject(opts.store.DeleteDatabaseUser, opts.ProjectID())
+	return opts.DeleterFromProjectAuthDB(opts.store.DeleteDatabaseUser, opts.authDB, opts.ProjectID())
 }
 
 // mongocli atlas dbuser(s) delete <username> --force
@@ -70,6 +71,7 @@ func AtlasDBUsersDeleteBuilder() *cobra.Command {
 	cmd.Flags().BoolVar(&opts.confirm, flags.Force, false, usage.Force)
 
 	cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
+	cmd.Flags().StringVar(&opts.authDB, flags.AuthDB, "admin", usage.AuthDB)
 
 	return cmd
 }

internal/cli/atlas_dbusers_delete_test.go

@@ -30,15 +30,17 @@ func TestAtlasDBUsersDelete_Run(t *testing.T) {
 	deleteOpts := &atlasDBUsersDeleteOpts{
 		globalOpts: newGlobalOpts(),
 		deleteOpts: &deleteOpts{
-			confirm: true,
-			entry:   "test",
+			confirm:        true,
+			entry:          "test",
+			successMessage: "DB user '%s' deleted\n",
 		},
-		store: mockStore,
+		authDB: "admin",
+		store:  mockStore,
 	}
 
 	mockStore.
 		EXPECT().
-		DeleteDatabaseUser(deleteOpts.projectID, deleteOpts.entry).
+		DeleteDatabaseUser(deleteOpts.authDB, deleteOpts.projectID, deleteOpts.entry).
 		Return(nil).
 		Times(1)
 

internal/cli/atlas_whitelist_delete_test.go

@@ -30,8 +30,9 @@ func TestAtlasWhitelistDelete_Run(t *testing.T) {
 	deleteOpts := &atlasWhitelistDeleteOpts{
 		globalOpts: newGlobalOpts(),
 		deleteOpts: &deleteOpts{
-			confirm: true,
-			entry:   "test",
+			confirm:        true,
+			entry:          "test",
+			successMessage: "Project whitelist entry '%s' deleted\n",
 		},
 		store: mockStore,
 	}

internal/cli/cli.go

@@ -65,6 +65,9 @@ type deleteOpts struct {
 // DeleterFromProject a function to delete from the store.
 type DeleterFromProject func(projectID string, entry string) error
 
+// DeleterFromProjectAuthDB a function to delete from the store.
+type DeleterFromProjectAuthDB func(authDB string, projectID string, entry string) error
+
 // DeleteFromProject deletes a resource from a project, it expects a callback
 // that should perform the deletion from the store.
 func (opts *deleteOpts) DeleteFromProject(d DeleterFromProject, projectID string) error {
@@ -83,6 +86,24 @@ func (opts *deleteOpts) DeleteFromProject(d DeleterFromProject, projectID string
 	return nil
 }
 
+// DeleterFromProjectAuthDB deletes a resource from a project, it expects a callback
+// that should perform the deletion from the store.
+func (opts *deleteOpts) DeleterFromProjectAuthDB(d DeleterFromProjectAuthDB, authDB, projectID string) error {
+	if !opts.confirm {
+		fmt.Println(opts.failMessage)
+		return nil
+	}
+	err := d(authDB, projectID, opts.entry)
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf(opts.successMessage, opts.entry)
+
+	return nil
+}
+
 // Deleter a function to delete from the store.
 type Deleter func(entry string) error
 

internal/flags/flags.go

@@ -20,6 +20,7 @@ const (
 	ProfileShort                    = "p"                               // ProfileShort flag to use a profile
 	OrgID                           = "orgId"                           // OrgID flag to use an Organization ID
 	ProjectID                       = "projectId"                       // ProjectID flag to use a project ID
+	AuthDB                          = "authDB"                          // AuthDB flag
 	Provider                        = "provider"                        // Provider flag to set the cloud provider
 	Region                          = "region"                          // Region flag
 	RegionShort                     = "r"                               // RegionShort flag
@@ -31,7 +32,6 @@ const (
 	Backup                          = "backup"                          // Backup flag
 	Username                        = "username"                        // Username flag
 	Password                        = "password"                        // Password flag
-	AuthDB                          = "authDB"                          // AuthDB flag
 	Email                           = "email"                           // Email flag
 	FirstName                       = "firstName"                       // FirstName flag
 	LastName                        = "lastName"                        // LastName flag

internal/mocks/mock_database_users.go

@@ -31,15 +31,15 @@ type DatabaseUserCreator interface {
 }
 
 type DatabaseUserDeleter interface {
-	DeleteDatabaseUser(string, string) error
+	DeleteDatabaseUser(string, string, string) error
 }
 
 type DatabaseUserUpdater interface {
 	UpdateDatabaseUser(*atlas.DatabaseUser) (*atlas.DatabaseUser, error)
 }
 
 type DatabaseUserDescriber interface {
-	DatabaseUser(string, string) (*atlas.DatabaseUser, error)
+	DatabaseUser(string, string, string) (*atlas.DatabaseUser, error)
 }
 
 type DatabaseUserStore interface {
@@ -60,11 +60,10 @@ func (s *Store) CreateDatabaseUser(user *atlas.DatabaseUser) (*atlas.DatabaseUse
 	}
 }
 
-func (s *Store) DeleteDatabaseUser(groupID, username string) error {
-	dbName := "admin"
+func (s *Store) DeleteDatabaseUser(authDB, groupID, username string) error {
 	switch s.service {
 	case config.CloudService:
-		_, err := s.client.(*atlas.Client).DatabaseUsers.Delete(context.Background(), dbName, groupID, username)
+		_, err := s.client.(*atlas.Client).DatabaseUsers.Delete(context.Background(), authDB, groupID, username)
 		return err
 	default:
 		return fmt.Errorf("unsupported service: %s", s.service)
@@ -91,11 +90,10 @@ func (s *Store) UpdateDatabaseUser(user *atlas.DatabaseUser) (*atlas.DatabaseUse
 	}
 }
 
-func (s *Store) DatabaseUser(groupID string, username string) (*atlas.DatabaseUser, error) {
-	dbName := "admin"
+func (s *Store) DatabaseUser(authDB string, groupID string, username string) (*atlas.DatabaseUser, error) {
 	switch s.service {
 	case config.CloudService:
-		result, _, err := s.client.(*atlas.Client).DatabaseUsers.Get(context.Background(), dbName, groupID, username)
+		result, _, err := s.client.(*atlas.Client).DatabaseUsers.Get(context.Background(), authDB, groupID, username)
 		return result, err
 	default:
 		return nil, fmt.Errorf("unsupported service: %s", s.service)

internal/store/database_users.go

@@ -23,11 +23,11 @@ const (
 	DiskSizeGB                      = "Capacity, in gigabytes, of the host’s root volume."
 	Backup                          = "If true, uses Atlas Continuous Backups to back up cluster data."
 	MDBVersion                      = "MongoDB version of the cluster to deploy."
+	AuthDB                          = "Authentication database name."
 	Page                            = "Page number."
 	Limit                           = "Number of items per page."
 	Username                        = "Username for authenticating to MongoDB."
 	Password                        = "User’s password."
-	AuthDB                          = "Authentication database name."
 	Roles                           = "User's roles and the databases or collections on which the roles apply."
 	Comment                         = "Optional description of the whitelist entry."
 	Force                           = "Don't ask for confirmation."