Skip to content

Commit dc1bbeb

Browse files
mzihlmannmzihlmann
committed
linter: modernize
1 parent 762ec5f commit dc1bbeb

File tree

16 files changed

+52
-75
lines changed

16 files changed

+52
-75
lines changed

‎cmd/executor/cmd/root.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,8 @@ func resolveSecrets() error {
454454
// resolveEnvironmentBuildArgs replace build args without value by the same named environment variable
455455
func resolveEnvironmentBuildArgs(arguments []string, resolver func(string) string) {
456456
for index, argument := range arguments {
457-
i := strings.Index(argument, "=")
458-
if i < 0 {
457+
found := strings.Contains(argument, "=")
458+
if !found {
459459
value := resolver(argument)
460460
arguments[index] = fmt.Sprintf("%s=%s", argument, value)
461461
}

‎integration/benchmark_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestSnapshotBenchmark(t *testing.T) {
7979
wg.Wait()
8080

8181
t.Log("Number of Files,Total Build Time,Walking Filesystem, Resolving Files")
82-
timeMap.Range(func(key interface{}, value interface{}) bool {
82+
timeMap.Range(func(key any, value any) bool {
8383
d, _ := key.(int)
8484
v, _ := value.(result)
8585
t.Logf("%d,%f,%f,%f", d, v.totalBuildTime, v.walkingFiles, v.resolvingFiles)

‎integration/images.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"path"
2626
"path/filepath"
2727
"runtime"
28+
"slices"
2829
"strconv"
2930
"strings"
3031
"testing"
@@ -296,7 +297,7 @@ type DockerFileBuilder struct {
296297
TestWarmerDockerfiles map[string]struct{}
297298
}
298299

299-
type logger func(string, ...interface{})
300+
type logger func(string, ...any)
300301

301302
// NewDockerFileBuilder will create a DockerFileBuilder initialized with dockerfiles, which
302303
// it will assume are all as yet unbuilt.
@@ -437,11 +438,8 @@ func (d *DockerFileBuilder) BuildImageWithContext(t *testing.T, config *integrat
437438

438439
additionalKanikoFlags := additionalKanikoFlagsMap[dockerfile]
439440
additionalKanikoFlags = append(additionalKanikoFlags, contextFlag, contextPath)
440-
for _, d := range reproducibleTests {
441-
if d == dockerfile {
442-
additionalKanikoFlags = append(additionalKanikoFlags, "--reproducible")
443-
break
444-
}
441+
if slices.Contains(reproducibleTests, dockerfile) {
442+
additionalKanikoFlags = append(additionalKanikoFlags, "--reproducible")
445443
}
446444

447445
kanikoImage := GetKanikoImage(imageRepo, dockerfile)

‎pkg/commands/copy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ type AbstractCopyCommand interface {
340340
}
341341

342342
// CastAbstractCopyCommand tries to convert a command to an AbstractCopyCommand.
343-
func CastAbstractCopyCommand(cmd interface{}) (AbstractCopyCommand, bool) {
343+
func CastAbstractCopyCommand(cmd any) (AbstractCopyCommand, bool) {
344344
switch v := cmd.(type) {
345345
case *CopyCommand:
346346
return v, true

‎pkg/commands/copy_test.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"io/fs"
2525
"os"
2626
"path/filepath"
27+
"slices"
2728
"strings"
2829
"syscall"
2930
"testing"
@@ -254,11 +255,8 @@ func Test_CachingCopyCommand_ExecuteCommand(t *testing.T) {
254255
for _, file := range tc.extractedFiles {
255256
match := false
256257
cFiles := c.FilesToSnapshot()
257-
for _, cFile := range cFiles {
258-
if file == cFile {
259-
match = true
260-
break
261-
}
258+
if slices.Contains(cFiles, file) {
259+
match = true
262260
}
263261
if !match {
264262
t.Errorf("Expected extracted files to include %v but did not %v", file, cFiles)

‎pkg/commands/run_test.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"os"
2626
"os/user"
2727
"path/filepath"
28+
"slices"
2829
"testing"
2930

3031
v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -280,11 +281,8 @@ func Test_CachingRunCommand_ExecuteCommand(t *testing.T) {
280281
for _, file := range tc.extractedFiles {
281282
match := false
282283
cmdFiles := c.extractedFiles
283-
for _, f := range cmdFiles {
284-
if file == f {
285-
match = true
286-
break
287-
}
284+
if slices.Contains(cmdFiles, file) {
285+
match = true
288286
}
289287
if !match {
290288
t.Errorf("Expected extracted files to include %v but did not %v", file, cmdFiles)

‎pkg/config/args.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package config
1818

1919
import (
2020
"fmt"
21+
"slices"
2122
"strings"
2223

2324
"github.com/sirupsen/logrus"
@@ -46,12 +47,7 @@ func (b *multiArg) Type() string {
4647
}
4748

4849
func (b *multiArg) Contains(v string) bool {
49-
for _, s := range *b {
50-
if s == v {
51-
return true
52-
}
53-
}
54-
return false
50+
return slices.Contains(*b, v)
5551
}
5652

5753
// This type is used to supported passing in multiple key=value flags
@@ -110,8 +106,8 @@ func (c *multiKeyMultiValueArg) Set(value string) error {
110106
return nil
111107
}
112108
if strings.Contains(value, ";") {
113-
kvpairs := strings.Split(value, ";")
114-
for _, kv := range kvpairs {
109+
kvpairs := strings.SplitSeq(value, ";")
110+
for kv := range kvpairs {
115111
err := c.parseKV(kv)
116112
if err != nil {
117113
return err

‎pkg/config/options.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ func (s *SecretOptions) Set(val string) error {
245245
Src string
246246
Env string
247247
}
248-
parts := strings.Split(val, ",")
249-
for _, part := range parts {
248+
parts := strings.SplitSeq(val, ",")
249+
for part := range parts {
250250
kv := strings.SplitN(part, "=", 2)
251251

252252
if len(kv) != 2 {

‎pkg/dockerfile/buildargs.go‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package dockerfile
1818

1919
import (
2020
"fmt"
21+
"maps"
2122
"strings"
2223

2324
"github.com/containerd/platforms"
@@ -73,15 +74,9 @@ func newBuildArgsFromMap(argsFromOptions map[string]*string) *BuildArgs {
7374
// Clone returns a copy of the BuildArgs type
7475
func (b *BuildArgs) Clone() *BuildArgs {
7576
result := newBuildArgsFromMap(b.argsFromOptions)
76-
for k, v := range b.allowedBuildArgs {
77-
result.allowedBuildArgs[k] = v
78-
}
79-
for k, v := range b.allowedMetaArgs {
80-
result.allowedMetaArgs[k] = v
81-
}
82-
for k, v := range b.predefinedArgs {
83-
result.predefinedArgs[k] = v
84-
}
77+
maps.Copy(result.allowedBuildArgs, b.allowedBuildArgs)
78+
maps.Copy(result.allowedMetaArgs, b.allowedMetaArgs)
79+
maps.Copy(result.predefinedArgs, b.predefinedArgs)
8580
for k := range b.referencedArgs {
8681
result.referencedArgs[k] = struct{}{}
8782
}

‎pkg/dockerfile/buildargs_test.go‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,48 +23,44 @@ import (
2323
"github.com/osscontainertools/kaniko/testutil"
2424
)
2525

26-
func strPtr(source string) *string {
27-
return &source
28-
}
29-
3026
func TestGetAllAllowed(t *testing.T) {
3127
buildArgs := newBuildArgsFromMap(map[string]*string{
32-
"ArgNotUsedInDockerfile": strPtr("fromopt1"),
33-
"ArgOverriddenByOptions": strPtr("fromopt2"),
34-
"ArgNoDefaultInDockerfileFromOptions": strPtr("fromopt3"),
35-
"HTTP_PROXY": strPtr("theproxy"),
36-
"all_proxy": strPtr("theproxy2"),
28+
"ArgNotUsedInDockerfile": new("fromopt1"),
29+
"ArgOverriddenByOptions": new("fromopt2"),
30+
"ArgNoDefaultInDockerfileFromOptions": new("fromopt3"),
31+
"HTTP_PROXY": new("theproxy"),
32+
"all_proxy": new("theproxy2"),
3733
})
3834

3935
buildArgs.AddMetaArgs([]instructions.ArgCommand{
4036
{
4137
Args: []instructions.KeyValuePairOptional{
4238
{
4339
Key: "ArgFromMeta",
44-
Value: strPtr("frommeta1"),
40+
Value: new("frommeta1"),
4541
},
4642
{
4743
Key: "ArgOverriddenByOptions",
48-
Value: strPtr("frommeta2"),
44+
Value: new("frommeta2"),
4945
},
5046
},
5147
},
5248
{
5349
Args: []instructions.KeyValuePairOptional{
5450
{
5551
Key: "ArgFromMetaNotUsed",
56-
Value: strPtr("frommeta3"),
52+
Value: new("frommeta3"),
5753
},
5854
},
5955
},
6056
})
6157

62-
buildArgs.AddArg("ArgOverriddenByOptions", strPtr("fromdockerfile2"))
63-
buildArgs.AddArg("ArgWithDefaultInDockerfile", strPtr("fromdockerfile1"))
58+
buildArgs.AddArg("ArgOverriddenByOptions", new("fromdockerfile2"))
59+
buildArgs.AddArg("ArgWithDefaultInDockerfile", new("fromdockerfile1"))
6460
buildArgs.AddArg("ArgNoDefaultInDockerfile", nil)
6561
buildArgs.AddArg("ArgNoDefaultInDockerfileFromOptions", nil)
6662
buildArgs.AddArg("ArgFromMeta", nil)
67-
buildArgs.AddArg("ArgFromMetaOverridden", strPtr("fromdockerfile3"))
63+
buildArgs.AddArg("ArgFromMetaOverridden", new("fromdockerfile3"))
6864

6965
all := buildArgs.GetAllAllowed()
7066
expected := map[string]string{
@@ -81,22 +77,22 @@ func TestGetAllAllowed(t *testing.T) {
8177

8278
func TestGetAllMeta(t *testing.T) {
8379
buildArgs := newBuildArgsFromMap(map[string]*string{
84-
"ArgNotUsedInDockerfile": strPtr("fromopt1"),
85-
"ArgOverriddenByOptions": strPtr("fromopt2"),
86-
"ArgNoDefaultInMetaFromOptions": strPtr("fromopt3"),
87-
"HTTP_PROXY": strPtr("theproxy"),
80+
"ArgNotUsedInDockerfile": new("fromopt1"),
81+
"ArgOverriddenByOptions": new("fromopt2"),
82+
"ArgNoDefaultInMetaFromOptions": new("fromopt3"),
83+
"HTTP_PROXY": new("theproxy"),
8884
})
8985

9086
buildArgs.AddMetaArgs([]instructions.ArgCommand{
9187
{
9288
Args: []instructions.KeyValuePairOptional{
9389
{
9490
Key: "ArgFromMeta",
95-
Value: strPtr("frommeta1"),
91+
Value: new("frommeta1"),
9692
},
9793
{
9894
Key: "ArgOverriddenByOptions",
99-
Value: strPtr("frommeta2"),
95+
Value: new("frommeta2"),
10096
},
10197
},
10298
},

0 commit comments

Comments
 (0)