CLOUDP-57841: Delete dbusers C/OM

internal/cli/atlas_alert_config_delete.go

@@ -38,7 +38,7 @@ func (opts *atlasAlertConfigDeleteOpts) init() error {
 }
 
 func (opts *atlasAlertConfigDeleteOpts) Run() error {
-	return opts.DeleteFromProject(opts.store.DeleteAlertConfiguration, opts.ProjectID())
+	return opts.Delete(opts.store.DeleteAlertConfiguration, opts.ProjectID())
 }
 
 // mongocli atlas alerts config(s) delete id --projectId projectId [--confirm]

internal/cli/atlas_clusters_delete.go

@@ -38,7 +38,7 @@ func (opts *atlasClustersDeleteOpts) init() error {
 }
 
 func (opts *atlasClustersDeleteOpts) Run() error {
-	return opts.DeleteFromProject(opts.store.DeleteCluster, opts.ProjectID())
+	return opts.Delete(opts.store.DeleteCluster, opts.ProjectID())
 }
 
 // mongocli atlas cluster(s) delete name --projectId projectId [--confirm]

internal/cli/atlas_dbusers_create.go

@@ -31,6 +31,7 @@ type atlasDBUsersCreateOpts struct {
 	*globalOpts
 	username string
 	password string
+	authDB   string
 	roles    []string
 	store    store.DatabaseUserCreator
 }
