Merge pull request #6719 from dmcgowan/backport-1.5-6666

[release/1.5] Upgrade Go to 1.17 and golangci-lint
containerd · Mar 23, 2022 · 85b9bc9 · 85b9bc9
2 parents 37fcd4d + 7f03aea
commit 85b9bc9
Show file tree

Hide file tree

Showing 374 changed files with 433 additions and 4,951 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.16.15]
+        go-version: [1.17.8]
         os: [ubuntu-18.04, macos-10.15, windows-2019]
 
     steps:
@@ -38,12 +38,11 @@ jobs:
           echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
           echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
-      - uses: golangci/golangci-lint-action@v2
+      - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.42.0
+          version: v1.44.2
           working-directory: src/github.com/containerd/containerd
           args: --timeout=5m
-          skip-go-installation: true
 
   #
   # Project checks
@@ -56,7 +55,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - shell: bash
         run: |
@@ -87,7 +86,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - uses: actions/checkout@v2
         with:
@@ -120,7 +119,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - name: Set env
         shell: bash
@@ -166,7 +165,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
       - name: Set env
         shell: bash
         run: |
@@ -231,7 +230,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, macos-10.15, windows-2019]
-        go-version: ['1.16.15']
+        go-version: ['1.17.8']
         include:
           # Go 1.13.x is still used by Docker/Moby
           - go-version: '1.13.x'
@@ -277,7 +276,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - uses: actions/checkout@v2
         with:
@@ -358,7 +357,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - uses: actions/checkout@v2
         with:
@@ -510,7 +509,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
       - uses: actions/checkout@v2
         with:
           path: src/github.com/containerd/containerd

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - uses: actions/checkout@v2
         with:
@@ -135,7 +135,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.16.15'
+          go-version: '1.17.8'
 
       - name: Set env
         shell: bash

diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml
@@ -2,7 +2,7 @@
   become: yes
   roles:
   - role: config-golang
-    go_version: '1.16.15'
+    go_version: '1.17.8'
     arch: arm64
   tasks:
   - name: Install pre-requisites

diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml
@@ -2,7 +2,7 @@
   become: yes
   roles:
   - role: config-golang
-    go_version: '1.16.15'
+    go_version: '1.17.8'
     arch: arm64
   tasks:
   - name: Build containerd

diff --git a/.zuul/playbooks/containerd-build/unit-test.yaml b/.zuul/playbooks/containerd-build/unit-test.yaml
@@ -2,7 +2,7 @@
   become: yes
   roles:
   - role: config-golang
-    go_version: '1.16.15'
+    go_version: '1.17.8'
     arch: arm64
   tasks:
   - name: Build and test containerd

diff --git a/Vagrantfile b/Vagrantfile
@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
     sh.upload_path = "/tmp/vagrant-install-golang"
     sh.env = {
-        'GO_VERSION': ENV['GO_VERSION'] || "1.16.15",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.17.8",
     }
     sh.inline = <<~SHELL
         #!/usr/bin/env bash

diff --git a/archive/tar.go b/archive/tar.go
@@ -370,7 +370,7 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header
 		return nil
 
 	default:
-		return errors.Errorf("unhandled tar header type %d\n", hdr.Typeflag)
+		return errors.Errorf("unhandled tar header type %d", hdr.Typeflag)
 	}
 
 	// Lchown is not supported on Windows.

diff --git a/archive/tar_freebsd.go b/archive/tar_freebsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 /*

diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/archive/tar_mostunix.go b/archive/tar_mostunix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !freebsd
 // +build !windows,!freebsd
 
 /*

diff --git a/archive/tar_opts_linux.go b/archive/tar_opts_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/archive/tar_opts_windows.go b/archive/tar_opts_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -1,3 +1,4 @@
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 /*

diff --git a/archive/tar_unix.go b/archive/tar_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/archive/tar_windows.go b/archive/tar_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/archive/time_unix.go b/archive/time_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cio/io_test.go b/cio/io_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cio/io_unix.go b/cio/io_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cio/io_unix_test.go b/cio/io_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cio/io_windows_test.go b/cio/io_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/cmd/containerd-shim-runc-v1/main.go b/cmd/containerd-shim-runc-v1/main.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/containerd-shim/shim_darwin.go b/cmd/containerd-shim/shim_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 /*

diff --git a/cmd/containerd-shim/shim_freebsd.go b/cmd/containerd-shim/shim_freebsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 /*

diff --git a/cmd/containerd-stress/rlimit_freebsd.go b/cmd/containerd-stress/rlimit_freebsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 /*

diff --git a/cmd/containerd-stress/rlimit_unix.go b/cmd/containerd-stress/rlimit_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !freebsd
 // +build !windows,!freebsd
 
 /*

diff --git a/cmd/containerd-stress/rlimit_windows.go b/cmd/containerd-stress/rlimit_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/cmd/containerd/builtins_aufs_linux.go b/cmd/containerd/builtins_aufs_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_aufs
 // +build !no_aufs
 
 /*

diff --git a/cmd/containerd/builtins_btrfs_linux.go b/cmd/containerd/builtins_btrfs_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_btrfs && cgo
 // +build !no_btrfs,cgo
 
 /*

diff --git a/cmd/containerd/builtins_cri.go b/cmd/containerd/builtins_cri.go
@@ -1,3 +1,4 @@
+//go:build (linux && !no_cri) || (windows && !no_cri)
 // +build linux,!no_cri windows,!no_cri
 
 /*

diff --git a/cmd/containerd/builtins_devmapper_linux.go b/cmd/containerd/builtins_devmapper_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_devmapper
 // +build !no_devmapper
 
 /*

diff --git a/cmd/containerd/builtins_unix.go b/cmd/containerd/builtins_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || solaris
 // +build darwin freebsd solaris
 
 /*

diff --git a/cmd/containerd/builtins_windows.go b/cmd/containerd/builtins_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/cmd/containerd/builtins_zfs_linux.go b/cmd/containerd/builtins_zfs_linux.go
@@ -1,3 +1,4 @@
+//go:build !no_zfs
 // +build !no_zfs
 
 /*

diff --git a/cmd/containerd/command/config_unsupported.go b/cmd/containerd/command/config_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows && !solaris
 // +build !linux,!windows,!solaris
 
 /*

diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || darwin || freebsd || solaris
 // +build linux darwin freebsd solaris
 
 /*

diff --git a/cmd/containerd/command/notify_linux.go b/cmd/containerd/command/notify_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/cmd/containerd/command/notify_unsupported.go b/cmd/containerd/command/notify_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/app/main_unix.go b/cmd/ctr/app/main_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/commands/commands_unix.go b/cmd/ctr/commands/commands_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/commands/commands_windows.go b/cmd/ctr/commands/commands_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/cmd/ctr/commands/pprof/pprof_unix.go b/cmd/ctr/commands/pprof/pprof_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/commands/shim/io_unix.go b/cmd/ctr/commands/shim/io_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/cmd/ctr/commands/signals_notlinux.go b/cmd/ctr/commands/signals_notlinux.go
@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/container_opts_unix.go b/container_opts_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

diff --git a/content/local/store_bsd.go b/content/local/store_bsd.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || netbsd
 // +build darwin freebsd netbsd
 
 /*