Skip to content

Commit a9d52a1

Browse files
remyleoneremyleone
authored
chore: fix lint (#5263)
1 parent 6fd3389 commit a9d52a1

26 files changed

+213
-84
lines changed

‎core/arg_specs.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (s *ArgSpecs) DeleteByName(name string) {
7272
func (s *ArgSpecs) AddBefore(name string, argSpec *ArgSpec) {
7373
for i, spec := range *s {
7474
if spec.Name == name {
75-
newSpecs := ArgSpecs(nil)
75+
newSpecs := make(ArgSpecs, 0, len(*s)+1)
7676
newSpecs = append(newSpecs, (*s)[:i]...)
7777
newSpecs = append(newSpecs, argSpec)
7878
newSpecs = append(newSpecs, (*s)[i:]...)
@@ -140,7 +140,7 @@ func (a *ArgSpec) DebugString() string {
140140
type DefaultFunc func(ctx context.Context) (value string, doc string)
141141

142142
func ZoneArgSpec(zones ...scw.Zone) *ArgSpec {
143-
enumValues := []string(nil)
143+
enumValues := make([]string, 0, len(zones))
144144
for _, zone := range zones {
145145
enumValues = append(enumValues, zone.String())
146146
}
@@ -174,7 +174,7 @@ func ZoneArgSpec(zones ...scw.Zone) *ArgSpec {
174174
}
175175

176176
func RegionArgSpec(regions ...scw.Region) *ArgSpec {
177-
enumValues := []string(nil)
177+
enumValues := make([]string, 0, len(regions))
178178
for _, region := range regions {
179179
enumValues = append(enumValues, region.String())
180180
}

‎core/cobra_utils.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,16 +251,22 @@ func handleUnmarshalErrors(cmd *Command, unmarshalErr *args.UnmarshalArgError) e
251251
switch e.Err.(type) { //nolint:gocritic
252252
case *args.CannotParseBoolError:
253253
return &CliError{
254-
Err: errors.New(""),
255-
Message: fmt.Sprintf("invalid value for '%s' argument: invalid boolean value", unmarshalErr.ArgName),
256-
Hint: "Possible values: true, false",
254+
Err: errors.New(""),
255+
Message: fmt.Sprintf(
256+
"invalid value for '%s' argument: invalid boolean value",
257+
unmarshalErr.ArgName,
258+
),
259+
Hint: "Possible values: true, false",
257260
}
258261
case *args.CannotParseDateError:
259262
dateErr := e.Err.(*args.CannotParseDateError)
260263

261264
return &CliError{
262-
Err: fmt.Errorf("date parsing error: %s", dateErr.ArgValue),
263-
Message: fmt.Sprintf("could not parse %s as either an absolute time (RFC3339) nor a relative time (+/-)RFC3339", dateErr.ArgValue),
265+
Err: fmt.Errorf("date parsing error: %s", dateErr.ArgValue),
266+
Message: fmt.Sprintf(
267+
"could not parse %s as either an absolute time (RFC3339) nor a relative time (+/-)RFC3339",
268+
dateErr.ArgValue,
269+
),
264270
Details: fmt.Sprintf(`Absolute time error: %s
265271
Relative time error: %s
266272
`, dateErr.AbsoluteTimeParseError, dateErr.RelativeTimeParseError),

‎core/command_interceptor.go‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ func sdkStdErrorInterceptor(
5050
switch sdkError := err.(type) {
5151
case *scw.ResourceNotFoundError:
5252
return nil, &CliError{
53-
Message: fmt.Sprintf("cannot find resource '%v' with ID '%v'", sdkError.Resource, sdkError.ResourceID),
54-
Err: err,
53+
Message: fmt.Sprintf(
54+
"cannot find resource '%v' with ID '%v'",
55+
sdkError.Resource,
56+
sdkError.ResourceID,
57+
),
58+
Err: err,
5559
}
5660
case *scw.ResponseError:
5761
return nil, &CliError{
@@ -86,7 +90,12 @@ func sdkStdErrorInterceptor(
8690
invalidArgs := make([]string, len(sdkError.Details))
8791
resources := make([]string, len(sdkError.Details))
8892
for i, d := range sdkError.Details {
89-
invalidArgs[i] = fmt.Sprintf("- %s has reached its quota (%d/%d)", d.Resource, d.Current, d.Quota)
93+
invalidArgs[i] = fmt.Sprintf(
94+
"- %s has reached its quota (%d/%d)",
95+
d.Resource,
96+
d.Current,
97+
d.Quota,
98+
)
9099
resources[i] = fmt.Sprintf("'%v'", d.Resource)
91100
}
92101

@@ -118,9 +127,14 @@ func sdkStdErrorInterceptor(
118127
}
119128

120129
return nil, &CliError{
121-
Message: fmt.Sprintf("resource %s with ID %s expired since %s", sdkError.Resource, sdkError.ResourceID, sdkError.ExpiredSince.String()),
122-
Err: err,
123-
Hint: hint,
130+
Message: fmt.Sprintf(
131+
"resource %s with ID %s expired since %s",
132+
sdkError.Resource,
133+
sdkError.ResourceID,
134+
sdkError.ExpiredSince.String(),
135+
),
136+
Err: err,
137+
Hint: hint,
124138
}
125139
}
126140

‎core/default.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func ApplyDefaultValues(ctx context.Context, argSpecs ArgSpecs, rawArgs args.Raw
3838
for _, part := range parts[1 : len(parts)-1] {
3939
switch part {
4040
case sliceSchema, mapSchema:
41-
newPrefixes := []string(nil)
41+
newPrefixes := make([]string, 0, len(prefixes))
4242
for _, prefix := range prefixes {
4343
for _, key := range rawArgs.GetSliceOrMapKeys(prefix) {
4444
newPrefixes = append(newPrefixes, prefix+"."+key)

‎core/example.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,11 @@ func (e *Example) GetCommandLine(binaryName string, cmd *Command) string {
5656
}
5757

5858
// Build command line example.
59-
commandParts := []string{
60-
binaryName,
61-
cmd.Namespace,
62-
cmd.Resource,
63-
cmd.Verb,
64-
}
65-
commandParts = append(commandParts, cmdArgsAsStrings...)
59+
commandParts := append(append(
60+
[]string{},
61+
binaryName, cmd.Namespace, cmd.Resource, cmd.Verb),
62+
cmdArgsAsStrings...,
63+
)
6664

6765
return strings.Join(commandParts, " ")
6866
default:

‎core/human/marshal.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func GetStructFieldsIndex(v reflect.Type) [][]int {
257257
}
258258
recFunc(v, []int(nil))
259259

260-
result := [][]int(nil)
260+
result := make([][]int, 0, len(found))
261261
for _, value := range found {
262262
result = append(result, value)
263263
}

‎core/reflect.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ func newObjectWithForcedJSONTags(t reflect.Type) any {
3434
structFieldsCopy = append(structFieldsCopy, fieldCopy)
3535
}
3636
} else {
37-
fieldCopy.Tag = reflect.StructTag(`json:"` + strings.ReplaceAll(strcase.ToBashArg(fieldCopy.Name), "-", "_") + `"`)
37+
fieldCopy.Tag = reflect.StructTag(
38+
`json:"` + strings.ReplaceAll(strcase.ToBashArg(fieldCopy.Name), "-", "_") + `"`,
39+
)
3840
structFieldsCopy = append(structFieldsCopy, fieldCopy)
3941
}
4042
}

‎core/reflect_test.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ func Test_getValuesForFieldByName(t *testing.T) {
9595
if err != nil {
9696
assert.Equal(t, tc.expectedError, err.Error())
9797
} else if tc.expectedValues != nil && !reflect.DeepEqual(tc.expectedValues[0].Interface(), values[0].Interface()) {
98-
t.Errorf("Expected %v, got %v", tc.expectedValues[0].Interface(), values[0].Interface())
98+
t.Errorf(
99+
"Expected %v, got %v",
100+
tc.expectedValues[0].Interface(),
101+
values[0].Interface(),
102+
)
99103
}
100104
},
101105
},
@@ -127,7 +131,11 @@ func Test_getValuesForFieldByName(t *testing.T) {
127131
if err != nil {
128132
assert.Equal(t, tc.expectedError, err.Error())
129133
} else if tc.expectedValues != nil && !reflect.DeepEqual(tc.expectedValues[0].Interface(), values[0].Interface()) {
130-
t.Errorf("Expected %v, got %v", tc.expectedValues[0].Interface(), values[0].Interface())
134+
t.Errorf(
135+
"Expected %v, got %v",
136+
tc.expectedValues[0].Interface(),
137+
values[0].Interface(),
138+
)
131139
}
132140
},
133141
},
@@ -172,7 +180,11 @@ func Test_getValuesForFieldByName(t *testing.T) {
172180
if err != nil {
173181
assert.Nil(t, err.Error())
174182
} else if tc.expectedValues != nil && !reflect.DeepEqual(tc.expectedValues[0].Interface(), values[0].Interface()) {
175-
t.Errorf("Expected %v, got %v", tc.expectedValues[0].Interface(), values[0].Interface())
183+
t.Errorf(
184+
"Expected %v, got %v",
185+
tc.expectedValues[0].Interface(),
186+
values[0].Interface(),
187+
)
176188
}
177189
},
178190
},

‎core/validate_test.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,14 @@ func TestValidateRequiredOneOfGroups(t *testing.T) {
569569
if tt.expectedError == "" {
570570
assert.NoError(t, err, "Expected no error, got %v", err)
571571
} else {
572-
assert.EqualError(t, err, tt.expectedError, "Expected error message '%s', got '%v'", tt.expectedError, err)
572+
assert.EqualError(
573+
t,
574+
err,
575+
tt.expectedError,
576+
"Expected error message '%s', got '%v'",
577+
tt.expectedError,
578+
err,
579+
)
573580
}
574581
})
575582
}
@@ -714,7 +721,14 @@ func TestValidateUniqueOneOfGroups(t *testing.T) {
714721
if tt.expectedError == "" {
715722
assert.NoError(t, err, "Expected no error, got %v", err)
716723
} else {
717-
assert.EqualError(t, err, tt.expectedError, "Expected error message '%s', got '%v'", tt.expectedError, err)
724+
assert.EqualError(
725+
t,
726+
err,
727+
tt.expectedError,
728+
"Expected error message '%s', got '%v'",
729+
tt.expectedError,
730+
err,
731+
)
718732
}
719733
})
720734
}

‎internal/args/args.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func SplitRawMap(rawArgs []string) map[string]struct{} {
5656
// SplitRaw creates a slice that maps arg names to their values.
5757
// ["arg1=1", "arg2=2", "arg3"] => { {"arg1", "1"}, {"arg2", "2"}, {"arg3",""} }
5858
func SplitRaw(rawArgs []string) [][2]string {
59-
keyValue := [][2]string{}
59+
keyValue := make([][2]string, 0, len(rawArgs))
6060
for _, arg := range rawArgs {
6161
tmp := strings.SplitN(arg, "=", 2)
6262
if len(tmp) < 2 {

0 commit comments

Comments
 (0)