Merge pull request #1193 from vrothberg/bump-golangci

bump to golangci-lint v1.50.0

.github/workflows/validate.yml

@@ -11,7 +11,7 @@ on:
 permissions: read-all
 
 env:
-  LINT_VERSION: v1.45
+  LINT_VERSION: v1.50
 
 jobs:
   codespell:
@@ -31,7 +31,7 @@ jobs:
         fetch-depth: 2
     - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v3
       with:
-        go-version: 1.18
+        go-version: 1.19
     - name: install deps
       run: |
         sudo apt-get -qq update

Makefile

@@ -72,7 +72,7 @@ vendor:
 .PHONY: install.tools
 install.tools: build/golangci-lint .install.md2man
 
-build/golangci-lint: VERSION=v1.45.2
+build/golangci-lint: VERSION=v1.50.0
 build/golangci-lint:
 	curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/$(VERSION)/install.sh | sh -s -- -b ./build $(VERSION)
 

libimage/corrupted_test.go

@@ -2,7 +2,6 @@ package libimage
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -50,7 +49,7 @@ func TestCorruptedLayers(t *testing.T) {
 	// image will still be listed in the container storage but attempting
 	// to use it will yield "layer not known" errors.
 	indexPath := filepath.Join(runtime.store.GraphRoot(), "vfs-layers/layers.json")
-	data, err := ioutil.ReadFile(indexPath)
+	data, err := os.ReadFile(indexPath)
 	require.NoError(t, err, "loading layers.json")
 	layers := []*storage.Layer{}
 	err = json.Unmarshal(data, &layers)

libimage/filters.go

@@ -73,7 +73,8 @@ func (r *Runtime) filterImages(ctx context.Context, images []*Image, options *Li
 
 // compileImageFilters creates `filterFunc`s for the specified filters.  The
 // required format is `key=value` with the following supported keys:
-//           after, since, before, containers, dangling, id, label, readonly, reference, intermediate
+//
+//	after, since, before, containers, dangling, id, label, readonly, reference, intermediate
 func (r *Runtime) compileImageFilters(ctx context.Context, options *ListImagesOptions) (map[string][]filterFunc, error) {
 	logrus.Tracef("Parsing image filters %s", options.Filters)
 

libimage/load_test.go

@@ -2,7 +2,6 @@ package libimage
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -15,7 +14,7 @@ func TestLoad(t *testing.T) {
 	tmpdir := t.TempDir()
 	os.Setenv("TMPDIR", tmpdir)
 	defer func() {
-		dir, err := ioutil.ReadDir(tmpdir)
+		dir, err := os.ReadDir(tmpdir)
 		require.NoError(t, err)
 		require.Len(t, dir, 0)
 		os.Unsetenv("TMPDIR")

libimage/manifests/manifests_test.go

@@ -3,7 +3,6 @@ package manifests
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -47,7 +46,7 @@ func TestSaveLoad(t *testing.T) {
 		t.Skip("Test can only run as root")
 	}
 
-	dir, err := ioutil.TempDir("", "manifests")
+	dir, err := os.MkdirTemp("", "manifests")
 	assert.Nilf(t, err, "error creating temporary directory")
 	defer os.RemoveAll(dir)
 
@@ -165,7 +164,7 @@ func TestReference(t *testing.T) {
 	}
 	ctx := context.Background()
 
-	dir, err := ioutil.TempDir("", "manifests")
+	dir, err := os.MkdirTemp("", "manifests")
 	assert.Nilf(t, err, "error creating temporary directory")
 	defer os.RemoveAll(dir)
 
@@ -265,7 +264,7 @@ func TestPush(t *testing.T) {
 	}
 	ctx := context.Background()
 
-	dir, err := ioutil.TempDir("", "manifests")
+	dir, err := os.MkdirTemp("", "manifests")
 	assert.Nilf(t, err, "error creating temporary directory")
 	defer os.RemoveAll(dir)
 
@@ -285,7 +284,7 @@ func TestPush(t *testing.T) {
 		}
 	}()
 
-	dest, err := ioutil.TempDir("", "manifests")
+	dest, err := os.MkdirTemp("", "manifests")
 	assert.Nilf(t, err, "error creating temporary directory")
 	defer os.RemoveAll(dest)
 

libimage/platform.go

@@ -69,9 +69,9 @@ func toPlatformString(os, arch, variant string) string {
 
 // Checks whether the image matches the specified platform.
 // Returns
-//  * 1) a matching error that can be used for logging (or returning) what does not match
-//  * 2) a bool indicating whether architecture, os or variant were set (some callers need that to decide whether they need to throw an error)
-//  * 3) a fatal error that occurred prior to check for matches (e.g., storage errors etc.)
+//   - 1) a matching error that can be used for logging (or returning) what does not match
+//   - 2) a bool indicating whether architecture, os or variant were set (some callers need that to decide whether they need to throw an error)
+//   - 3) a fatal error that occurred prior to check for matches (e.g., storage errors etc.)
 func (i *Image) matchesPlatform(ctx context.Context, os, arch, variant string) (error, bool, error) {
 	if err := i.isCorrupted(""); err != nil {
 		return err, false, nil

libimage/push_test.go

@@ -2,7 +2,6 @@ package libimage
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -24,7 +23,7 @@ func TestPush(t *testing.T) {
 	pushOptions := &PushOptions{}
 	pushOptions.Writer = os.Stdout
 
-	workdir, err := ioutil.TempDir("", "libimagepush")
+	workdir, err := os.MkdirTemp("", "libimagepush")
 	require.NoError(t, err)
 	defer os.RemoveAll(workdir)
 
@@ -86,7 +85,7 @@ func TestPushOtherPlatform(t *testing.T) {
 
 	pushOptions := &PushOptions{}
 	pushOptions.Writer = os.Stdout
-	tmp, err := ioutil.TempFile("", "")
+	tmp, err := os.CreateTemp("", "")
 	require.NoError(t, err)
 	tmp.Close()
 	defer os.Remove(tmp.Name())

libimage/runtime_test.go

@@ -1,7 +1,6 @@
 package libimage
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -27,7 +26,7 @@ type testNewRuntimeOptions struct {
 // is a clean-up function that should be called by users to make sure all
 // temporary test data gets removed.
 func testNewRuntime(t *testing.T, options ...testNewRuntimeOptions) (runtime *Runtime, cleanup func()) {
-	workdir, err := ioutil.TempDir("", "testStorageRuntime")
+	workdir, err := os.MkdirTemp("", "testStorageRuntime")
 	require.NoError(t, err)
 	storeOptions := &storage.StoreOptions{
 		RunRoot:         workdir,

libimage/save_test.go

@@ -2,7 +2,6 @@ package libimage
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -28,7 +27,7 @@ func TestSave(t *testing.T) {
 	// reload the images for each test.
 	saveOptions := &SaveOptions{}
 	saveOptions.Writer = os.Stdout
-	imageCache, err := ioutil.TempFile("", "saveimagecache")
+	imageCache, err := os.CreateTemp("", "saveimagecache")
 	require.NoError(t, err)
 	imageCache.Close()
 	defer os.Remove(imageCache.Name())
@@ -72,7 +71,7 @@ func TestSave(t *testing.T) {
 		_, err = runtime.Load(ctx, imageCache.Name(), loadOptions)
 		require.NoError(t, err)
 
-		tmp, err := ioutil.TempDir("", "libimagesavetest")
+		tmp, err := os.MkdirTemp("", "libimagesavetest")
 		require.NoError(t, err)
 		defer os.RemoveAll(tmp)
 		if !test.isDir {

libnetwork/cni/cni_conversion.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -329,7 +328,7 @@ func (n *cniNetwork) createCNIConfigListFromNetwork(network *types.Network, writ
 	cniPathName := ""
 	if writeToDisk {
 		cniPathName = filepath.Join(n.cniConfigDir, network.Name+".conflist")
-		err = ioutil.WriteFile(cniPathName, b, 0o644)
+		err = os.WriteFile(cniPathName, b, 0o644)
 		if err != nil {
 			return nil, "", err
 		}

libnetwork/cni/config_test.go

@@ -5,7 +5,6 @@ package cni_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -28,7 +27,7 @@ var _ = Describe("Config", func() {
 
 	BeforeEach(func() {
 		var err error
-		cniConfDir, err = ioutil.TempDir("", "podman_cni_test")
+		cniConfDir, err = os.MkdirTemp("", "podman_cni_test")
 		if err != nil {
 			Fail("Failed to create tmpdir")
 		}
@@ -1202,17 +1201,17 @@ var _ = Describe("Config", func() {
 
 		BeforeEach(func() {
 			dir := "testfiles/valid"
-			files, err := ioutil.ReadDir(dir)
+			files, err := os.ReadDir(dir)
 			if err != nil {
 				Fail("Failed to read test directory")
 			}
 			for _, file := range files {
 				filename := file.Name()
-				data, err := ioutil.ReadFile(filepath.Join(dir, filename))
+				data, err := os.ReadFile(filepath.Join(dir, filename))
 				if err != nil {
 					Fail("Failed to copy test files")
 				}
-				err = ioutil.WriteFile(filepath.Join(cniConfDir, filename), data, 0o700)
+				err = os.WriteFile(filepath.Join(cniConfDir, filename), data, 0o700)
 				if err != nil {
 					Fail("Failed to copy test files")
 				}
@@ -1557,17 +1556,17 @@ var _ = Describe("Config", func() {
 	Context("network load invalid existing ones", func() {
 		BeforeEach(func() {
 			dir := "testfiles/invalid"
-			files, err := ioutil.ReadDir(dir)
+			files, err := os.ReadDir(dir)
 			if err != nil {
 				Fail("Failed to read test directory")
 			}
 			for _, file := range files {
 				filename := file.Name()
-				data, err := ioutil.ReadFile(filepath.Join(dir, filename))
+				data, err := os.ReadFile(filepath.Join(dir, filename))
 				if err != nil {
 					Fail("Failed to copy test files")
 				}
-				err = ioutil.WriteFile(filepath.Join(cniConfDir, filename), data, 0o700)
+				err = os.WriteFile(filepath.Join(cniConfDir, filename), data, 0o700)
 				if err != nil {
 					Fail("Failed to copy test files")
 				}
@@ -1598,7 +1597,7 @@ func grepNotFile(path, match string) {
 }
 
 func grepFile(not bool, path, match string) {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	ExpectWithOffset(1, err).To(BeNil())
 	matcher := ContainSubstring(match)
 	if not {

libnetwork/cni/run_test.go

@@ -16,7 +16,7 @@ package cni_test
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"net"
 	"os"
 	"path/filepath"
@@ -78,7 +78,7 @@ var _ = Describe("run CNI", func() {
 		}
 
 		var err error
-		cniConfDir, err = ioutil.TempDir("", "podman_cni_test")
+		cniConfDir, err = os.MkdirTemp("", "podman_cni_test")
 		if err != nil {
 			Fail("Failed to create tmpdir")
 		}
@@ -919,17 +919,17 @@ var _ = Describe("run CNI", func() {
 	Context("network setup test with networks from disk", func() {
 		BeforeEach(func() {
 			dir := "testfiles/valid"
-			files, err := ioutil.ReadDir(dir)
+			files, err := os.ReadDir(dir)
 			if err != nil {
 				Fail("Failed to read test directory")
 			}
 			for _, file := range files {
 				filename := file.Name()
-				data, err := ioutil.ReadFile(filepath.Join(dir, filename))
+				data, err := os.ReadFile(filepath.Join(dir, filename))
 				if err != nil {
 					Fail("Failed to copy test files")
 				}
-				err = ioutil.WriteFile(filepath.Join(cniConfDir, filename), data, 0o700)
+				err = os.WriteFile(filepath.Join(cniConfDir, filename), data, 0o700)
 				if err != nil {
 					Fail("Failed to copy test files")
 				}
@@ -1384,7 +1384,7 @@ func runNetListener(wg *sync.WaitGroup, protocol, ip string, port int, expectedD
 			Expect(err).To(BeNil())
 			err = conn.SetDeadline(time.Now().Add(1 * time.Second))
 			Expect(err).To(BeNil())
-			data, err := ioutil.ReadAll(conn)
+			data, err := io.ReadAll(conn)
 			Expect(err).To(BeNil())
 			Expect(string(data)).To(Equal(expectedData))
 			conn.Close()