lint: bump golangci-lint to v1.63

Enable exptostd, nilnesserr and usetesting linters.

Author: tri-adam

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
  - image: node:22-slim
  golangci-lint:
  docker:
- - image: golangci/golangci-lint:v1.62
+ - image: golangci/golangci-lint:v1.63
  golang-previous:
  docker:
  - image: golang:1.22

.golangci.yml

@@ -16,6 +16,7 @@ linters:
  - errchkjson
  - errname
  - errorlint
+ - exptostd
  - forcetypeassert
  - gochecknoinits
  - gocritic
@@ -38,6 +39,7 @@ linters:
  - maintidx
  - mirror
  - misspell
+ - nilnesserr
  - nilnil
  - nolintlint
  - nonamedreturns
@@ -51,6 +53,7 @@ linters:
  - unconvert
  - unparam
  - unused
+ - usetesting
  - whitespace
 
 linters-settings:

internal/app/siftool/modif_test.go

@@ -21,11 +21,10 @@ func TestApp_New(t *testing.T) {
 t.Fatalf("failed to create app: %v", err)
 }
 
-tf, err := os.CreateTemp("", "sif-test-*")
+tf, err := os.CreateTemp(t.TempDir(), "sif-test-*")
 if err != nil {
 t.Fatal(err)
 }
-defer os.Remove(tf.Name())
 tf.Close()
 
 if err := a.New(tf.Name()); err != nil {
@@ -94,11 +93,10 @@ func TestApp_Add(t *testing.T) {
 }
 for _, tt := range tests {
 t.Run(tt.name, func(t *testing.T) {
-tf, err := os.CreateTemp("", "sif-test-*")
+tf, err := os.CreateTemp(t.TempDir(), "sif-test-*")
 if err != nil {
 t.Fatal(err)
 }
-defer os.Remove(tf.Name())
 tf.Close()
 
 if err := a.New(tf.Name()); err != nil {
@@ -119,11 +117,10 @@ func TestApp_Del(t *testing.T) {
 t.Fatalf("failed to create app: %v", err)
 }
 
-tf, err := os.CreateTemp("", "sif-test-*")
+tf, err := os.CreateTemp(t.TempDir(), "sif-test-*")
 if err != nil {
 t.Fatal(err)
 }
-defer os.Remove(tf.Name())
 tf.Close()
 
 if err := a.New(tf.Name()); err != nil {
@@ -146,11 +143,10 @@ func TestApp_Setprim(t *testing.T) {
 t.Fatalf("failed to create app: %v", err)
 }
 
-tf, err := os.CreateTemp("", "sif-test-*")
+tf, err := os.CreateTemp(t.TempDir(), "sif-test-*")
 if err != nil {
 t.Fatal(err)
 }
-defer os.Remove(tf.Name())
 tf.Close()
 
 if err := a.New(tf.Name()); err != nil {

pkg/sif/create_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2024, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -9,6 +9,7 @@ import (
 "errors"
 "math"
 "os"
+"path/filepath"
 "testing"
 "time"
 
@@ -272,14 +273,9 @@ func TestCreateContainerAtPath(t *testing.T) {
 
 for _, tt := range tests {
 t.Run(tt.name, func(t *testing.T) {
-tf, err := os.CreateTemp("", "sif-test-*")
-if err != nil {
-t.Fatal(err)
-}
-defer os.Remove(tf.Name())
-tf.Close()
+path := filepath.Join(t.TempDir(), "sif")
 
-f, err := CreateContainerAtPath(tf.Name(), tt.opts...)
+f, err := CreateContainerAtPath(path, tt.opts...)
 
 if got, want := err, tt.wantErr; !errors.Is(got, want) {
 t.Fatalf("got error %v, want %v", got, want)
@@ -290,7 +286,7 @@ func TestCreateContainerAtPath(t *testing.T) {
 t.Error(err)
 }
 
-b, err := os.ReadFile(tf.Name())
+b, err := os.ReadFile(path)
 if err != nil {
 t.Fatal(err)
 }

pkg/siftool/new_test.go

@@ -1,12 +1,12 @@
-// Copyright (c) 2021-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2021-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
 
 package siftool
 
 import (
-"os"
+"path/filepath"
 "testing"
 )
 
@@ -21,18 +21,13 @@ func Test_command_getNew(t *testing.T) {
 }
 for _, tt := range tests {
 t.Run(tt.name, func(t *testing.T) {
-tf, err := os.CreateTemp("", "sif-test-*")
-if err != nil {
-t.Fatal(err)
-}
-defer os.Remove(tf.Name())
-tf.Close()
+path := filepath.Join(t.TempDir(), "sif")
 
 c := &command{opts: tt.opts}
 
 cmd := c.getNew()
 
-runCommand(t, cmd, []string{tf.Name()}, nil)
+runCommand(t, cmd, []string{path}, nil)
 })
 }
 }

pkg/siftool/siftool_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2021-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -7,7 +7,6 @@ package siftool
 import (
 "bytes"
 "errors"
-"os"
 "path/filepath"
 "testing"
 
@@ -21,32 +20,27 @@ var corpus = filepath.Join("..", "..", "test", "images")
 
 //nolint:thelper // Complex enough to justify keeping file/line information on error.
 func makeTestSIF(t *testing.T, withDataObject bool) string {
-tf, err := os.CreateTemp("", "sif-test-*")
-if err != nil {
-t.Fatal(err)
-}
-t.Cleanup(func() { os.Remove(tf.Name()) })
-tf.Close()
-
 app, err := siftool.New()
 if err != nil {
 t.Fatal(err)
 }
 
-if err := app.New(tf.Name()); err != nil {
+path := filepath.Join(t.TempDir(), "sif")
+
+if err := app.New(path); err != nil {
 t.Fatal(err)
 }
 
 if withDataObject {
-err := app.Add(tf.Name(), sif.DataPartition, bytes.NewReader([]byte{0xde, 0xad, 0xbe, 0xef}),
+err := app.Add(path, sif.DataPartition, bytes.NewReader([]byte{0xde, 0xad, 0xbe, 0xef}),
 sif.OptPartitionMetadata(sif.FsSquash, sif.PartSystem, "386"),
 )
 if err != nil {
 t.Fatal(err)
 }
 }
 
-return tf.Name()
+return path
 }
 
 //nolint:unparam

pkg/user/unmount_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -28,13 +28,7 @@ func Test_Unmount(t *testing.T) {
 t.Skip(" not found, skipping mount tests")
 }
 
-path, err := os.MkdirTemp("", "siftool-mount-*")
-if err != nil {
-t.Fatal(err)
-}
-t.Cleanup(func() {
-os.RemoveAll(path)
-})
+path := t.TempDir()
 
 tests := []struct {
 name string