Merge pull request #88 from klihub/devel/bump-golang-1.20

go.{mod,sum}, .github: bump minimum golang version to 1.20.
containerd · Jun 7, 2024 · f575c3b · f575c3b
2 parents 7977ced + 2c3608d
commit f575c3b
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 61 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.20.x
 
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.20.x
 
@@ -60,12 +60,12 @@ jobs:
 
     strategy:
       matrix:
-        go: [1.19.x, 1.20.x]
+        go: [1.22.3]
         os: [ubuntu-22.04]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
 
@@ -76,7 +76,7 @@ jobs:
 
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.2
+          version: v1.58.0
 
   tests:
     name: Tests
@@ -85,11 +85,11 @@ jobs:
 
     strategy:
       matrix:
-        go: [1.19.x, 1.20.x]
+        go: [1.20.x, 1.21.x, 1.22.3]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.20.x
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -36,6 +36,9 @@ issues:
       linters:
         - govet
       text: "copylocks: .*protobuf/internal/impl.MessageState.*"
+    # We dot-import ginkgo and gomega in some tests. Silence any related errors.
+    - path: 'pkg/adaptation|pkg/runtime-tools/generate|pkg/net/multiplex'
+      text: "dot-imports:"
 
 run:
   timeout: 2m
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri
 
