feature: fix linter warnings

bahkauv70 · bahkauv70 · commit 3ad022a97d70 · 2024-12-09T15:45:48.000+01:00
diff --git a/internal/cmd/beta/security-group/create/create.go b/internal/cmd/beta/security-group/create/create.go
@@ -43,7 +43,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			examples.NewExample(`create a named group`, `$ stackit beta security-group create --name my-new-group`),
 			examples.NewExample(`create a named group with labels`, `$ stackit beta security-group create --name my-new-group --labels label1=value1,label2=value2`),
 		),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := context.Background()
 			model, err := parseInput(p, cmd)
 			if err != nil {
@@ -114,7 +114,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 			}
 		}
 		labels[parts[0]] = parts[1]
-
 	}
 	description := flags.FlagToStringValue(p, cmd, descriptionFlag)
 
@@ -153,7 +152,6 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	request = request.CreateSecurityGroupPayload(*payload)
 
 	return request
-
 }
 
 func outputResult(p *print.Printer, model *inputModel, resp *iaas.SecurityGroup) error {
diff --git a/internal/cmd/beta/security-group/delete/delete.go b/internal/cmd/beta/security-group/delete/delete.go
@@ -71,19 +71,19 @@ func NewCmd(p *print.Printer) *cobra.Command {
 	return cmd
 }
 
-func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputModel, error) {
+func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
 	globalFlags := globalflags.Parse(p, cmd)
 	if globalFlags.ProjectId == "" {
 		return nil, &errors.ProjectIdError{}
 	}
-	if err := cmd.ValidateArgs(args); err != nil {
+	if err := cmd.ValidateArgs(cliArgs); err != nil {
 		return nil, &errors.ArgValidationError{
 			Arg:     argNameGroupId,
 			Details: fmt.Sprintf("arg validation failed: %v", err),
 		}
 	}
 
-	if len(args) != 1 {
+	if len(cliArgs) != 1 {
 		return nil, &errors.ArgValidationError{
 			Arg:     argNameGroupId,
 			Details: "wrong number of arguments",
@@ -108,7 +108,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputMode
 			}
 		}
 		labels[parts[0]] = parts[1]
-
 	}
 	description := flags.FlagToStringValue(p, cmd, "description")
 	if len(description) >= 128 {
@@ -119,7 +118,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputMode
 	}
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
-		Id:              args[0],
+		Id:              cliArgs[0],
 	}
 
 	if p.IsVerbosityDebug() {
diff --git a/internal/cmd/beta/security-group/delete/delete_test.go b/internal/cmd/beta/security-group/delete/delete_test.go
@@ -84,28 +84,28 @@ func TestParseInput(t *testing.T) {
 		},
 		{
 			description: "no arguments",
-			flagValues: fixtureFlagValues(),
-			args: nil,
-			isValid: false,
+			flagValues:  fixtureFlagValues(),
+			args:        nil,
+			isValid:     false,
 		},
 		{
 			description: "multiple arguments",
-			flagValues: fixtureFlagValues(),
-			args: []string{"foo","bar"},
-			isValid: false,
+			flagValues:  fixtureFlagValues(),
+			args:        []string{"foo", "bar"},
+			isValid:     false,
 		},
 		{
 			description: "invalid group id",
-			flagValues: fixtureFlagValues(),
-			args: []string{"foo"},
-			isValid: false,
+			flagValues:  fixtureFlagValues(),
+			args:        []string{"foo"},
+			isValid:     false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			p := print.NewPrinter()
-			cmd:=NewCmd(p)
+			cmd := NewCmd(p)
 			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
 				t.Fatalf("configure global flags: %v", err)
diff --git a/internal/cmd/beta/security-group/describe/describe.go b/internal/cmd/beta/security-group/describe/describe.go
@@ -71,15 +71,14 @@ func NewCmd(p *print.Printer) *cobra.Command {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiGetSecurityGroupRequest {
 	request := apiClient.GetSecurityGroup(ctx, model.ProjectId, model.SecurityGroupId)
 	return request
-
 }
 
-func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputModel, error) {
+func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
 	globalFlags := globalflags.Parse(p, cmd)
 	if globalFlags.ProjectId == "" {
 		return nil, &errors.ProjectIdError{}
 	}
-	if err := cmd.ValidateArgs(args); err != nil {
+	if err := cmd.ValidateArgs(cliArgs); err != nil {
 		return nil, &errors.ArgValidationError{
 			Arg:     argNameGroupId,
 			Details: fmt.Sprintf("argument validation failed: %v", err),
@@ -88,7 +87,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputMode
 
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
-		SecurityGroupId: args[0],
+		SecurityGroupId: cliArgs[0],
 	}
 
 	if p.IsVerbosityDebug() {
diff --git a/internal/cmd/beta/security-group/describe/describe_test.go b/internal/cmd/beta/security-group/describe/describe_test.go
@@ -65,37 +65,37 @@ func TestParseInput(t *testing.T) {
 			description:   "base",
 			flagValues:    fixtureFlagValues(),
 			expectedModel: fixtureInputModel(),
-			args: testSecurityGroupId,
+			args:          testSecurityGroupId,
 			isValid:       true,
 		},
 		{
 			description: "no values",
 			flagValues:  map[string]string{},
-			args: testSecurityGroupId,
+			args:        testSecurityGroupId,
 			isValid:     false,
 		},
 		{
 			description: "project id missing",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				delete(flagValues, projectIdFlag)
 			}),
-			args: testSecurityGroupId,
+			args:    testSecurityGroupId,
 			isValid: false,
 		},
 		{
 			description: "project id invalid 1",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				flagValues[projectIdFlag] = ""
 			}),
-			args: testSecurityGroupId,
+			args:    testSecurityGroupId,
 			isValid: false,
 		},
 		{
 			description: "project id invalid 2",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
 				flagValues[projectIdFlag] = "invalid-uuid"
 			}),
-			args: testSecurityGroupId,
+			args:    testSecurityGroupId,
 			isValid: false,
 		},
 		{
diff --git a/internal/cmd/beta/security-group/list/list.go b/internal/cmd/beta/security-group/list/list.go
@@ -39,7 +39,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			examples.NewExample(`list all groups`, `$ stackit beta security-group list`),
 			examples.NewExample(`list groups with labels`, `$ stackit beta security-group list --labels label1=value1,label2=value2`),
 		),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := context.Background()
 			model, err := parseInput(p, cmd)
 			if err != nil {
@@ -67,7 +67,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if items := response.GetItems(); items == nil || len(*items) == 0 {
 				p.Info("no security groups found for %q", projectLabel)
 			} else {
-				outputResult(p, model.OutputFormat, *items)
+				if err := outputResult(p, model.OutputFormat, *items); err != nil {
+					return fmt.Errorf("output security groups: %w", err)
+				}
 			}
 
 			return nil
@@ -112,7 +114,6 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	}
 
 	return request
-
 }
 func outputResult(p *print.Printer, outputFormat string, items []iaas.SecurityGroup) error {
 	switch outputFormat {
@@ -136,7 +137,7 @@ func outputResult(p *print.Printer, outputFormat string, items []iaas.SecurityGr
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", labelSelectorFlag, "STATEFUL")
 		for _, item := range items {
-			table.AddRow(ptrString(item.Id), ptrString(item.Name), concatLabels(item.Labels), ptrString(item.Stateful))
+			table.AddRow(ptrString(item.Id), ptrString(item.Name), concatLabels(*item.Labels), ptrString(item.Stateful))
 		}
 		err := table.Display(p)
 		if err != nil {
@@ -154,12 +155,12 @@ func ptrString[T any](t *T) string {
 	return ""
 }
 
-func concatLabels(item *map[string]any) string {
+func concatLabels(item map[string]any) string {
 	if item == nil {
 		return ""
 	}
 	var builder strings.Builder
-	for k, v := range *item {
+	for k, v := range item {
 		builder.WriteString(fmt.Sprintf("%s=%v ", k, v))
 	}
 	return builder.String()
diff --git a/internal/cmd/beta/security-group/list/list_test.go b/internal/cmd/beta/security-group/list/list_test.go
@@ -23,13 +23,12 @@ var (
 	testClient    = &iaas.APIClient{}
 	testProjectId = uuid.NewString()
 	testLabels    = "fooKey=fooValue,barKey=barValue,bazKey=bazValue"
-	testStateful  = true
 )
 
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
-		projectIdFlag: testProjectId,
-		labelSelectorFlag:      testLabels,
+		projectIdFlag:     testProjectId,
+		labelSelectorFlag: testLabels,
 	}
 	for _, mod := range mods {
 		mod(flagValues)
diff --git a/internal/cmd/beta/security-group/update/update.go b/internal/cmd/beta/security-group/update/update.go
@@ -80,13 +80,13 @@ func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().StringSlice("labels", nil, "Labels are key-value string pairs which can be attached to a network-interface. E.g. '--labels key1=value1,key2=value2,...'")
 }
 
-func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputModel, error) {
+func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
 	globalFlags := globalflags.Parse(p, cmd)
 	if globalFlags.ProjectId == "" {
 		return nil, &errors.ProjectIdError{}
 	}
 
-	if err := cmd.ValidateArgs(args); err != nil {
+	if err := cmd.ValidateArgs(cliArgs); err != nil {
 		return nil, &errors.ArgValidationError{
 			Arg:     argNameGroupId,
 			Details: fmt.Sprintf("argument validation failed: %v", err),
@@ -96,13 +96,13 @@ func parseInput(p *print.Printer, cmd *cobra.Command, args []string) (*inputMode
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
 	}
-	if len(args) != 1 {
+	if len(cliArgs) != 1 {
 		return nil, &errors.ArgValidationError{
 			Arg:     argNameGroupId,
 			Details: "wrong number of arguments",
 		}
 	}
-	model.SecurityGroupId = args[0]
+	model.SecurityGroupId = cliArgs[0]
 
 	if cmd.Flags().Lookup("name").Changed {
 		name := flags.FlagToStringValue(p, cmd, "name")
@@ -149,5 +149,4 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	request = request.UpdateSecurityGroupPayload(*payload)
 
 	return request
-
 }
diff --git a/internal/cmd/beta/security-group/update/update_test.go b/internal/cmd/beta/security-group/update/update_test.go
@@ -212,8 +212,8 @@ func TestParseInput(t *testing.T) {
 			if err := globalflags.Configure(cmd.Flags()); err != nil {
 				t.Errorf("cannot configure global flags: %v", err)
 			}
-			for flag, value := range tt.flagValues {
 
+			for flag, value := range tt.flagValues {
 				if err := cmd.Flags().Set(flag, value); err != nil {
 					if !tt.isValid {
 						return

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`43`	`43`	examples.NewExample(`create a named group`, `$ stackit beta security-group create --name my-new-group`),
`44`	`44`	examples.NewExample(`create a named group with labels`, `$ stackit beta security-group create --name my-new-group --labels label1=value1,label2=value2`),
`45`	`45`	`),`
`46`		`- RunE: func(cmd *cobra.Command, args []string) error {`
	`46`	`+ RunE: func(cmd *cobra.Command, _ []string) error {`
`47`	`47`	`ctx := context.Background()`
`48`	`48`	`model, err := parseInput(p, cmd)`
`49`	`49`	`if err != nil {`
`@@ -114,7 +114,6 @@ func parseInput(p print.Printer, cmd cobra.Command) (*inputModel, error) {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`labels[parts[0]] = parts[1]`
`117`		`-`
`118`	`117`	`}`
`119`	`118`	`description := flags.FlagToStringValue(p, cmd, descriptionFlag)`
`120`	`119`
`@@ -153,7 +152,6 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`153`	`152`	`request = request.CreateSecurityGroupPayload(*payload)`
`154`	`153`
`155`	`154`	`return request`
`156`		`-`
`157`	`155`	`}`
`158`	`156`
`159`	`157`	`func outputResult(p print.Printer, model inputModel, resp *iaas.SecurityGroup) error {`
Original file line number	Diff line number	Diff line change
`@@ -71,19 +71,19 @@ func NewCmd(p print.Printer) cobra.Command {`
`71`	`71`	`return cmd`
`72`	`72`	`}`
`73`	`73`
`74`		`-func parseInput(p print.Printer, cmd cobra.Command, args []string) (*inputModel, error) {`
	`74`	`+func parseInput(p print.Printer, cmd cobra.Command, cliArgs []string) (*inputModel, error) {`
`75`	`75`	`globalFlags := globalflags.Parse(p, cmd)`
`76`	`76`	`if globalFlags.ProjectId == "" {`
`77`	`77`	`return nil, &errors.ProjectIdError{}`
`78`	`78`	`}`
`79`		`- if err := cmd.ValidateArgs(args); err != nil {`
	`79`	`+ if err := cmd.ValidateArgs(cliArgs); err != nil {`
`80`	`80`	`return nil, &errors.ArgValidationError{`
`81`	`81`	`Arg: argNameGroupId,`
`82`	`82`	`Details: fmt.Sprintf("arg validation failed: %v", err),`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- if len(args) != 1 {`
	`86`	`+ if len(cliArgs) != 1 {`
`87`	`87`	`return nil, &errors.ArgValidationError{`
`88`	`88`	`Arg: argNameGroupId,`
`89`	`89`	`Details: "wrong number of arguments",`
`@@ -108,7 +108,6 @@ func parseInput(p print.Printer, cmd cobra.Command, args []string) (*inputMode`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`labels[parts[0]] = parts[1]`
`111`		`-`
`112`	`111`	`}`
`113`	`112`	`description := flags.FlagToStringValue(p, cmd, "description")`
`114`	`113`	`if len(description) >= 128 {`
`@@ -119,7 +118,7 @@ func parseInput(p print.Printer, cmd cobra.Command, args []string) (*inputMode`
`119`	`118`	`}`
`120`	`119`	`model := inputModel{`
`121`	`120`	`GlobalFlagModel: globalFlags,`
`122`		`- Id: args[0],`
	`121`	`+ Id: cliArgs[0],`
`123`	`122`	`}`
`124`	`123`
`125`	`124`	`if p.IsVerbosityDebug() {`
Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,13 @@ func configureFlags(cmd *cobra.Command) {`
`80`	`80`	`cmd.Flags().StringSlice("labels", nil, "Labels are key-value string pairs which can be attached to a network-interface. E.g. '--labels key1=value1,key2=value2,...'")`
`81`	`81`	`}`
`82`	`82`
`83`		`-func parseInput(p print.Printer, cmd cobra.Command, args []string) (*inputModel, error) {`
	`83`	`+func parseInput(p print.Printer, cmd cobra.Command, cliArgs []string) (*inputModel, error) {`
`84`	`84`	`globalFlags := globalflags.Parse(p, cmd)`
`85`	`85`	`if globalFlags.ProjectId == "" {`
`86`	`86`	`return nil, &errors.ProjectIdError{}`
`87`	`87`	`}`
`88`	`88`
`89`		`- if err := cmd.ValidateArgs(args); err != nil {`
	`89`	`+ if err := cmd.ValidateArgs(cliArgs); err != nil {`
`90`	`90`	`return nil, &errors.ArgValidationError{`
`91`	`91`	`Arg: argNameGroupId,`
`92`	`92`	`Details: fmt.Sprintf("argument validation failed: %v", err),`
`@@ -96,13 +96,13 @@ func parseInput(p print.Printer, cmd cobra.Command, args []string) (*inputMode`
`96`	`96`	`model := inputModel{`
`97`	`97`	`GlobalFlagModel: globalFlags,`
`98`	`98`	`}`
`99`		`- if len(args) != 1 {`
	`99`	`+ if len(cliArgs) != 1 {`
`100`	`100`	`return nil, &errors.ArgValidationError{`
`101`	`101`	`Arg: argNameGroupId,`
`102`	`102`	`Details: "wrong number of arguments",`
`103`	`103`	`}`
`104`	`104`	`}`
`105`		`- model.SecurityGroupId = args[0]`
	`105`	`+ model.SecurityGroupId = cliArgs[0]`
`106`	`106`
`107`	`107`	`if cmd.Flags().Lookup("name").Changed {`
`108`	`108`	`name := flags.FlagToStringValue(p, cmd, "name")`
`@@ -149,5 +149,4 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`149`	`149`	`request = request.UpdateSecurityGroupPayload(*payload)`
`150`	`150`
`151`	`151`	`return request`
`152`		`-`
`153`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ func TestParseInput(t *testing.T) {`
`212`	`212`	`if err := globalflags.Configure(cmd.Flags()); err != nil {`
`213`	`213`	`t.Errorf("cannot configure global flags: %v", err)`
`214`	`214`	`}`
`215`		`- for flag, value := range tt.flagValues {`
`216`	`215`
	`216`	`+ for flag, value := range tt.flagValues {`
`217`	`217`	`if err := cmd.Flags().Set(flag, value); err != nil {`
`218`	`218`	`if !tt.isValid {`
`219`	`219`	`return`