chore(linter): add whitespace linter wsl_v5

Author: marceljk

golang-ci.yaml

@@ -15,6 +15,7 @@ linters:
     - revive
     - sqlclosecheck
     - wastedassign
+    - wsl_v5
   disable:
     - noctx # false positive: finds errors with http.NewRequest that dont make sense
     - unparam # false positives
@@ -66,6 +67,8 @@ linters:
         - name: atomic
         - name: empty-lines
         - name: early-return
+    wsl_v5:
+      default: all
   exclusions:
     generated: lax
     paths:

internal/cmd/affinity-groups/affinity-groups.go

@@ -21,6 +21,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 		Run:   utils.CmdHelp,
 	}
 	addSubcommands(cmd, params)
+
 	return cmd
 }
 

internal/cmd/affinity-groups/create/create.go

@@ -44,6 +44,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
+
 			model, err := parseInput(params.Printer, cmd, args)
 			if err != nil {
 				return err
@@ -56,6 +57,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			prompt := fmt.Sprintf("Are you sure you want to create the affinity group %q?", model.Name)
+
 			err = params.Printer.PromptForConfirmation(prompt)
 			if err != nil {
 				return err
@@ -68,13 +70,16 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create affinity group: %w", err)
 			}
+
 			if resp := result; resp != nil {
 				return outputResult(params.Printer, *model, *resp)
 			}
+
 			return fmt.Errorf("create affinity group: nil result")
 		},
 	}
 	configureFlags(cmd)
+
 	return cmd
 }
 
@@ -89,12 +94,14 @@ func configureFlags(cmd *cobra.Command) {
 
 func buildRequest(ctx context.Context, model inputModel, apiClient *iaas.APIClient) iaas.ApiCreateAffinityGroupRequest {
 	req := apiClient.DefaultAPI.CreateAffinityGroup(ctx, model.ProjectId, model.Region)
+
 	req = req.CreateAffinityGroupPayload(
 		iaas.CreateAffinityGroupPayload{
 			Name:   model.Name,
 			Policy: model.Policy,
 		},
 	)
+
 	return req
 }
 
@@ -111,6 +118,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	}
 
 	p.DebugInputModel(model)
+
 	return &model, nil
 }
 
@@ -122,6 +130,7 @@ func outputResult(p *print.Printer, model inputModel, resp iaas.AffinityGroup) e
 
 	return p.OutputResult(outputFormat, resp, func() error {
 		p.Outputf("Created affinity group %q with id %s\n", model.Name, utils.PtrString(resp.Id))
+
 		return nil
 	})
 }

internal/cmd/affinity-groups/create/create_test.go

@@ -41,6 +41,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 	for _, mod := range mods {
 		mod(flagValues)
 	}
+
 	return flagValues
 }
 
@@ -57,15 +58,19 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 	for _, mod := range mods {
 		mod(model)
 	}
+
 	return model
 }
 
 func fixtureRequest(mods ...func(request *iaas.ApiCreateAffinityGroupRequest)) iaas.ApiCreateAffinityGroupRequest {
 	request := testClient.DefaultAPI.CreateAffinityGroup(testCtx, testProjectId, testRegion)
+
 	request = request.CreateAffinityGroupPayload(fixturePayload())
+
 	for _, mod := range mods {
 		mod(&request)
 	}
+
 	return request
 }
 
@@ -77,6 +82,7 @@ func fixturePayload(mods ...func(payload *iaas.CreateAffinityGroupPayload)) iaas
 	for _, mod := range mods {
 		mod(&payload)
 	}
+
 	return payload
 }
 
@@ -148,6 +154,7 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}))
+
 			if diff != "" {
 				t.Fatalf("Request does not match: %s", diff)
 			}
@@ -181,18 +188,23 @@ func TestOutputResult(t *testing.T) {
 		},
 	}
 	params := testparams.NewTestParams()
+
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			err := outputResult(params.Printer, tt.model, tt.response)
 			if err != nil {
 				if !tt.isValid {
 					return
 				}
+
 				t.Fatalf("error output result: %v", err)
+
 				return
 			}
+
 			if !tt.isValid {
 				t.Fatalf("did not fail on invalid input")
+
 				return
 			}
 		})

internal/cmd/affinity-groups/delete/delete.go

@@ -43,6 +43,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
+
 			model, err := parseInput(params.Printer, cmd, args)
 			if err != nil {
 				return err
@@ -57,32 +58,38 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
+
 				projectLabel = model.ProjectId
 			}
 
 			affinityGroupLabel, err := iaasUtils.GetAffinityGroupName(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.AffinityGroupId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get affinity group name: %v", err)
+
 				affinityGroupLabel = model.AffinityGroupId
 			}
 
 			prompt := fmt.Sprintf("Are you sure you want to delete affinity group %q?", affinityGroupLabel)