@@ -58,7 +59,7 @@ func (opts *atlasDBUsersCreateOpts) Run() error {
 
 func (opts *atlasDBUsersCreateOpts) newDatabaseUser() *atlas.DatabaseUser {
 	return &atlas.DatabaseUser{
-		DatabaseName: convert.AdminDB,
+		DatabaseName: opts.authDB,
 		Roles:        convert.BuildAtlasRoles(opts.roles),
 		GroupID:      opts.ProjectID(),
 		Username:     opts.username,
@@ -105,6 +106,7 @@ func AtlasDBUsersCreateBuilder() *cobra.Command {
 	cmd.Flags().StringVar(&opts.username, flags.Username, "", usage.Username)
 	cmd.Flags().StringVar(&opts.password, flags.Password, "", usage.Password)
 	cmd.Flags().StringSliceVar(&opts.roles, flags.Role, []string{}, usage.Roles)
+	cmd.Flags().StringVar(&opts.authDB, flags.AuthDB, convert.AdminDB, usage.AuthDB)
 
 	cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
 

internal/cli/atlas_dbusers_delete.go

@@ -15,6 +15,7 @@
 package cli
 
 import (
+	"github.com/mongodb/mongocli/internal/convert"
 	"github.com/mongodb/mongocli/internal/flags"
 	"github.com/mongodb/mongocli/internal/store"
 	"github.com/mongodb/mongocli/internal/usage"
@@ -39,7 +40,7 @@ func (opts *atlasDBUsersDeleteOpts) init() error {
 }
 
 func (opts *atlasDBUsersDeleteOpts) Run() error {
-	return opts.DeleterFromProjectAuthDB(opts.store.DeleteDatabaseUser, opts.authDB, opts.ProjectID())
+	return opts.Delete(opts.store.DeleteDatabaseUser, opts.authDB, opts.ProjectID())
 }
 
 // mongocli atlas dbuser(s) delete <username> --force
@@ -69,9 +70,9 @@ func AtlasDBUsersDeleteBuilder() *cobra.Command {
 	}
 
 	cmd.Flags().BoolVar(&opts.confirm, flags.Force, false, usage.Force)
+	cmd.Flags().StringVar(&opts.authDB, flags.AuthDB, convert.AdminDB, usage.AuthDB)
 
 	cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
-	cmd.Flags().StringVar(&opts.authDB, flags.AuthDB, "admin", usage.AuthDB)
 
 	return cmd
 }

internal/cli/atlas_whitelist_delete.go

@@ -38,7 +38,7 @@ func (opts *atlasWhitelistDeleteOpts) init() error {
 }
 
 func (opts *atlasWhitelistDeleteOpts) Run() error {
-	return opts.DeleteFromProject(opts.store.DeleteProjectIPWhitelist, opts.ProjectID())
+	return opts.Delete(opts.store.DeleteProjectIPWhitelist, opts.ProjectID())
 }
 
 // mongocli atlas whitelist delete <entry> --force

internal/cli/cli.go

@@ -15,6 +15,7 @@
 package cli
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -24,7 +25,7 @@ import (
 
 const (
 	fallbackSuccessMessage = "'%s' deleted\n"
-	fallbackFailMessage    = "'%s' not deleted\n"
+	fallbackFailMessage    = "entry not deleted"
 )
 
 type globalOpts struct {
@@ -58,7 +59,7 @@ func (opts *globalOpts) OrgID() string {
 }
 
 // deleteOpts options required when deleting a resource.
-// A command can embed this structure and then safely rely on the methods Confirm, DeleteFromProject or Delete
+// A command can compose this struct and then safely rely on the methods Confirm, or Delete
 // to manage the interactions with the user
 type deleteOpts struct {
 	entry          string
@@ -67,83 +68,31 @@ type deleteOpts struct {
 	failMessage    string
 }
 
-// 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
+// Delete deletes a resource not associated to a project, it expects a callback
 // that should perform the deletion from the store.
-func (opts *deleteOpts) DeleteFromProject(d DeleterFromProject, projectID string) error {
+func (opts *deleteOpts) Delete(d interface{}, a ...string) error {
 	if !opts.confirm {
-		opts.printFailMessage()
+		fmt.Println(opts.FailMessage())
 		return nil
 	}
-	err := d(projectID, opts.entry)
-
-	if err != nil {
-		return err
-	}
-
-	opts.printSuccessMessage()
-
-	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 {
-		opts.printFailMessage()
-		return nil
+	var err error
+	switch f := d.(type) {
+	case func(string) error:
+		err = f(opts.entry)
+	case func(string, string) error:
+		err = f(a[0], opts.entry)
+	case func(string, string, string) error:
+		err = f(a[0], a[1], opts.entry)
+	default:
+		return errors.New("invalid")
 	}
-	err := d(authDB, projectID, opts.entry)
 
 	if err != nil {
 		return err
 	}
 
-	opts.printSuccessMessage()
-
-	return nil
-}
-
-// printSuccessMessage prints a success message
-func (opts *deleteOpts) printSuccessMessage() {
-	if opts.successMessage != "" {
-		fmt.Printf(opts.successMessage, opts.entry)
-	} else {
-		fmt.Printf(fallbackSuccessMessage, opts.entry)
-	}
-}
-
-// printFailMessage prints a fail message
-func (opts *deleteOpts) printFailMessage() {
-	if opts.successMessage != "" {
-		fmt.Printf(opts.failMessage, opts.entry)
-	} else {
-		fmt.Printf(fallbackFailMessage, opts.entry)
-	}
-}
-
-// Deleter a function to delete from the store.
-type Deleter func(entry string) error
-
-// Delete deletes a resource not associated to a project, it expects a callback
-//// that should perform the deletion from the store.
-func (opts *deleteOpts) Delete(d Deleter) error {
-	if !opts.confirm {
-		opts.printFailMessage()
-		return nil
-	}
-	err := d(opts.entry)
-
-	if err != nil {
-		return err
-	}
-
-	opts.printSuccessMessage()
+	fmt.Printf(opts.SuccessMessage(), opts.entry)
 
 	return nil
 }
@@ -157,3 +106,19 @@ func (opts *deleteOpts) Confirm() error {
 	prompt := prompts.NewDeleteConfirm(opts.entry)
 	return survey.AskOne(prompt, &opts.confirm)
 }
+
+// SuccessMessage gets the set success message or the default value
+func (opts *deleteOpts) SuccessMessage() string {
+	if opts.successMessage != "" {
+		return opts.successMessage
+	}
+	return fallbackSuccessMessage
+}
+
+// FailMessage gets the set fail message or the default value
+func (opts *deleteOpts) FailMessage() string {
+	if opts.failMessage != "" {
+		return opts.failMessage
+	}
+	return fallbackFailMessage
+}

internal/cli/ops_manager_dbusers.go

@@ -31,6 +31,7 @@ A user’s roles apply to all the clusters in the project.`,
 
 	cmd.AddCommand(OpsManagerDBUsersCreateBuilder())
 	cmd.AddCommand(OpsManagerDBUsersListBuilder())
+	cmd.AddCommand(OpsManagerDBUsersDeleteBuilder())
 
 	return cmd
 }

internal/cli/ops_manager_dbusers_create.go

@@ -57,7 +57,7 @@ func (opts *opsManagerDBUsersCreateOpts) Run() error {
 		return err
 	}
 
-	current.Auth.Users = append(current.Auth.Users, opts.newDBUser())
+	convert.AddUser(current, opts.newDBUser())
 
 	if err = opts.store.UpdateAutomationConfig(opts.ProjectID(), current); err != nil {
 		return err

internal/cli/ops_manager_dbusers_delete.go

@@ -0,0 +1,95 @@
+// Copyright 2020 MongoDB Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cli
+
+import (
+	"fmt"
+
+	"github.com/mongodb/mongocli/internal/config"
+	"github.com/mongodb/mongocli/internal/convert"
+	"github.com/mongodb/mongocli/internal/flags"
+	"github.com/mongodb/mongocli/internal/messages"
+	"github.com/mongodb/mongocli/internal/store"
+	"github.com/mongodb/mongocli/internal/usage"
+	"github.com/spf13/cobra"
+)
+
+type opsManagerDBUsersDeleteOpts struct {
+	*globalOpts
+	*deleteOpts
+	authDB string
+	store  store.AutomationPatcher
+}
+
+func (opts *opsManagerDBUsersDeleteOpts) init() error {
+	if opts.ProjectID() == "" {
+		return errMissingProjectID
+	}
+
+	var err error
+	opts.store, err = store.New()
+	return err
+}
+
+func (opts *opsManagerDBUsersDeleteOpts) Run() error {
+	current, err := opts.store.GetAutomationConfig(opts.ProjectID())
+
+	if err != nil {
+		return err
+	}
+
+	convert.RemoveUser(current, opts.entry, opts.authDB)
+
+	if err = opts.store.UpdateAutomationConfig(opts.ProjectID(), current); err != nil {
+		return err
+	}
+
+	fmt.Print(messages.DeploymentStatus(config.OpsManagerURL(), opts.ProjectID()))
+
+	return nil
+}
+
+// mongocli atlas dbuser(s) delete <username> [--projectId projectId]
+func OpsManagerDBUsersDeleteBuilder() *cobra.Command {
+	opts := &opsManagerDBUsersDeleteOpts{
+		globalOpts: newGlobalOpts(),
+		deleteOpts: &deleteOpts{
+			successMessage: "DB user '%s' deleted\n",
+			failMessage:    "DB user not deleted",
+		},
+	}
+	cmd := &cobra.Command{
+		Use:     "delete [username]",
+		Short:   "Delete a database user for a project.",
+		Aliases: []string{"rm"},
+		Args:    cobra.ExactArgs(1),
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			if err := opts.init(); err != nil {
+				return err
+			}
+			opts.entry = args[0]
+			return opts.Confirm()
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return opts.Run()
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.authDB, flags.AuthDB, convert.AdminDB, usage.AuthDB)
+
+	cmd.Flags().StringVar(&opts.projectID, flags.ProjectID, "", usage.ProjectID)
+
+	return cmd
+}

internal/cli/ops_manager_dbusers_delete_test.go

@@ -0,0 +1,60 @@
+// Copyright 2020 MongoDB Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cli
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/mongodb/mongocli/internal/fixtures"
+	"github.com/mongodb/mongocli/internal/mocks"
+)
+
+func TestOpsManagerDBUserDelete_Run(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockStore := mocks.NewMockAutomationPatcher(ctrl)
+
+	defer ctrl.Finish()
+
+	expected := fixtures.AutomationConfig()
+
+	createOpts := &opsManagerDBUsersDeleteOpts{
+		globalOpts: newGlobalOpts(),
+		deleteOpts: &deleteOpts{
+			confirm:        true,
+			entry:          "test",
+			successMessage: "DB user '%s' deleted\n",
+		},
+		authDB: "admin",
+		store:  mockStore,
+	}
+
+	mockStore.
+		EXPECT().
+		GetAutomationConfig(createOpts.projectID).
+		Return(expected, nil).
+		Times(1)
+
+	mockStore.
+		EXPECT().
+		UpdateAutomationConfig(createOpts.projectID, expected).
+		Return(nil).
+		Times(1)
+
+	err := createOpts.Run()
+	if err != nil {
+		t.Fatalf("Run() unexpected error: %v", err)
+	}
+}