feat(server): refactor detach command to use flags instead of positional arguments

Author: s-inter

internal/cmd/server/security-group/detach/detach.go

@@ -15,13 +15,11 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client"
 	iaasUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
 )
 
 const (
-	serverIdArg = "SERVER_ID"
-
+	serverIdFlag        = "server-id"
 	securityGroupIdFlag = "security-group-id"
 )
 
@@ -33,14 +31,14 @@ type inputModel struct {
 
 func NewCmd(params *types.CmdParams) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   fmt.Sprintf("detach %s", serverIdArg),
+		Use:   "detach",
 		Short: "Detaches a security group from a server",
 		Long:  "Detaches a security group from a server.",
-		Args:  args.SingleArg(serverIdArg, utils.ValidateUUID),
+		Args:  args.NoArgs,
 		Example: examples.Build(
 			examples.NewExample(
 				`Detach a security group with ID "xxx" from a server with ID "yyy"`,
-				`$ stackit server security-group detach yyy --security-group-id xxx`,
+				`$ stackit server security-group detach --server-id yyy --security-group-id xxx`,
 			),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -92,22 +90,22 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 }
 
 func configureFlags(cmd *cobra.Command) {
+	cmd.Flags().Var(flags.UUIDFlag(), serverIdFlag, "Server ID")
 	cmd.Flags().Var(flags.UUIDFlag(), securityGroupIdFlag, "Security Group ID")
 
-	err := flags.MarkFlagsRequired(cmd, securityGroupIdFlag)
+	err := flags.MarkFlagsRequired(cmd, serverIdFlag, securityGroupIdFlag)
 	cobra.CheckErr(err)
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
-	serverId := inputArgs[0]
 	globalFlags := globalflags.Parse(p, cmd)
 	if globalFlags.ProjectId == "" {
 		return nil, &cliErr.ProjectIdError{}
 	}
 
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
-		ServerId:        serverId,
+		ServerId:        flags.FlagToStringValue(p, cmd, serverIdFlag),
 		SecurityGroupId: flags.FlagToStringValue(p, cmd, securityGroupIdFlag),
 	}
 

internal/cmd/server/security-group/detach/detach_test.go

@@ -26,21 +26,12 @@ var testProjectId = uuid.NewString()
 var testServerId = uuid.NewString()
 var testSecurityGroupId = uuid.NewString()
 
-func fixtureArgValues(mods ...func(argValues []string)) []string {
-	argValues := []string{
-		testServerId,
-	}
-	for _, mod := range mods {
-		mod(argValues)
-	}
-	return argValues
-}
-
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
 		globalflags.ProjectIdFlag: testProjectId,
 		globalflags.RegionFlag:    testRegion,
 
+		serverIdFlag:        testServerId,
 		securityGroupIdFlag: testSecurityGroupId,
 	}
 	for _, mod := range mods {
@@ -76,14 +67,12 @@ func fixtureRequest(mods ...func(request *iaas.ApiRemoveSecurityGroupFromServerR
 func TestParseInput(t *testing.T) {
 	tests := []struct {
 		description   string
-		argValues     []string
 		flagValues    map[string]string
 		isValid       bool
 		expectedModel *inputModel
 	}{
 		{
 			description:   "base",
-			argValues:     fixtureArgValues(),
 			flagValues:    fixtureFlagValues(),
 			isValid:       true,
 			expectedModel: fixtureInputModel(),
@@ -95,56 +84,66 @@ func TestParseInput(t *testing.T) {
 		},
 		{
 			description: "project id missing",
-			argValues:   fixtureArgValues(),
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				delete(flagValues, globalflags.ProjectIdFlag)
 			}),
 			isValid: false,
 		},
 		{
 			description: "project id invalid 1",
-			argValues:   fixtureArgValues(),
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				flagValues[globalflags.ProjectIdFlag] = ""
 			}),
 			isValid: false,
 		},
 		{
 			description: "project id invalid 2",
-			argValues:   fixtureArgValues(),
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
 			}),
 			isValid: false,
 		},
 		{
 			description: "security group id missing",
-			argValues:   fixtureArgValues(),
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				delete(flagValues, securityGroupIdFlag)
 			}),
 			isValid: false,
 		},
 		{
 			description: "security group id invalid 1",
-			argValues:   fixtureArgValues(),
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				flagValues[securityGroupIdFlag] = ""
 			}),
 			isValid: false,
 		},
 		{
 			description: "security group id invalid 2",
-			argValues:   fixtureArgValues(),
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				flagValues[securityGroupIdFlag] = "invalid-uuid"
 			}),
 			isValid: false,
 		},
 		{
-			description: "server id argument missing",
-			argValues:   []string{},
-			isValid:     false,
+			description: "server id flag missing",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				delete(flagValues, serverIdFlag)
+			}),
+			isValid: false,
+		},
+		{
+			description: "server id invalid 1",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[serverIdFlag] = ""
+			}),
+			isValid: false,
+		},
+		{
+			description: "server id invalid 2",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[serverIdFlag] = "invalid-uuid"
+			}),
+			isValid: false,
 		},
 	}
 
@@ -167,14 +166,6 @@ func TestParseInput(t *testing.T) {
 				}
 			}
 
-			err = cmd.ValidateArgs(tt.argValues)
-			if err != nil {
-				if !tt.isValid {
-					return
-				}
-				t.Fatalf("error parsing args: %v", err)
-			}
-
 			err = cmd.ValidateRequiredFlags()
 			if err != nil {
 				if !tt.isValid {
@@ -183,7 +174,7 @@ func TestParseInput(t *testing.T) {
 				t.Fatalf("error validating flags: %v", err)
 			}
 
-			model, err := parseInput(p, cmd, tt.argValues)
+			model, err := parseInput(p, cmd, []string{})
 			if err != nil {
 				if !tt.isValid {
 					return