CLOUDP-67923: Add --deleteAfter to dbusers create (#285)

mongodb · Jul 27, 2020 · b57e0ac · b57e0ac
1 parent 246e52b
commit b57e0ac
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/e2e/atlas/dbusers_test.go b/e2e/atlas/dbusers_test.go
@@ -47,6 +47,7 @@ func TestDBUsers(t *testing.T) {
 			dbusersEntity,
 			"create",
 			"atlasAdmin",
+			"--deleteAfter", time.Now().AddDate(0, 0, 1).Format(time.RFC3339),
 			"--username", username,
 			"--password=passW0rd")
 		cmd.Env = os.Environ()

diff --git a/internal/cli/atlas/dbusers/create.go b/internal/cli/atlas/dbusers/create.go
@@ -33,12 +33,13 @@ import (
 
 type CreateOpts struct {
 	cli.GlobalOpts
-	username   string
-	password   string
-	x509Type   string
-	awsIamType string
-	roles      []string
-	store      store.DatabaseUserCreator
+	username    string
+	password    string
+	x509Type    string
+	awsIamType  string
+	deleteAfter string
+	roles       []string
+	store       store.DatabaseUserCreator
 }
 
 const (
@@ -87,13 +88,14 @@ func (opts *CreateOpts) newDatabaseUser() *atlas.DatabaseUser {
 	}
 
 	return &atlas.DatabaseUser{
-		Roles:        convert.BuildAtlasRoles(opts.roles),
-		GroupID:      opts.ConfigProjectID(),
-		Username:     opts.username,
-		Password:     opts.password,
-		X509Type:     opts.x509Type,
-		AWSIAMType:   opts.awsIamType,
-		DatabaseName: authDB,
+		Roles:           convert.BuildAtlasRoles(opts.roles),
+		GroupID:         opts.ConfigProjectID(),
+		Username:        opts.username,
+		Password:        opts.password,
+		X509Type:        opts.x509Type,
+		AWSIAMType:      opts.awsIamType,
+		DeleteAfterDate: opts.deleteAfter,
+		DatabaseName:    authDB,
 	}
 }
 
@@ -177,6 +179,7 @@ func CreateBuilder() *cobra.Command {
 
 	cmd.Flags().StringVarP(&opts.username, flag.Username, flag.UsernameShort, "", usage.Username)
 	cmd.Flags().StringVarP(&opts.password, flag.Password, flag.PasswordShort, "", usage.Password)
+	cmd.Flags().StringVar(&opts.deleteAfter, flag.DeleteAfter, "", usage.BDUsersDeleteAfter)
 	cmd.Flags().StringSliceVar(&opts.roles, flag.Role, []string{}, usage.Roles)
 	cmd.Flags().StringVar(&opts.x509Type, flag.X509Type, AuthTypeNone, usage.X509Type)
 	cmd.Flags().StringVar(&opts.awsIamType, flag.AWSIAMType, AuthTypeNone, usage.AWSIAMType)

diff --git a/internal/cli/atlas/whitelist/create.go b/internal/cli/atlas/whitelist/create.go
@@ -94,7 +94,7 @@ func CreateBuilder() *cobra.Command {
 
 	cmd.Flags().StringVar(&opts.entryType, flag.Type, ipAddress, usage.WhitelistType)
 	cmd.Flags().StringVar(&opts.comment, flag.Comment, "", usage.Comment)
-	cmd.Flags().StringVar(&opts.deleteAfter, flag.DeleteAfter, "", usage.DeleteAfter)
+	cmd.Flags().StringVar(&opts.deleteAfter, flag.DeleteAfter, "", usage.WhiteListsDeleteAfter)
 
 	cmd.Flags().StringVar(&opts.ProjectID, flag.ProjectID, "", usage.ProjectID)
 

diff --git a/internal/usage/usage.go b/internal/usage/usage.go
@@ -39,7 +39,8 @@ const (
 	DataLakeRegion                  = "Name of the region to which Data Lake routes client connections for data processing."
 	DataLakeTestBucket              = `Name of an S3 data bucket which Data Lake uses to validate the provided role.`
 	Comment                         = "Optional description or comment for the entry."
-	DeleteAfter                     = "ISO-8601-formatted UTC date after which Atlas removes the entry from the whitelist."
+	WhiteListsDeleteAfter           = "ISO-8601-formatted UTC date after which Atlas removes the entry from the whitelist."
+	BDUsersDeleteAfter              = "Timestamp in ISO 8601 date and time format in UTC after which Atlas deletes the user."
 	Force                           = "Don't ask for confirmation."
 	Email                           = "User’s email address."
 	LogOut                          = "Optional output filename, if none given will use the log name."