Skip to content

Commit e9d8475

Browse files
author
utam0k
committed
Fix some points that golangci-lint point out.
1 parent 8545eb1 commit e9d8475

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

pkg/dazzle/combiner.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,8 @@ func mergeEnv(base *ociv1.Image, others []*ociv1.Image, vars []EnvVarCombination
312312
envs[k] += ":" + v
313313
case EnvVarCombineMergeUnique:
314314
var vs []string
315-
for _, s := range strings.Split(envValue, ":") {
316-
vs = append(vs, s)
317-
}
318-
for _, s := range strings.Split(v, ":") {
319-
vs = append(vs, s)
320-
}
315+
vs = append(vs, strings.Split(envValue, ":")...)
316+
vs = append(vs, strings.Split(v, ":")...)
321317

322318
vss := []string{}
323319
flags := make(map[string]bool)

pkg/dazzle/combiner_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727
)
2828

2929
func TestMergeEnv(t *testing.T) {
30-
type args struct {
31-
}
3230
tests := []struct {
3331
name string
3432
base *ociv1.Image

0 commit comments

Comments
 (0)