chore: update linting scope (#1852)

TerryHowe · web-flow · commit 6c3e3e5a3e08 · 2025-11-26T05:24:53.000-07:00
Signed-off-by: Terry Howe &lt;terrylhowe@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,70 @@
+# Copyright The ORAS Authors.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+
+  exclusions:
+    generated: lax
+
+  settings:
+    gofmt:
+      simplify: true
+
+linters:
+  default: standard
+
+  enable:
+    - depguard
+    - dupl
+    - gomodguard
+    - govet
+    - ineffassign
+    - misspell
+    - staticcheck
+    - thelper
+    - unused
+    - usestdlibvars
+    - usetesting
+
+  exclusions:
+
+    generated: lax
+
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+
+    warn-unused: true
+
+  settings:
+    depguard:
+      rules:
+        Main:
+          deny:
+            - pkg: github.com/hashicorp/go-multierror
+              desc: "use errors instead"
+            - pkg: github.com/pkg/errors
+              desc: "use errors instead"
+
+    dupl:
+      threshold: 400
+
+run:
+  timeout: 10m
+
+version: "2"
diff --git a/cmd/oras/internal/display/metadata/descriptor/manifest_fetch.go b/cmd/oras/internal/display/metadata/descriptor/manifest_fetch.go
@@ -19,10 +19,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"oras.land/oras/cmd/oras/internal/output"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras/cmd/oras/internal/display/metadata"
+	"oras.land/oras/cmd/oras/internal/output"
 )
 
 // manifestFetchHandler handles metadata descriptor output.
diff --git a/cmd/oras/internal/display/metadata/text/tag_test.go b/cmd/oras/internal/display/metadata/text/tag_test.go
@@ -35,7 +35,6 @@ func TestNewTagHandler(t *testing.T) {
 	}
 
 	handler := NewTagHandler(printer, target)
-	
 	if handler == nil {
 		t.Fatal("NewTagHandler should not return nil")
 	}