+
 			err = params.Printer.PromptForConfirmation(prompt)
 			if err != nil {
 				return err
 			}
 
 			// Call API
 			request := buildRequest(ctx, *model, apiClient)
+
 			err = request.Execute()
 			if err != nil {
 				return fmt.Errorf("delete affinity group: %w", err)
 			}
+
 			params.Printer.Info("Deleted affinity group %q for %q\n", affinityGroupLabel, projectLabel)
 
 			return nil
 		},
 	}
+
 	return cmd
 }
 
@@ -102,5 +109,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
 	}
 
 	p.DebugInputModel(model)
+
 	return &model, nil
 }

internal/cmd/affinity-groups/delete/delete_test.go

@@ -35,6 +35,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
 	for _, mod := range mods {
 		mod(argValues)
 	}
+
 	return argValues
 }
 
@@ -46,6 +47,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 	for _, mod := range mods {
 		mod(flagValues)
 	}
+
 	return flagValues
 }
 
@@ -61,6 +63,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 	for _, mod := range mods {
 		mod(model)
 	}
+
 	return model
 }
 
@@ -69,6 +72,7 @@ func fixtureRequest(mods ...func(request *iaas.ApiDeleteAffinityGroupRequest)) i
 	for _, mod := range mods {
 		mod(&request)
 	}
+
 	return request
 }
 
@@ -104,6 +108,7 @@ func TestParseInput(t *testing.T) {
 		t.Run(tt.description, func(t *testing.T) {
 			params := testparams.NewTestParams()
 			cmd := NewCmd(params.CmdParams)
+
 			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
 				t.Fatalf("configure global flags: %v", err)
@@ -115,6 +120,7 @@ func TestParseInput(t *testing.T) {
 					if !tt.isValid {
 						return
 					}
+
 					t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
 				}
 			}
@@ -124,6 +130,7 @@ func TestParseInput(t *testing.T) {
 				if !tt.isValid {
 					return
 				}
+
 				t.Fatalf("error validating args: %v", err)
 			}
 
@@ -132,6 +139,7 @@ func TestParseInput(t *testing.T) {
 				if !tt.isValid {
 					return
 				}
+
 				t.Fatalf("error validating flags: %v", err)
 			}
 
@@ -140,12 +148,14 @@ func TestParseInput(t *testing.T) {
 				if !tt.isValid {
 					return
 				}
+
 				t.Fatalf("error parsing input: %v", err)
 			}
 
 			if !tt.isValid {
 				t.Fatalf("did not fail on invalid input")
 			}
+
 			diff := cmp.Diff(model, tt.expectedModel)
 			if diff != "" {
 				t.Fatalf("data does not match: %s", diff)

internal/cmd/affinity-groups/describe/describe.go

@@ -43,6 +43,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
+
 			model, err := parseInput(params.Printer, cmd, args)
 			if err != nil {
 				return err
@@ -56,6 +57,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 
 			// Call API
 			request := buildRequest(ctx, *model, apiClient)
+
 			result, err := request.Execute()
 			if err != nil {
 				return fmt.Errorf("get affinity group: %w", err)
@@ -64,9 +66,11 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err := outputResult(params.Printer, *model, *result); err != nil {
 				return err
 			}
+
 			return nil
 		},
 	}
+
 	return cmd
 }
 
@@ -86,11 +90,13 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
 	}
 
 	p.DebugInputModel(model)
+
 	return &model, nil
 }
 
 func outputResult(p *print.Printer, model inputModel, resp iaas.AffinityGroup) error {
 	var outputFormat string
+
 	if model.GlobalFlagModel != nil {
 		outputFormat = model.OutputFormat
 	}
@@ -102,10 +108,12 @@ func outputResult(p *print.Printer, model inputModel, resp iaas.AffinityGroup) e
 			table.AddRow("ID", utils.PtrString(resp.Id))
 			table.AddSeparator()
 		}
+
 		table.AddRow("NAME", resp.Name)
 		table.AddSeparator()
 		table.AddRow("POLICY", resp.Policy)
 		table.AddSeparator()
+
 		if resp.HasMembers() {
 			table.AddRow("Members", strings.Join(resp.Members, ", "))
 			table.AddSeparator()
@@ -114,6 +122,7 @@ func outputResult(p *print.Printer, model inputModel, resp iaas.AffinityGroup) e
 		if err := table.Display(p); err != nil {
 			return fmt.Errorf("render table: %w", err)
 		}
+
 		return nil
 	})
 }