Skip to content

Commit 7a129b6

Browse files
deitchdeitch
authored
bump golangci-lint to v2.0.2 and update all lint issues (linuxkit#4116)
Signed-off-by: Avi Deitcher <[email protected]>
1 parent ec70c12 commit 7a129b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+429
-390
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ jobs:
5050
GOPATH: ${{runner.workspace}}
5151

5252
- name: golangci-lint CLI
53-
uses: golangci/golangci-lint-action@v6
53+
uses: golangci/golangci-lint-action@v7
5454
with:
55-
version: v1.63.4
55+
version: v2.0.2
5656
working-directory: src/cmd/linuxkit
5757
args: --verbose --timeout=10m
5858
- name: go vet CLI

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VERSION="v0.8+"
44
TEST_SUITE ?=
55
TEST_SHARD ?=
66

7-
GO_COMPILE=linuxkit/go-compile:c97703655e8510b7257ffc57f25e40337b0f0813
7+
GO_COMPILE=linuxkit/go-compile:985a9db72a7e6941de5e1eb71c2b41b76bf0556f
88

99
ifeq ($(OS),Windows_NT)
1010
LINUXKIT?=$(CURDIR)/bin/linuxkit.exe
@@ -34,7 +34,7 @@ export VERSION GO_COMPILE GOOS GOARCH LOCAL_TARGET LINUXKIT
3434
default: linuxkit $(RTF)
3535
all: default
3636

37-
RTF_COMMIT=b74a4f7c78e5cddcf7e6d2e6be7be312b9f645fc
37+
RTF_COMMIT=1118e08445438dc37ec62b4c1e216918b3d804d2
3838
RTF_CMD=github.com/linuxkit/rtf/cmd
3939
RTF_VERSION=0.0
4040
$(RTF): tmp_rtf_bin.tar | bin

‎src/cmd/linuxkit/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ report:
1919
@echo "GIT_TAG: $(GIT_TAG)"
2020
@echo "VERSION: $(VERSION)"
2121

22-
GO_COMPILE?=linuxkit/go-compile:c97703655e8510b7257ffc57f25e40337b0f0813
22+
GO_COMPILE?=linuxkit/go-compile:985a9db72a7e6941de5e1eb71c2b41b76bf0556f
2323
export GO_FLAGS=-mod=vendor
2424

2525
ifeq ($(OS),Windows_NT)

‎src/cmd/linuxkit/azure.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func uploadVMImage(resourceGroupName string, accountName string, imagePath strin
164164
if err != nil {
165165
log.Fatalf("Unable to create disk stream for VHD: %v", err)
166166
}
167-
defer diskStream.Close()
167+
defer func() { _ = diskStream.Close() }()
168168

169169
simpleStorageClient, err = simpleStorage.NewBasicClient(accountName, *keys[0].Value)
170170
if err != nil {

‎src/cmd/linuxkit/build.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ The generated image can be in one of multiple formats which can be run on variou
141141
if err != nil {
142142
log.Fatalf("cannot open output file: %v", err)
143143
}
144-
defer outfile.Close()
144+
defer func() { _ = outfile.Close() }()
145145
}
146146
}
147147

@@ -168,7 +168,7 @@ The generated image can be in one of multiple formats which can be run on variou
168168
if err != nil {
169169
return fmt.Errorf("cannot fetch remote yaml file: %v", err)
170170
}
171-
defer response.Body.Close()
171+
defer func() { _ = response.Body.Close() }()
172172
_, err = io.Copy(buffer, response.Body)
173173
if err != nil {
174174
return fmt.Errorf("error reading http body: %v", err)
@@ -216,7 +216,7 @@ The generated image can be in one of multiple formats which can be run on variou
216216
if tf, err = os.CreateTemp("", ""); err != nil {
217217
log.Fatalf("error creating tempfile: %v", err)
218218
}
219-
defer os.Remove(tf.Name())
219+
defer func() { _ = os.Remove(tf.Name()) }()
220220
w = tf
221221
}
222222
if inputTar != "" && inputTar == outputFile {

‎src/cmd/linuxkit/cache/imagesource.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (c ImageSource) V1TarReader(overrideName string) (io.ReadCloser, error) {
110110
// convert the writer to a reader
111111
r, w := io.Pipe()
112112
go func() {
113-
defer w.Close()
113+
defer func() { _ = w.Close() }()
114114
_ = tarball.Write(refName, image, w)
115115
}()
116116
return r, nil
@@ -135,9 +135,9 @@ func (c ImageSource) OCITarReader(overrideName string) (io.ReadCloser, error) {
135135
// convert the writer to a reader
136136
r, w := io.Pipe()
137137
go func() {
138-
defer w.Close()
138+
defer func() { _ = w.Close() }()
139139
tw := tar.NewWriter(w)
140-
defer tw.Close()
140+
defer func() { _ = tw.Close() }()
141141
if err := writeLayoutHeader(tw); err != nil {
142142
_ = w.CloseWithError(err)
143143
return
@@ -257,7 +257,7 @@ func (c ImageSource) SBoMs() ([]io.ReadCloser, error) {
257257
if _, err := io.Copy(&buf, layer); err != nil {
258258
return nil, err
259259
}
260-
layer.Close()
260+
_ = layer.Close()
261261
var stmt spdxStatement
262262
if err := json.Unmarshal(buf.Bytes(), &stmt); err != nil {
263263
return nil, err

‎src/cmd/linuxkit/cache/indexsource.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
v1 "github.com/google/go-containerregistry/pkg/v1"
1212
"github.com/google/go-containerregistry/pkg/v1/types"
1313
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/spec"
14-
lktspec "github.com/linuxkit/linuxkit/src/cmd/linuxkit/spec"
1514
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
1615
)
1716

@@ -26,7 +25,7 @@ type IndexSource struct {
2625

2726
// NewIndexSource return an IndexSource for a specific ref in the given
2827
// cache directory.
29-
func (p *Provider) NewIndexSource(ref *reference.Spec, descriptor *v1.Descriptor, platforms []imagespec.Platform) lktspec.IndexSource {
28+
func (p *Provider) NewIndexSource(ref *reference.Spec, descriptor *v1.Descriptor, platforms []imagespec.Platform) spec.IndexSource {
3029
return IndexSource{
3130
ref: ref,
3231
provider: p,
@@ -74,9 +73,9 @@ func (c IndexSource) OCITarReader(overrideName string) (io.ReadCloser, error) {
7473
// convert the writer to a reader
7574
r, w := io.Pipe()
7675
go func() {
77-
defer w.Close()
76+
defer func() { _ = w.Close() }()
7877
tw := tar.NewWriter(w)
79-
defer tw.Close()
78+
defer func() { _ = tw.Close() }()
8079
if err := writeLayoutHeader(tw); err != nil {
8180
_ = w.CloseWithError(err)
8281
return

‎src/cmd/linuxkit/cache/layout.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func writeLayoutImage(tw *tar.Writer, image v1.Image) error {
6969
if err != nil {
7070
return err
7171
}
72-
defer blob.Close()
72+
defer func() { _ = blob.Close() }()
7373
blobDigest, err := layer.Digest()
7474
if err != nil {
7575
return err

‎src/cmd/linuxkit/cache/write.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ func (p *Provider) ImageInCache(ref *reference.Spec, trustedRef, architecture st
431431
if rc, err = p.cache.Blob(dig); err != nil {
432432
return false, fmt.Errorf("layer %s not found: %v", dig, err)
433433
}
434-
rc.Close()
434+
_ = rc.Close()
435435
}
436436
// check that the config exists
437437
config, err := img.ConfigName()
@@ -442,7 +442,7 @@ func (p *Provider) ImageInCache(ref *reference.Spec, trustedRef, architecture st
442442
if rc, err = p.cache.Blob(config); err != nil {
443443
return false, fmt.Errorf("config %s not found: %v", config, err)
444444
}
445-
rc.Close()
445+
_ = rc.Close()
446446
return true, nil
447447
}
448448

‎src/cmd/linuxkit/cache_clean.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func cacheCleanCmd() *cobra.Command {
2323
// did we limit to published only?
2424
if !publishedOnly {
2525
if err := os.RemoveAll(cacheDir); err != nil {
26-
return fmt.Errorf("Unable to clean cache %s: %v", cacheDir, err)
26+
return fmt.Errorf("uUnable to clean cache %s: %v", cacheDir, err)
2727
}
2828
log.Infof("Cache emptied: %s", cacheDir)
2929
return nil

‎src/cmd/linuxkit/cache_export.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ func cacheExportCmd() *cobra.Command {
7777
if err != nil {
7878
log.Fatalf("error getting reader for image %s: %v", name, err)
7979
}
80-
defer reader.Close()
80+
defer func() { _ = reader.Close() }()
8181

8282
// try to write the output file
8383
var w io.Writer
84-
switch {
85-
case outputFile == "":
84+
switch outputFile {
85+
case "":
8686
log.Fatal("'outfile' flag is required")
87-
case outputFile == "-":
87+
case "-":
8888
w = os.Stdout
8989
default:
9090
f, err := os.OpenFile(outputFile, os.O_CREATE|os.O_RDWR, 0644)
9191
if err != nil {
9292
log.Fatalf("unable to open %s: %v", outputFile, err)
9393
}
94-
defer f.Close()
94+
defer func() { _ = f.Close() }()
9595
w = f
9696
}
9797

‎src/cmd/linuxkit/cache_import.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ func cacheImportCmd() *cobra.Command {
4343
if err != nil {
4444
log.Fatalf("unable to open %s: %v", infile, err)
4545
}
46-
defer f.Close()
46+
defer func() { _ = f.Close() }()
4747
reader = f
4848
}
49-
defer reader.Close()
49+
defer func() { _ = reader.Close() }()
5050

5151
if _, err := p.ImageLoad(reader); err != nil {
5252
log.Fatalf("unable to load image: %v", err)

‎src/cmd/linuxkit/docker/source.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ func (d ImageSource) Config() (imagespec.ImageConfig, error) {
6060
func (d ImageSource) TarReader() (io.ReadCloser, error) {
6161
container, err := Create(d.ref.String(), false)
6262
if err != nil {
63-
return nil, fmt.Errorf("Failed to create docker image %s: %v", d.ref, err)
63+
return nil, fmt.Errorf("failed to create docker image %s: %v", d.ref, err)
6464
}
6565
contents, err := Export(container)
6666
if err != nil {
67-
return nil, fmt.Errorf("Failed to docker export container from container %s: %v", container, err)
67+
return nil, fmt.Errorf("failed to docker export container from container %s: %v", container, err)
6868
}
6969

7070
return readCloser{
7171
r: contents,
7272
closer: func() error {
73-
contents.Close()
73+
_ = contents.Close()
7474

7575
return Rm(container)
7676
},

‎src/cmd/linuxkit/gcp.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (g GCPClient) UploadFile(src, dst, bucketName string, public bool) error {
113113
if err != nil {
114114
return err
115115
}
116-
defer f.Close()
116+
defer func() { _ = f.Close() }()
117117

118118
objectCall := g.storage.Objects.Insert(bucketName, &storage.Object{Name: dst}).Media(f)
119119

@@ -395,7 +395,7 @@ func (g GCPClient) ConnectToInstanceSerialPort(instance, zone string) error {
395395
if err != nil {
396396
return err
397397
}
398-
defer resp.Body.Close()
398+
defer func() { _ = resp.Body.Close() }()
399399
body, err := io.ReadAll(resp.Body)
400400
if err != nil {
401401
return err
@@ -431,33 +431,33 @@ func (g GCPClient) ConnectToInstanceSerialPort(instance, zone string) error {
431431
if conn == nil {
432432
return err
433433
}
434-
defer conn.Close()
434+
defer func() { _ = conn.Close() }()
435435

436436
session, err := conn.NewSession()
437437
if err != nil {
438438
return err
439439
}
440-
defer session.Close()
440+
defer func() { _ = session.Close() }()
441441

442442
stdin, err := session.StdinPipe()
443443
if err != nil {
444-
return fmt.Errorf("Unable to setup stdin for session: %v", err)
444+
return fmt.Errorf("unable to setup stdin for session: %v", err)
445445
}
446446
go func() {
447447
_, _ = io.Copy(stdin, os.Stdin)
448448
}()
449449

450450
stdout, err := session.StdoutPipe()
451451
if err != nil {
452-
return fmt.Errorf("Unable to setup stdout for session: %v", err)
452+
return fmt.Errorf("unable to setup stdout for session: %v", err)
453453
}
454454
go func() {
455455
_, _ = io.Copy(os.Stdout, stdout)
456456
}()
457457

458458
stderr, err := session.StderrPipe()
459459
if err != nil {
460-
return fmt.Errorf("Unable to setup stderr for session: %v", err)
460+
return fmt.Errorf("unable to setup stderr for session: %v", err)
461461
}
462462
go func() {
463463
_, _ = io.Copy(os.Stderr, stderr)

‎src/cmd/linuxkit/metadata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func WriteMetadataISO(path string, content []byte) error {
1313
if err != nil {
1414
return err
1515
}
16-
defer outfh.Close()
16+
defer func() { _ = outfh.Close() }()
1717

1818
return iso9660wrap.WriteBuffer(outfh, content, "config")
1919
}

‎src/cmd/linuxkit/moby/build/build.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func Build(m moby.Moby, w io.Writer, opts BuildOpts) error {
160160
if err != nil {
161161
return fmt.Errorf("failed to open input tar: %w", err)
162162
}
163-
defer in.Close()
163+
defer func() { _ = in.Close() }()
164164
if _, err := in.Seek(0, 0); err != nil {
165165
return fmt.Errorf("failed to seek to beginning of tmpfile: %w", err)
166166
}

‎src/cmd/linuxkit/moby/build/image.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func ImageTar(location string, ref *reference.Spec, prefix string, tw tarWriter,
210210
return fmt.Errorf("could not unpack image %s: %v", ref, err)
211211
}
212212

213-
defer contents.Close()
213+
defer func() { _ = contents.Close() }()
214214

215215
// all of the files in `touch` must exist in the output, so keep track if
216216
// we found them, and, if not, create them
@@ -392,7 +392,7 @@ func ImageOCITar(location string, ref *reference.Spec, prefix string, tw tarWrit
392392
return fmt.Errorf("could not unpack image %s: %v", ref, err)
393393
}
394394

395-
defer contents.Close()
395+
defer func() { _ = contents.Close() }()
396396

397397
tr := tar.NewReader(contents)
398398

‎src/cmd/linuxkit/moby/build/linuxkit.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func ensureLinuxkitImage(name, cache string) error {
5656
if err != nil {
5757
return err
5858
}
59-
defer os.Remove(tf.Name())
59+
defer func() { _ = os.Remove(tf.Name()) }()
6060
if err := Build(m, tf, BuildOpts{Pull: false, BuilderType: "", DecompressKernel: false, CacheDir: cache, DockerCache: true, Arch: arch}); err != nil {
6161
return err
6262
}
@@ -68,10 +68,10 @@ func ensureLinuxkitImage(name, cache string) error {
6868
if err != nil {
6969
return err
7070
}
71-
defer image.Close()
71+
defer func() { _ = image.Close() }()
7272
kernel, initrd, cmdline, _, err := tarToInitrd(image)
7373
if err != nil {
74-
return fmt.Errorf("Error converting to initrd: %v", err)
74+
return fmt.Errorf("error converting to initrd: %v", err)
7575
}
7676
return writeKernelInitrd(filename, kernel, initrd, cmdline)
7777
}
@@ -95,7 +95,7 @@ func outputLinuxKit(format string, filename string, kernel []byte, initrd []byte
9595
if err != nil {
9696
return err
9797
}
98-
defer os.RemoveAll(tmp)
98+
defer func() { _ = os.RemoveAll(tmp) }()
9999

100100
buf, err := tarInitrdKernel(kernel, initrd, cmdline)
101101
if err != nil {
@@ -120,11 +120,11 @@ func outputLinuxKit(format string, filename string, kernel []byte, initrd []byte
120120
_ = os.Remove(filename)
121121
_, err = os.Stat(filename)
122122
if err == nil || !os.IsNotExist(err) {
123-
return fmt.Errorf("Cannot remove existing file [%s]", filename)
123+
return fmt.Errorf("cannot remove existing file [%s]", filename)
124124
}
125125
linuxkit, err := exec.LookPath("linuxkit")
126126
if err != nil {
127-
return fmt.Errorf("Cannot find linuxkit executable, needed to build %s output type: %v", format, err)
127+
return fmt.Errorf("cannot find linuxkit executable, needed to build %s output type: %v", format, err)
128128
}
129129
commandLine := []string{
130130
"-q", "run", "qemu",

0 commit comments

Comments
 (0)