From afb9a9d138e87d12a0c47a8e6e5af88488615a89 Mon Sep 17 00:00:00 2001 From: Ruben Hoenle Date: Wed, 19 Mar 2025 16:34:42 +0100 Subject: [PATCH] fix(sqlserverflex): require roles flag on user creation the API requires the roles anyways relates to STACKITCLI-125 --- docs/stackit_beta_sqlserverflex_user_create.md | 2 +- internal/cmd/beta/sqlserverflex/user/create/create.go | 4 ++-- internal/cmd/beta/sqlserverflex/user/create/create_test.go | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/stackit_beta_sqlserverflex_user_create.md b/docs/stackit_beta_sqlserverflex_user_create.md index 26c07f913..f1cf9dbbe 100644 --- a/docs/stackit_beta_sqlserverflex_user_create.md +++ b/docs/stackit_beta_sqlserverflex_user_create.md @@ -22,7 +22,7 @@ stackit beta sqlserverflex user create [flags] ``` Create a SQLServer Flex user for instance with ID "xxx" and specify the username, role and database - $ stackit beta sqlserverflex user create --instance-id xxx --username johndoe --roles "##STACKIT_DatabaseManager##" --database my-database + $ stackit beta sqlserverflex user create --instance-id xxx --username johndoe --roles "##STACKIT_DatabaseManager##" Create a SQLServer Flex user for instance with ID "xxx", specifying multiple roles $ stackit beta sqlserverflex user create --instance-id xxx --username johndoe --roles "##STACKIT_LoginManager##,##STACKIT_DatabaseManager##" diff --git a/internal/cmd/beta/sqlserverflex/user/create/create.go b/internal/cmd/beta/sqlserverflex/user/create/create.go index 2e4f04896..0cd99180c 100644 --- a/internal/cmd/beta/sqlserverflex/user/create/create.go +++ b/internal/cmd/beta/sqlserverflex/user/create/create.go @@ -50,7 +50,7 @@ func NewCmd(p *print.Printer) *cobra.Command { Example: examples.Build( examples.NewExample( `Create a SQLServer Flex user for instance with ID "xxx" and specify the username, role and database`, - `$ stackit beta sqlserverflex user create --instance-id xxx --username johndoe --roles "##STACKIT_DatabaseManager##" --database my-database`), + `$ stackit beta sqlserverflex user create --instance-id xxx --username johndoe --roles "##STACKIT_DatabaseManager##"`), examples.NewExample( `Create a SQLServer Flex user for instance with ID "xxx", specifying multiple roles`, `$ stackit beta sqlserverflex user create --instance-id xxx --username johndoe --roles "##STACKIT_LoginManager##,##STACKIT_DatabaseManager##"`), @@ -104,7 +104,7 @@ func configureFlags(cmd *cobra.Command) { cmd.Flags().String(usernameFlag, "", "Username of the user") cmd.Flags().StringSlice(rolesFlag, []string{}, "Roles of the user") - err := flags.MarkFlagsRequired(cmd, instanceIdFlag, usernameFlag) + err := flags.MarkFlagsRequired(cmd, instanceIdFlag, usernameFlag, rolesFlag) cobra.CheckErr(err) } diff --git a/internal/cmd/beta/sqlserverflex/user/create/create_test.go b/internal/cmd/beta/sqlserverflex/user/create/create_test.go index 8db8d6db2..a53878b3d 100644 --- a/internal/cmd/beta/sqlserverflex/user/create/create_test.go +++ b/internal/cmd/beta/sqlserverflex/user/create/create_test.go @@ -92,10 +92,7 @@ func TestParseInput(t *testing.T) { flagValues: fixtureFlagValues(func(flagValues map[string]string) { delete(flagValues, rolesFlag) }), - isValid: true, - expectedModel: fixtureInputModel(func(model *inputModel) { - model.Roles = nil - }), + isValid: false, }, { description: "no values",