-go 1.19
+go 1.20
 
 require (
 	github.com/containerd/ttrpc v1.2.3

diff --git a/pkg/adaptation/adaptation_suite_test.go b/pkg/adaptation/adaptation_suite_test.go
@@ -92,7 +92,7 @@ var _ = Describe("Adaptation", func() {
 	When("SyncFn is nil", func() {
 		var (
 			syncFn   func(ctx context.Context, cb nri.SyncCB) error
-			updateFn = func(ctx context.Context, updates []*nri.ContainerUpdate) ([]*nri.ContainerUpdate, error) {
+			updateFn = func(_ context.Context, _ []*nri.ContainerUpdate) ([]*nri.ContainerUpdate, error) {
 				return nil, nil
 			}
 		)
@@ -119,7 +119,7 @@ var _ = Describe("Adaptation", func() {
 	When("UpdateFn is nil", func() {
 		var (
 			updateFn func(ctx context.Context, updates []*nri.ContainerUpdate) ([]*nri.ContainerUpdate, error)
-			syncFn   = func(ctx context.Context, cb nri.SyncCB) error {
+			syncFn   = func(_ context.Context, _ nri.SyncCB) error {
 				return nil
 			}
 		)
@@ -385,7 +385,7 @@ var _ = Describe("Pod and container requests and events", func() {
 					}
 
 					order       []*mockPlugin
-					recordOrder = func(p *mockPlugin, pod *api.PodSandbox, ctr *api.Container) error {
+					recordOrder = func(p *mockPlugin, _ *api.PodSandbox, _ *api.Container) error {
 						order = append(order, p)
 						return nil
 					}
@@ -435,7 +435,7 @@ var _ = Describe("Plugin container creation adjustments", func() {
 		s = &Suite{}
 	)
 
-	adjust := func(subject string, p *mockPlugin, pod *api.PodSandbox, ctr *api.Container, overwrite bool) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
+	adjust := func(subject string, p *mockPlugin, _ *api.PodSandbox, _ *api.Container, overwrite bool) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
 		plugin := p.idx + "-" + p.name
 		a := &api.ContainerAdjustment{}
 		switch subject {
@@ -845,7 +845,7 @@ var _ = Describe("Plugin container updates during creation", func() {
 		s = &Suite{}
 	)
 
-	update := func(subject, which string, p *mockPlugin, pod *api.PodSandbox, ctr *api.Container) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
+	update := func(subject, which string, p *mockPlugin, _ *api.PodSandbox, ctr *api.Container) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
 		plugin := p.idx + "-" + p.name
 
 		if which != plugin && which != "*" && which != "both" {
@@ -1216,7 +1216,7 @@ var _ = Describe("Solicited container updates by plugins", func() {
 		s = &Suite{}
 	)
 
-	update := func(subject, which string, p *mockPlugin, pod *api.PodSandbox, ctr *api.Container, r, exp *api.LinuxResources) ([]*api.ContainerUpdate, error) {
+	update := func(subject, which string, p *mockPlugin, _ *api.PodSandbox, ctr *api.Container, _, _ *api.LinuxResources) ([]*api.ContainerUpdate, error) {
 		plugin := p.idx + "-" + p.name
 
 		if which != plugin && which != "*" && which != "both" {
@@ -1807,7 +1807,7 @@ var _ = Describe("Unsolicited container update requests", func() {
 				recordedUpdates []*nri.ContainerUpdate
 			)
 
-			runtime.updateFn = func(ctx context.Context, updates []*nri.ContainerUpdate) ([]*nri.ContainerUpdate, error) {
+			runtime.updateFn = func(_ context.Context, updates []*nri.ContainerUpdate) ([]*nri.ContainerUpdate, error) {
 				recordedUpdates = updates
 				return nil, nil
 			}

diff --git a/pkg/adaptation/result.go b/pkg/adaptation/result.go
@@ -200,7 +200,7 @@ func (r *result) adjust(rpl *ContainerAdjustment, plugin string) error {
 	if err := r.adjustEnv(rpl.Env, plugin); err != nil {
 		return err
 	}
-	if err := r.adjustHooks(rpl.Hooks, plugin); err != nil {
+	if err := r.adjustHooks(rpl.Hooks); err != nil {
 		return err
 	}
 	if rpl.Linux != nil {
@@ -458,7 +458,7 @@ func splitEnvVar(s string) (string, string) {
 	return split[0], split[1]
 }
 
-func (r *result) adjustHooks(hooks *Hooks, plugin string) error {
+func (r *result) adjustHooks(hooks *Hooks) error {
 	if hooks == nil {
 		return nil
 	}

diff --git a/pkg/adaptation/suite_test.go b/pkg/adaptation/suite_test.go
@@ -470,7 +470,7 @@ func (m *mockPlugin) onClose() {
 	}
 }
 
-func (m *mockPlugin) Configure(_ context.Context, cfg, runtime, version string) (stub.EventMask, error) {
+func (m *mockPlugin) Configure(_ context.Context, _, _, _ string) (stub.EventMask, error) {
 	m.q.Add(PluginConfigured)
 
 	return m.mask, nil
@@ -690,7 +690,7 @@ func (q *EventQ) Add(e *Event) {
 	}
 }
 
-func (q *EventQ) Reset(e *Event) {
+func (q *EventQ) Reset() {
 	q.Lock()
 	defer q.Unlock()
 	q.q = []*Event{}

diff --git a/pkg/api/resources.go b/pkg/api/resources.go
@@ -22,7 +22,7 @@ import (
 )
 
 // FromOCILinuxResources returns resources from an OCI runtime Spec.
-func FromOCILinuxResources(o *rspec.LinuxResources, ann map[string]string) *LinuxResources {
+func FromOCILinuxResources(o *rspec.LinuxResources, _ map[string]string) *LinuxResources {
 	if o == nil {
 		return nil
 	}

diff --git a/pkg/net/multiplex/mux.go b/pkg/net/multiplex/mux.go
@@ -429,16 +429,16 @@ func (c *conn) RemoteAddr() net.Addr {
 }
 
 // SetDeadline is the unimplemented stub for the corresponding net.Conn function.
-func (c *conn) SetDeadline(t time.Time) error {
+func (c *conn) SetDeadline(_ time.Time) error {
 	return nil
 }
 
 // SetReadDeadline is the unimplemented stub for the corresponding net.Conn function.
-func (c *conn) SetReadDeadline(t time.Time) error {
+func (c *conn) SetReadDeadline(_ time.Time) error {
 	return nil
 }
 
 // SetWriteDeadline is the unimplemented stub for the corresponding net.Conn function.
-func (c *conn) SetWriteDeadline(t time.Time) error {
+func (c *conn) SetWriteDeadline(_ time.Time) error {
 	return nil
 }
diff --git a/pkg/net/net_suite_test.go b/pkg/net/net_suite_test.go
diff --git a/pkg/stub/stub.go b/pkg/stub/stub.go
@@ -605,7 +605,7 @@ func (stub *stub) Synchronize(ctx context.Context, req *api.SynchronizeRequest)
 }
 
 // Shutdown the plugin.
-func (stub *stub) Shutdown(ctx context.Context, req *api.ShutdownRequest) (*api.ShutdownResponse, error) {
+func (stub *stub) Shutdown(ctx context.Context, _ *api.ShutdownRequest) (*api.ShutdownResponse, error) {
 	handler := stub.handlers.Shutdown
 	if handler != nil {
 		handler(ctx)

diff --git a/plugins/device-injector/go.mod b/plugins/device-injector/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/device-injector
 
-go 1.18
+go 1.20
 
 require (
 	github.com/containerd/nri v0.2.0

diff --git a/plugins/differ/go.mod b/plugins/differ/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/differ
 
-go 1.18
+go 1.20
 
 require (
 	github.com/containerd/nri v0.2.0

diff --git a/plugins/hook-injector/go.mod b/plugins/hook-injector/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/hook-injector
 
-go 1.18
+go 1.20
 
 require (
 	github.com/containerd/nri v0.2.0

diff --git a/plugins/logger/go.mod b/plugins/logger/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/logger
 
-go 1.18
+go 1.20
 
 require (
 	github.com/containerd/nri v0.2.0

diff --git a/plugins/template/go.mod b/plugins/template/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/template
 
-go 1.18
+go 1.20
 
 require (
 	github.com/containerd/nri v0.2.0

diff --git a/plugins/ulimit-adjuster/go.mod b/plugins/ulimit-adjuster/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/ulimit-adjuster
 
-go 1.19
+go 1.20
 
 replace github.com/containerd/nri => ../..
 

diff --git a/plugins/v010-adapter/go.mod b/plugins/v010-adapter/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/nri/plugins/v010-adapter
 
-go 1.18
+go 1.20
 
 require (
 	github.com/containerd/containerd v1.6.9