Migrate linter to v2 (#2096)

Subserial · web-flow · commit ccaa0d6a53fd · 2025-05-16T13:52:47.000-07:00
* use default migrated config + fix issues

* bump linter for real this time I promise
diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -26,9 +26,9 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - uses: golangci/golangci-lint-action@v3.4.0
+      - uses: golangci/golangci-lint-action@v8.0.0
         with:
-          version: v1.61.0
+          version: v2.1.6
 
       - uses: reviewdog/action-misspell@v1
         if: ${{ always() }}
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,41 +1,54 @@
-run:
-  timeout: 5m
-
-issues:
-  exclude-dirs:
-    - internal
-    - pkg/registry
-  exclude-rules:
-    - path: test # Excludes /test, *_test.go etc.
-      linters:
-        - gosec
-
+version: "2"
 linters:
   enable:
-  - asciicheck
-  - depguard
-  - errorlint
-  - gofmt
-  - gosec
-  - goimports
-  - importas
-  - prealloc
-  - revive
-  - misspell
-  - stylecheck
-  - tparallel
-  - unconvert
-  - unparam
-  - unused
-  - whitespace
-
+    - asciicheck
+    - depguard
+    - errorlint
+    - gosec
+    - importas
+    - misspell
+    - prealloc
+    - revive
+    - staticcheck
+    - tparallel
+    - unconvert
+    - unparam
+    - whitespace
   disable:
-  - errcheck
-
-linters-settings:
-  depguard:
+    - errcheck
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: crypto/sha256
+              desc: use crypto.SHA256 instead
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      main:
-        deny:
-          - pkg: "crypto/sha256"
-            desc: use crypto.SHA256 instead
+      - linters:
+          - gosec
+        path: test # Excludes /test, *_test.go etc.
+    paths:
+      - internal
+      - pkg/registry
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - internal
+      - pkg/registry
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/pkg/crane/copy.go b/pkg/crane/copy.go
@@ -114,7 +114,7 @@ func CopyRepository(src, dst string, opt ...Option) error {
 			if errors.As(err, &terr) {
 				// Some registries create repository on first push, so listing tags will fail.
 				// If we see 404 or 403, assume we failed because the repository hasn't been created yet.
-				if !(terr.StatusCode == http.StatusNotFound || terr.StatusCode == http.StatusForbidden) {
+				if terr.StatusCode != http.StatusNotFound && terr.StatusCode != http.StatusForbidden {
 					return err
 				}
 			} else {
diff --git a/pkg/crane/pull.go b/pkg/crane/pull.go
@@ -70,7 +70,7 @@ func MultiSave(imgMap map[string]v1.Image, path string, opt ...Option) error {
 			if !ok {
 				return fmt.Errorf("ref wasn't a tag or digest")
 			}
-			tag = d.Repository.Tag(iWasADigestTag)
+			tag = d.Tag(iWasADigestTag)
 		}
 		tagToImage[tag] = img
 	}
diff --git a/pkg/v1/google/list.go b/pkg/v1/google/list.go
@@ -89,8 +89,8 @@ func newLister(repo name.Repository, options ...Option) (*lister, error) {
 
 func (l *lister) list(repo name.Repository) (*Tags, error) {
 	uri := &url.URL{
-		Scheme:   repo.Registry.Scheme(),
-		Host:     repo.Registry.RegistryStr(),
+		Scheme:   repo.Scheme(),
+		Host:     repo.RegistryStr(),
 		Path:     fmt.Sprintf("/v2/%s/tags/list", repo.RepositoryStr()),
 		RawQuery: "n=10000",
 	}
diff --git a/pkg/v1/layout/write.go b/pkg/v1/layout/write.go
@@ -126,13 +126,13 @@ func (l Path) ReplaceIndex(ii v1.ImageIndex, matcher match.Matcher, options ...O
 
 // replaceDescriptor adds a descriptor to the index.json of the Path, replacing
 // any one matching matcher, if found.
-func (l Path) replaceDescriptor(append mutate.Appendable, matcher match.Matcher, options ...Option) error {
+func (l Path) replaceDescriptor(appendable mutate.Appendable, matcher match.Matcher, options ...Option) error {
 	ii, err := l.ImageIndex()
 	if err != nil {
 		return err
 	}
 
-	desc, err := partial.Descriptor(append)
+	desc, err := partial.Descriptor(appendable)
 	if err != nil {
 		return err
 	}
@@ -143,7 +143,7 @@ func (l Path) replaceDescriptor(append mutate.Appendable, matcher match.Matcher,
 	}
 
 	add := mutate.IndexAddendum{
-		Add:        append,
+		Add:        appendable,
 		Descriptor: *desc,
 	}
 	ii = mutate.AppendManifests(mutate.RemoveManifests(ii, matcher), add)
diff --git a/pkg/v1/mutate/index.go b/pkg/v1/mutate/index.go
@@ -35,26 +35,26 @@ func computeDescriptor(ia IndexAddendum) (*v1.Descriptor, error) {
 	}
 
 	// The IndexAddendum allows overriding Descriptor values.
-	if ia.Descriptor.Size != 0 {
-		desc.Size = ia.Descriptor.Size
+	if ia.Size != 0 {
+		desc.Size = ia.Size
 	}
-	if string(ia.Descriptor.MediaType) != "" {
-		desc.MediaType = ia.Descriptor.MediaType
+	if string(ia.MediaType) != "" {
+		desc.MediaType = ia.MediaType
 	}
-	if ia.Descriptor.Digest != (v1.Hash{}) {
-		desc.Digest = ia.Descriptor.Digest
+	if ia.Digest != (v1.Hash{}) {
+		desc.Digest = ia.Digest
 	}
-	if ia.Descriptor.Platform != nil {
-		desc.Platform = ia.Descriptor.Platform
+	if ia.Platform != nil {
+		desc.Platform = ia.Platform
 	}
-	if len(ia.Descriptor.URLs) != 0 {
-		desc.URLs = ia.Descriptor.URLs
+	if len(ia.URLs) != 0 {
+		desc.URLs = ia.URLs
 	}
-	if len(ia.Descriptor.Annotations) != 0 {
-		desc.Annotations = ia.Descriptor.Annotations
+	if len(ia.Annotations) != 0 {
+		desc.Annotations = ia.Annotations
 	}
-	if ia.Descriptor.Data != nil {
-		desc.Data = ia.Descriptor.Data
+	if ia.Data != nil {
+		desc.Data = ia.Data
 	}
 
 	return desc, nil
diff --git a/pkg/v1/mutate/mutate.go b/pkg/v1/mutate/mutate.go
@@ -328,7 +328,7 @@ func extract(img v1.Image, w io.Writer) error {
 
 			// mark file as handled. non-directory implicitly tombstones
 			// any entries with a matching (or child) name
-			fileMap[name] = tombstone || !(header.Typeflag == tar.TypeDir)
+			fileMap[name] = tombstone || (header.Typeflag != tar.TypeDir)
 			if !tombstone {
 				if err := tarWriter.WriteHeader(header); err != nil {
 					return err
@@ -345,10 +345,7 @@ func extract(img v1.Image, w io.Writer) error {
 }
 
 func inWhiteoutDir(fileMap map[string]bool, file string) bool {
-	for {
-		if file == "" {
-			break
-		}
+	for file != "" {
 		dirname := filepath.Dir(file)
 		if file == dirname {
 			break
@@ -361,13 +358,6 @@ func inWhiteoutDir(fileMap map[string]bool, file string) bool {
 	return false
 }
 
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
 // Time sets all timestamps in an image to the given timestamp.
 func Time(img v1.Image, t time.Time) (v1.Image, error) {
 	newImage := empty.Image
diff --git a/pkg/v1/remote/multi_write_test.go b/pkg/v1/remote/multi_write_test.go
@@ -269,7 +269,7 @@ func TestMultiWrite_Retry(t *testing.T) {
 
 		// using a transport.Wrapper, meaning retry logic should not be wrapped
 		doesNotRetryTransport := &countTransport{inner: http.DefaultTransport}
-		transportWrapper, err := transport.NewWithContext(context.Background(), tag1.Repository.Registry, authn.Anonymous, doesNotRetryTransport, nil)
+		transportWrapper, err := transport.NewWithContext(context.Background(), tag1.Registry, authn.Anonymous, doesNotRetryTransport, nil)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -311,7 +311,7 @@ func TestMultiWrite_Retry(t *testing.T) {
 
 		tag1 := mustNewTag(t, u.Host+"/repo:tag1")
 		// using a transport.Wrapper, meaning retry logic should not be wrapped
-		transportWrapper, err := transport.NewWithContext(context.Background(), tag1.Repository.Registry, authn.Anonymous, http.DefaultTransport, nil)
+		transportWrapper, err := transport.NewWithContext(context.Background(), tag1.Registry, authn.Anonymous, http.DefaultTransport, nil)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/pkg/v1/remote/pusher.go b/pkg/v1/remote/pusher.go
@@ -162,7 +162,7 @@ func (p *Pusher) Delete(ctx context.Context, ref name.Reference) error {
 	}
 
 	u := url.URL{
-		Scheme: ref.Context().Registry.Scheme(),
+		Scheme: ref.Context().Scheme(),
 		Host:   ref.Context().RegistryStr(),
 		Path:   fmt.Sprintf("/v2/%s/manifests/%s", ref.Context().RepositoryStr(), ref.Identifier()),
 	}
diff --git a/pkg/v1/remote/transport/bearer_test.go b/pkg/v1/remote/transport/bearer_test.go
@@ -60,7 +60,7 @@ func TestBearerRefresh(t *testing.T) {
 					if got, want := r.FormValue("service"), expectedService; got != want {
 						t.Errorf("FormValue(service); got %v, want %v", got, want)
 					}
-					w.Write([]byte(fmt.Sprintf(`{%q: %q}`, tc.tokenKey, expectedToken)))
+					fmt.Fprintf(w, `{%q: %q}`, tc.tokenKey, expectedToken)
 				}))
 			defer server.Close()
 
@@ -156,7 +156,7 @@ func TestBearerTransportTokenRefresh(t *testing.T) {
 				return
 			}
 			if strings.HasPrefix(hdr, "Basic ") {
-				w.Write([]byte(fmt.Sprintf(`{"token": %q}`, refreshedToken)))
+				fmt.Fprintf(w, `{"token": %q}`, refreshedToken)
 			}
 
 			w.Header().Set("WWW-Authenticate", "scope=foo")
@@ -229,7 +229,7 @@ func TestBearerTransportOauthRefresh(t *testing.T) {
 					t.Errorf("want %s got %s", initialToken, it)
 				}
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(fmt.Sprintf(`{"access_token": %q, "refresh_token": %q}`, accessToken, refreshToken)))
+				fmt.Fprintf(w, `{"access_token": %q, "refresh_token": %q}`, accessToken, refreshToken)
 				return
 			}
 
@@ -297,7 +297,7 @@ func TestBearerTransportOauth404Fallback(t *testing.T) {
 			hdr := r.Header.Get("Authorization")
 			if hdr == "Basic "+basicAuth {
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(fmt.Sprintf(`{"access_token": %q}`, accessToken)))
+				fmt.Fprintf(w, `{"access_token": %q}`, accessToken)
 			}
 			if hdr == "Bearer "+accessToken {
 				w.WriteHeader(http.StatusOK)
diff --git a/pkg/v1/remote/write.go b/pkg/v1/remote/write.go
@@ -101,7 +101,7 @@ func makeWriter(ctx context.Context, repo name.Repository, ls []v1.Layer, o *opt
 // url returns a url.Url for the specified path in the context of this remote image reference.
 func (w *writer) url(path string) url.URL {
 	return url.URL{
-		Scheme: w.repo.Registry.Scheme(),
+		Scheme: w.repo.Scheme(),
 		Host:   w.repo.RegistryStr(),
 		Path:   path,
 	}
@@ -394,7 +394,7 @@ func (w *writer) uploadOne(ctx context.Context, l v1.Layer) error {
 			return err
 		}
 		smt := string(mt)
-		if !(strings.HasSuffix(smt, "+json") || strings.HasSuffix(smt, "+yaml")) {
+		if !strings.HasSuffix(smt, "+json") && !strings.HasSuffix(smt, "+yaml") {
 			ctx = redact.NewContext(ctx, "omitting binary blobs from logs")
 		}
 
diff --git a/pkg/v1/remote/write_test.go b/pkg/v1/remote/write_test.go
@@ -103,7 +103,7 @@ func TestNextLocation(t *testing.T) {
 			},
 			Request: &http.Request{
 				URL: &url.URL{
-					Scheme: ref.Registry.Scheme(),
+					Scheme: ref.Scheme(),
 					Host:   ref.RegistryStr(),
 				},
 			},

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func CopyRepository(src, dst string, opt ...Option) error {`
`114`	`114`	`if errors.As(err, &terr) {`
`115`	`115`	`// Some registries create repository on first push, so listing tags will fail.`
`116`	`116`	`// If we see 404 or 403, assume we failed because the repository hasn't been created yet.`
`117`		`- if !(terr.StatusCode == http.StatusNotFound \|\| terr.StatusCode == http.StatusForbidden) {`
	`117`	`+ if terr.StatusCode != http.StatusNotFound && terr.StatusCode != http.StatusForbidden {`
`118`	`118`	`return err`
`119`	`119`	`}`
`120`	`120`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func MultiSave(imgMap map[string]v1.Image, path string, opt ...Option) error {`
`70`	`70`	`if !ok {`
`71`	`71`	`return fmt.Errorf("ref wasn't a tag or digest")`
`72`	`72`	`}`
`73`		`- tag = d.Repository.Tag(iWasADigestTag)`
	`73`	`+ tag = d.Tag(iWasADigestTag)`
`74`	`74`	`}`
`75`	`75`	`tagToImage[tag] = img`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,13 +126,13 @@ func (l Path) ReplaceIndex(ii v1.ImageIndex, matcher match.Matcher, options ...O`
`126`	`126`
`127`	`127`	`// replaceDescriptor adds a descriptor to the index.json of the Path, replacing`
`128`	`128`	`// any one matching matcher, if found.`
`129`		`-func (l Path) replaceDescriptor(append mutate.Appendable, matcher match.Matcher, options ...Option) error {`
	`129`	`+func (l Path) replaceDescriptor(appendable mutate.Appendable, matcher match.Matcher, options ...Option) error {`
`130`	`130`	`ii, err := l.ImageIndex()`
`131`	`131`	`if err != nil {`
`132`	`132`	`return err`
`133`	`133`	`}`
`134`	`134`
`135`		`- desc, err := partial.Descriptor(append)`
	`135`	`+ desc, err := partial.Descriptor(appendable)`
`136`	`136`	`if err != nil {`
`137`	`137`	`return err`
`138`	`138`	`}`
`@@ -143,7 +143,7 @@ func (l Path) replaceDescriptor(append mutate.Appendable, matcher match.Matcher,`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`add := mutate.IndexAddendum{`
`146`		`- Add: append,`
	`146`	`+ Add: appendable,`
`147`	`147`	`Descriptor: *desc,`
`148`	`148`	`}`
`149`	`149`	`ii = mutate.AppendManifests(mutate.RemoveManifests(ii, matcher), add)`
Original file line number	Diff line number	Diff line change
`@@ -35,26 +35,26 @@ func computeDescriptor(ia IndexAddendum) (*v1.Descriptor, error) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// The IndexAddendum allows overriding Descriptor values.`
`38`		`- if ia.Descriptor.Size != 0 {`
`39`		`- desc.Size = ia.Descriptor.Size`
	`38`	`+ if ia.Size != 0 {`
	`39`	`+ desc.Size = ia.Size`
`40`	`40`	`}`
`41`		`- if string(ia.Descriptor.MediaType) != "" {`
`42`		`- desc.MediaType = ia.Descriptor.MediaType`
	`41`	`+ if string(ia.MediaType) != "" {`
	`42`	`+ desc.MediaType = ia.MediaType`
`43`	`43`	`}`
`44`		`- if ia.Descriptor.Digest != (v1.Hash{}) {`
`45`		`- desc.Digest = ia.Descriptor.Digest`
	`44`	`+ if ia.Digest != (v1.Hash{}) {`
	`45`	`+ desc.Digest = ia.Digest`
`46`	`46`	`}`
`47`		`- if ia.Descriptor.Platform != nil {`
`48`		`- desc.Platform = ia.Descriptor.Platform`
	`47`	`+ if ia.Platform != nil {`
	`48`	`+ desc.Platform = ia.Platform`
`49`	`49`	`}`
`50`		`- if len(ia.Descriptor.URLs) != 0 {`
`51`		`- desc.URLs = ia.Descriptor.URLs`
	`50`	`+ if len(ia.URLs) != 0 {`
	`51`	`+ desc.URLs = ia.URLs`
`52`	`52`	`}`
`53`		`- if len(ia.Descriptor.Annotations) != 0 {`
`54`		`- desc.Annotations = ia.Descriptor.Annotations`
	`53`	`+ if len(ia.Annotations) != 0 {`
	`54`	`+ desc.Annotations = ia.Annotations`
`55`	`55`	`}`
`56`		`- if ia.Descriptor.Data != nil {`
`57`		`- desc.Data = ia.Descriptor.Data`
	`56`	`+ if ia.Data != nil {`
	`57`	`+ desc.Data = ia.Data`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`return desc, nil`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func (p *Pusher) Delete(ctx context.Context, ref name.Reference) error {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`u := url.URL{`
`165`		`- Scheme: ref.Context().Registry.Scheme(),`
	`165`	`+ Scheme: ref.Context().Scheme(),`
`166`	`166`	`Host: ref.Context().RegistryStr(),`
`167`	`167`	`Path: fmt.Sprintf("/v2/%s/manifests/%s", ref.Context().RepositoryStr(), ref.Identifier()),`
`168`	`168`	`}`