merge #651 into opencontainers/umoci:main

Aleksa Sarai (1):
  lints: update to golangci-lint v2.6

LGTMs: cyphar

Author: cyphar

.github/workflows/ci.yml

@@ -53,7 +53,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.5
+          version: v2.6
       - name: go fix
         run: |
           go fix ./...

.golangci.yml

@@ -62,6 +62,8 @@ formatters:
     - gofumpt
     - goimports
   settings:
+    gofumpt:
+      extra-rules: true
     goimports:
       local-prefixes:
         - github.com/opencontainers/umoci

internal/system/xattr_unix.go

@@ -70,7 +70,7 @@ func Llistxattr(path string) ([]string, error) {
 
 // Lgetxattr is a wrapper around unix.Lgetattr, to abstract the resizing of the
 // returned []string.
-func Lgetxattr(path string, name string) ([]byte, error) {
+func Lgetxattr(path, name string) ([]byte, error) {
 	var buffer []byte //nolint:prealloc // we do pre-allocate later
 	for {
 		// Find the size.

oci/layer/layer_fuzzer.go

@@ -41,7 +41,7 @@ import (
 	"github.com/opencontainers/umoci/oci/casext"
 )
 
-func createRandomFile(dirpath string, filename []byte, filecontents []byte) error {
+func createRandomFile(dirpath string, filename, filecontents []byte) error {
 	fileP := filepath.Join(dirpath, string(filename))
 	if err := os.WriteFile(fileP, filecontents, 0o644); err != nil {
 		return err

oci/layer/tar_extract.go

@@ -274,7 +274,7 @@ func (te *TarExtractor) applyMetadata(path string, hdr *tar.Header) error {
 // we should extract through the link or clobber the link with a directory (in
 // the case where we see a directory to extract and a symlink already exists
 // there).
-func (te *TarExtractor) isDirlink(root string, path string) (bool, error) {
+func (te *TarExtractor) isDirlink(root, path string) (bool, error) {
 	// Make sure it exists and is a symlink.
 	if _, err := te.fsEval.Readlink(path); err != nil {
 		return false, fmt.Errorf("read dirlink: %w", err)

pkg/fseval/fseval.go

@@ -77,7 +77,7 @@ type FsEval interface {
 	Lsetxattr(path, name string, value []byte, flags int) error
 
 	// Lgetxattr is equivalent to system.Lgetxattr
-	Lgetxattr(path string, name string) ([]byte, error)
+	Lgetxattr(path, name string) ([]byte, error)
 
 	// Lclearxattrs is equivalent to system.Lclearxattrs
 	Lclearxattrs(path string, skipFn func(xattr string) bool) error

pkg/fseval/fseval_default.go

@@ -132,7 +132,7 @@ func (fs osFsEval) Lsetxattr(path, name string, value []byte, flags int) error {
 }
 
 // Lgetxattr is equivalent to system.Lgetxattr.
-func (fs osFsEval) Lgetxattr(path string, name string) ([]byte, error) {
+func (fs osFsEval) Lgetxattr(path, name string) ([]byte, error) {
 	return system.Lgetxattr(path, name)
 }
 

pkg/fseval/fseval_rootless.go

@@ -120,7 +120,7 @@ func (fs unprivFsEval) Lsetxattr(path, name string, value []byte, flags int) err
 }
 
 // Lgetxattr is equivalent to unpriv.Lgetxattr.
-func (fs unprivFsEval) Lgetxattr(path string, name string) ([]byte, error) {
+func (fs unprivFsEval) Lgetxattr(path, name string) ([]byte, error) {
 	return unpriv.Lgetxattr(path, name)
 }
 

utils.go

@@ -718,7 +718,7 @@ func Stat(ctx context.Context, engine casext.Engine, manifestDescriptor ispec.De
 
 // GenerateBundleManifest creates and writes an mtree of the rootfs in the given
 // bundle path, using the supplied fsEval method.
-func GenerateBundleManifest(mtreeName string, bundlePath string, fsEval mtree.FsEval) (Err error) {
+func GenerateBundleManifest(mtreeName, bundlePath string, fsEval mtree.FsEval) (Err error) {
 	mtreePath := filepath.Join(bundlePath, mtreeName+".mtree")
 	fullRootfsPath := filepath.Join(bundlePath, layer.RootfsName)