diff --git a/cmd/oras/internal/display/status/console/console_test.go b/cmd/oras/internal/display/status/console/console_test.go
@@ -26,6 +26,7 @@ import (
 )
 
 func givenConsole(t *testing.T) (c Console, pty containerd.Console) {
+	t.Helper()
 	pty, _, err := containerd.NewPty()
 	if err != nil {
 		t.Fatal(err)
@@ -38,6 +39,7 @@ func givenConsole(t *testing.T) (c Console, pty containerd.Console) {
 }
 
 func givenTestConsole(t *testing.T) (c Console, pty containerd.Console, tty *os.File) {
+	t.Helper()
 	var err error
 	pty, tty, err = testutils.NewPty()
 	if err != nil {
diff --git a/cmd/oras/internal/display/status/progress/status_test.go b/cmd/oras/internal/display/status/progress/status_test.go
@@ -363,6 +363,7 @@ func Test_updateStatus(t *testing.T) {
 			name:   "updateStatusStartTime",
 			update: updateStatusStartTime(),
 			check: func(t *testing.T, s *status) {
+				t.Helper()
 				if s.startTime.IsZero() {
 					t.Errorf("updateStatusStartTime() = %v, want non-zero", s.startTime)
 				}
@@ -375,6 +376,7 @@ func Test_updateStatus(t *testing.T) {
 			name:   "updateStatusEndTime",
 			update: updateStatusEndTime(),
 			check: func(t *testing.T, s *status) {
+				t.Helper()
 				if s.endTime.IsZero() {
 					t.Errorf("updateStatusEndTime() = %v, want non-zero", s.endTime)
 				}
@@ -388,6 +390,7 @@ func Test_updateStatus(t *testing.T) {
 			setup:  updateStatusError(errTest),
 			update: updateStatusEndTime(),
 			check: func(t *testing.T, s *status) {
+				t.Helper()
 				if s.endTime.IsZero() {
 					t.Errorf("updateStatusEndTime() = %v, want non-zero", s.endTime)
 				}
diff --git a/cmd/oras/internal/display/status/text_test.go b/cmd/oras/internal/display/status/text_test.go
@@ -46,6 +46,7 @@ func TestMain(m *testing.M) {
 }
 
 func validatePrinted(t *testing.T, expected string) {
+	t.Helper()
 	actual := strings.TrimSpace(builder.String())
 	if expected != actual {
 		t.Error("Output does not match expected <" + expected + "> actual <" + actual + ">")
diff --git a/cmd/oras/internal/option/packer_test.go b/cmd/oras/internal/option/packer_test.go
@@ -154,6 +154,7 @@ func TestPacker_parseAnnotations_annotationFlag(t *testing.T) {
 }
 
 func givenTestFile(t *testing.T, data string) (path string) {
+	t.Helper()
 	tempDir := t.TempDir()
 	fileName := "test.txt"
 	path = filepath.Join(tempDir, fileName)
diff --git a/cmd/oras/root/cp_test.go b/cmd/oras/root/cp_test.go
@@ -335,7 +335,8 @@ func Test_prepareCopyOption_referrersFailureOnIndex(t *testing.T) {
 			if desc.MediaType == ocispec.MediaTypeImageIndex {
 				return nil, errMockedReferrers
 			}
-			return []ocispec.Descriptor{ocispec.Descriptor{}}, nil
+			entry := ocispec.Descriptor{}
+			return []ocispec.Descriptor{entry}, nil
 		},
 	}
 
diff --git a/cmd/oras/root/manifest/fetch_test.go b/cmd/oras/root/manifest/fetch_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func Test_fetchManifest_errType(t *testing.T) {
-    // prepare
+	// prepare
 	cmd := &cobra.Command{}
 	cmd.SetContext(context.Background())
 
diff --git a/cmd/oras/root/manifest/index/create_test.go b/cmd/oras/root/manifest/index/create_test.go
@@ -165,6 +165,7 @@ func Test_enrichDescriptor(t *testing.T) {
 			`),
 			manifestMediaType: "application/vnd.oci.image.index.v1+json",
 			checkDesc: func(t *testing.T, gotDesc, inputDesc ocispec.Descriptor) {
+				t.Helper()
 				if got, want := gotDesc.ArtifactType, "application/vnd.example"; got != want {
 					t.Errorf("ArtifactType = %s, want %s", got, want)
 				}
@@ -192,6 +193,7 @@ func Test_enrichDescriptor(t *testing.T) {
 			`),
 			manifestMediaType: "application/vnd.oci.image.manifest.v1+json",
 			checkDesc: func(t *testing.T, gotDesc, inputDesc ocispec.Descriptor) {
+				t.Helper()
 				if got, want := gotDesc.ArtifactType, "application/vnd.example"; got != want {
 					t.Errorf("ArtifactType = %s, want %s", got, want)
 				}
@@ -226,6 +228,7 @@ func Test_enrichDescriptor(t *testing.T) {
 			`),
 			manifestMediaType: "application/vnd.oci.image.manifest.v1+json",
 			checkDesc: func(t *testing.T, gotDesc, inputDesc ocispec.Descriptor) {
+				t.Helper()
 				if got, want := gotDesc.ArtifactType, "application/vnd.example"; got != want {
 					t.Errorf("ArtifactType = %s, want %s", got, want)
 				}
@@ -241,6 +244,7 @@ func Test_enrichDescriptor(t *testing.T) {
 			manifestBytes:     []byte(`{}`),
 			manifestMediaType: "application/vnd.custom",
 			checkDesc: func(t *testing.T, gotDesc, inputDesc ocispec.Descriptor) {
+				t.Helper()
 				if !reflect.DeepEqual(gotDesc, inputDesc) {
 					t.Errorf("result does not match input: got %#v, want %#v", gotDesc, inputDesc)
 				}
diff --git a/cmd/oras/root/pull_test.go b/cmd/oras/root/pull_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func Test_runPull_errType(t *testing.T) {
-    // prepare
+	// prepare
 	cmd := &cobra.Command{}
 	cmd.SetContext(context.Background())
 
diff --git a/internal/io/tar_utils_test.go b/internal/io/tar_utils_test.go
@@ -28,15 +28,7 @@ import (
 
 func TestTarDirectory(t *testing.T) {
 	// Create a temporary directory structure for testing
-	tmpDir, err := os.MkdirTemp("", "tar-test")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	defer func() {
-		if err := os.RemoveAll(tmpDir); err != nil {
-			t.Logf("Failed to remove temporary directory: %v", err)
-		}
-	}()
+	tmpDir := t.TempDir()
 
 	// Create test files and directories
 	testFiles := map[string]string{
@@ -64,7 +56,7 @@ func TestTarDirectory(t *testing.T) {
 	// by the TarDirectory function design
 
 	// Call TarDirectory
-	err = iotest.TarDirectory(&buf, tmpDir)
+	err := iotest.TarDirectory(&buf, tmpDir)
 	if err != nil {
 		t.Fatalf("TarDirectory failed: %v", err)
 	}
@@ -130,15 +122,10 @@ func TestTarDirectory_InvalidSource(t *testing.T) {
 
 	// Create a temporary file to test with non-directory source
 	t.Run("Source is not a directory", func(t *testing.T) {
-		tmpFile, err := os.CreateTemp("", "not-a-dir")
+		tmpFile, err := os.CreateTemp(t.TempDir(), "not-a-dir")
 		if err != nil {
 			t.Fatalf("Failed to create temp file: %v", err)
 		}
-		defer func() {
-			if err := os.Remove(tmpFile.Name()); err != nil {
-				t.Logf("Failed to remove temporary file: %v", err)
-			}
-		}()
 		defer func() {
 			if err := tmpFile.Close(); err != nil {
 				t.Logf("Failed to close temporary file: %v", err)
diff --git a/internal/testutils/error_fetcher.go b/internal/testutils/error_fetcher.go
@@ -18,8 +18,9 @@ package testutils
 import (
 	"context"
 	"fmt"
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"io"
+
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 // ErrorFetcher implements content.Fetcher.
diff --git a/internal/testutils/fetcher.go b/internal/testutils/fetcher.go
@@ -19,6 +19,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2/content"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ func TestNewTagHandler(t *testing.T) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`handler := NewTagHandler(printer, target)`
`38`		`-`
`39`	`38`	`if handler == nil {`
`40`	`39`	`t.Fatal("NewTagHandler should not return nil")`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func givenConsole(t *testing.T) (c Console, pty containerd.Console) {`
	`29`	`+ t.Helper()`
`29`	`30`	`pty, _, err := containerd.NewPty()`
`30`	`31`	`if err != nil {`
`31`	`32`	`t.Fatal(err)`
`@@ -38,6 +39,7 @@ func givenConsole(t *testing.T) (c Console, pty containerd.Console) {`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`func givenTestConsole(t testing.T) (c Console, pty containerd.Console, tty os.File) {`
	`42`	`+ t.Helper()`
`41`	`43`	`var err error`
`42`	`44`	`pty, tty, err = testutils.NewPty()`
`43`	`45`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ func TestMain(m *testing.M) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func validatePrinted(t *testing.T, expected string) {`
	`49`	`+ t.Helper()`
`49`	`50`	`actual := strings.TrimSpace(builder.String())`
`50`	`51`	`if expected != actual {`
`51`	`52`	`t.Error("Output does not match expected <" + expected + "> actual <" + actual + ">")`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ func TestPacker_parseAnnotations_annotationFlag(t *testing.T) {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`func givenTestFile(t *testing.T, data string) (path string) {`
	`157`	`+ t.Helper()`
`157`	`158`	`tempDir := t.TempDir()`
`158`	`159`	`fileName := "test.txt"`
`159`	`160`	`path = filepath.Join(tempDir, fileName)`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,8 @@ func Test_prepareCopyOption_referrersFailureOnIndex(t *testing.T) {`
`335`	`335`	`if desc.MediaType == ocispec.MediaTypeImageIndex {`
`336`	`336`	`return nil, errMockedReferrers`
`337`	`337`	`}`
`338`		`- return []ocispec.Descriptor{ocispec.Descriptor{}}, nil`
	`338`	`+ entry := ocispec.Descriptor{}`
	`339`	`+ return []ocispec.Descriptor{entry}, nil`
`339`	`340`	`},`
`340`	`341`	`}`
`341`	`342`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func Test_fetchManifest_errType(t *testing.T) {`
`28`		`- // prepare`
	`28`	`+ // prepare`
`29`	`29`	`cmd := &cobra.Command{}`
`30`	`30`	`cmd.SetContext(context.Background())`
`31`	`31`