Fix a few lint issues (#1684)

jonjohnsonjr · web-flow · commit 370e8a5f1ff9 · 2023-05-01T11:59:19.000-07:00
diff --git a/cmd/crane/cmd/catalog.go b/cmd/crane/cmd/catalog.go
@@ -26,7 +26,7 @@ import (
 )
 
 // NewCmdCatalog creates a new cobra.Command for the catalog subcommand.
-func NewCmdCatalog(options *[]crane.Option, argv ...string) *cobra.Command {
+func NewCmdCatalog(options *[]crane.Option, _ ...string) *cobra.Command {
 	var fullRef bool
 	cmd := &cobra.Command{
 		Use:   "catalog REGISTRY",
diff --git a/pkg/authn/keychain_test.go b/pkg/authn/keychain_test.go
@@ -399,7 +399,7 @@ type fakeKeychain struct {
 	count int
 }
 
-func (k *fakeKeychain) Resolve(target Resource) (Authenticator, error) {
+func (k *fakeKeychain) Resolve(_ Resource) (Authenticator, error) {
 	k.count++
 	return k.auth, k.err
 }
diff --git a/pkg/crane/push.go b/pkg/crane/push.go
@@ -25,7 +25,7 @@ import (
 
 // Load reads the tarball at path as a v1.Image.
 func Load(path string, opt ...Option) (v1.Image, error) {
-	return LoadTag(path, "")
+	return LoadTag(path, "", opt...)
 }
 
 // LoadTag reads a tag from the tarball at path as a v1.Image.
diff --git a/pkg/legacy/tarball/write.go b/pkg/legacy/tarball/write.go
@@ -313,10 +313,7 @@ func MultiWrite(refToImage map[name.Reference]v1.Image, w io.Writer) error {
 	if err != nil {
 		return err
 	}
-	if err := writeTarEntry(tf, "repositories", bytes.NewReader(reposBytes), int64(len(reposBytes))); err != nil {
-		return err
-	}
-	return nil
+	return writeTarEntry(tf, "repositories", bytes.NewReader(reposBytes), int64(len(reposBytes)))
 }
 
 func dedupRefToImage(refToImage map[name.Reference]v1.Image) ([]v1.Image, map[v1.Image][]string) {
diff --git a/pkg/v1/daemon/image_test.go b/pkg/v1/daemon/image_test.go
@@ -49,7 +49,7 @@ type MockClient struct {
 	saveBody io.ReadCloser
 }
 
-func (m *MockClient) NegotiateAPIVersion(ctx context.Context) {
+func (m *MockClient) NegotiateAPIVersion(_ context.Context) {
 	m.negotiated = true
 }
 
diff --git a/pkg/v1/daemon/write_test.go b/pkg/v1/daemon/write_test.go
@@ -33,7 +33,7 @@ type errReader struct {
 	err error
 }
 
-func (r *errReader) Read(p []byte) (int, error) {
+func (r *errReader) Read(_ []byte) (int, error) {
 	return 0, r.err
 }
 
@@ -51,7 +51,7 @@ func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ bool) (types.
 	}, m.loadErr
 }
 
-func (m *MockClient) ImageTag(ctx context.Context, source, target string) error {
+func (m *MockClient) ImageTag(ctx context.Context, _, _ string) error {
 	if !m.negotiated {
 		return errors.New("you forgot to call NegotiateAPIVersion before calling ImageTag")
 	}
diff --git a/pkg/v1/google/list_test.go b/pkg/v1/google/list_test.go
@@ -169,7 +169,7 @@ type recorder struct {
 	Errs []error
 }
 
-func (r *recorder) walk(repo name.Repository, tags *Tags, err error) error {
+func (r *recorder) walk(_ name.Repository, tags *Tags, err error) error {
 	r.Tags = append(r.Tags, tags)
 	r.Errs = append(r.Errs, err)
 
diff --git a/pkg/v1/remote/transport/error_test.go b/pkg/v1/remote/transport/error_test.go
@@ -227,7 +227,7 @@ type errReadCloser struct {
 	err error
 }
 
-func (e *errReadCloser) Read(p []byte) (int, error) {
+func (e *errReadCloser) Read(_ []byte) (int, error) {
 	return 0, e.err
 }
 
diff --git a/pkg/v1/remote/transport/retry_test.go b/pkg/v1/remote/transport/retry_test.go
@@ -33,7 +33,7 @@ type mockTransport struct {
 	count int
 }
 
-func (t *mockTransport) RoundTrip(in *http.Request) (out *http.Response, err error) {
+func (t *mockTransport) RoundTrip(_ *http.Request) (out *http.Response, err error) {
 	defer func() { t.count++ }()
 	if t.count < len(t.resps) {
 		out = t.resps[t.count]
diff --git a/pkg/v1/remote/write.go b/pkg/v1/remote/write.go
@@ -531,10 +531,7 @@ func (w *writer) commitSubjectReferrers(ctx context.Context, sub name.Digest, ad
 		return im.Manifests[i].Digest.String() < im.Manifests[j].Digest.String()
 	})
 	logs.Progress.Printf("updating fallback tag %s with new referrer", t.Identifier())
-	if err := w.commitManifest(ctx, fallbackTaggable{im}, t); err != nil {
-		return err
-	}
-	return nil
+	return w.commitManifest(ctx, fallbackTaggable{im}, t)
 }
 
 type fallbackTaggable struct {
diff --git a/pkg/v1/stream/layer_test.go b/pkg/v1/stream/layer_test.go
@@ -157,10 +157,7 @@ func TestStreamableLayerFromTarball(t *testing.T) {
 					return err
 				}
 			}
-			if err := tw.Close(); err != nil {
-				return err
-			}
-			return nil
+			return tw.Close()
 		}())
 	}()
 
diff --git a/pkg/v1/tarball/image.go b/pkg/v1/tarball/image.go
@@ -223,9 +223,9 @@ func extractFileFromTar(opener Opener, filePath string) (io.ReadCloser, error) {
 	if err != nil {
 		return nil, err
 	}
-	close := true
+	needClose := true
 	defer func() {
-		if close {
+		if needClose {
 			f.Close()
 		}
 	}()
@@ -244,7 +244,7 @@ func extractFileFromTar(opener Opener, filePath string) (io.ReadCloser, error) {
 				currentDir := filepath.Dir(filePath)
 				return extractFileFromTar(opener, path.Join(currentDir, path.Clean(hdr.Linkname)))
 			}
-			close = false
+			needClose = false
 			return tarFile{
 				Reader: tf,
 				Closer: f,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// NewCmdCatalog creates a new cobra.Command for the catalog subcommand.`
`29`		`-func NewCmdCatalog(options []crane.Option, argv ...string) cobra.Command {`
	`29`	`+func NewCmdCatalog(options []crane.Option, _ ...string) cobra.Command {`
`30`	`30`	`var fullRef bool`
`31`	`31`	`cmd := &cobra.Command{`
`32`	`32`	`Use: "catalog REGISTRY",`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ type fakeKeychain struct {`
`399`	`399`	`count int`
`400`	`400`	`}`
`401`	`401`
`402`		`-func (k *fakeKeychain) Resolve(target Resource) (Authenticator, error) {`
	`402`	`+func (k *fakeKeychain) Resolve(_ Resource) (Authenticator, error) {`
`403`	`403`	`k.count++`
`404`	`404`	`return k.auth, k.err`
`405`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`// Load reads the tarball at path as a v1.Image.`
`27`	`27`	`func Load(path string, opt ...Option) (v1.Image, error) {`
`28`		`- return LoadTag(path, "")`
	`28`	`+ return LoadTag(path, "", opt...)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// LoadTag reads a tag from the tarball at path as a v1.Image.`
Original file line number	Diff line number	Diff line change
`@@ -313,10 +313,7 @@ func MultiWrite(refToImage map[name.Reference]v1.Image, w io.Writer) error {`
`313`	`313`	`if err != nil {`
`314`	`314`	`return err`
`315`	`315`	`}`
`316`		`- if err := writeTarEntry(tf, "repositories", bytes.NewReader(reposBytes), int64(len(reposBytes))); err != nil {`
`317`		`- return err`
`318`		`- }`
`319`		`- return nil`
	`316`	`+ return writeTarEntry(tf, "repositories", bytes.NewReader(reposBytes), int64(len(reposBytes)))`
`320`	`317`	`}`
`321`	`318`
`322`	`319`	`func dedupRefToImage(refToImage map[name.Reference]v1.Image) ([]v1.Image, map[v1.Image][]string) {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ type MockClient struct {`
`49`	`49`	`saveBody io.ReadCloser`
`50`	`50`	`}`
`51`	`51`
`52`		`-func (m *MockClient) NegotiateAPIVersion(ctx context.Context) {`
	`52`	`+func (m *MockClient) NegotiateAPIVersion(_ context.Context) {`
`53`	`53`	`m.negotiated = true`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type errReader struct {`
`33`	`33`	`err error`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (r *errReader) Read(p []byte) (int, error) {`
	`36`	`+func (r *errReader) Read(_ []byte) (int, error) {`
`37`	`37`	`return 0, r.err`
`38`	`38`	`}`
`39`	`39`
`@@ -51,7 +51,7 @@ func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ bool) (types.`
`51`	`51`	`}, m.loadErr`
`52`	`52`	`}`
`53`	`53`
`54`		`-func (m *MockClient) ImageTag(ctx context.Context, source, target string) error {`
	`54`	`+func (m *MockClient) ImageTag(ctx context.Context, _, _ string) error {`
`55`	`55`	`if !m.negotiated {`
`56`	`56`	`return errors.New("you forgot to call NegotiateAPIVersion before calling ImageTag")`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ type recorder struct {`
`169`	`169`	`Errs []error`
`170`	`170`	`}`
`171`	`171`
`172`		`-func (r recorder) walk(repo name.Repository, tags Tags, err error) error {`
	`172`	`+func (r recorder) walk(_ name.Repository, tags Tags, err error) error {`
`173`	`173`	`r.Tags = append(r.Tags, tags)`
`174`	`174`	`r.Errs = append(r.Errs, err)`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ type errReadCloser struct {`
`227`	`227`	`err error`
`228`	`228`	`}`
`229`	`229`
`230`		`-func (e *errReadCloser) Read(p []byte) (int, error) {`
	`230`	`+func (e *errReadCloser) Read(_ []byte) (int, error) {`
`231`	`231`	`return 0, e.err`
`232`	`232`	`}`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type mockTransport struct {`
`33`	`33`	`count int`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (t mockTransport) RoundTrip(in http.Request) (out *http.Response, err error) {`
	`36`	`+func (t mockTransport) RoundTrip(_ http.Request) (out *http.Response, err error) {`
`37`	`37`	`defer func() { t.count++ }()`
`38`	`38`	`if t.count < len(t.resps) {`
`39`	`39`	`out = t.resps[t.count]`