update to golang 1.19

also ran gofmt with go1.19 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah · Sep 7, 2022 · 58413c1 · 58413c1
1 parent a9fe88e
commit 58413c1
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml
@@ -13,7 +13,10 @@ on:
         default: false
 
 env:
-  GO_VERSION: 1.18.6
+  GO_VERSION: 1.19
+  # FIXME: temporarily using a separate var for this, as go-setup-action expects SemVer
+  #        see https://github.com/actions/setup-go/tree/v3.2.0#supported-version-syntax
+  GO_VERSION_SEMVER: 1.19.0
   GOTESTLIST_VERSION: v0.2.0
   TESTSTAT_VERSION: v0.1.3
   WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore
@@ -187,7 +190,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ env.GO_VERSION_SEMVER }}
       -
         name: Download artifacts
         uses: actions/download-artifact@v3
@@ -215,7 +218,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ env.GO_VERSION_SEMVER }}
       -
         name: Install gotestlist
         run:
@@ -387,7 +390,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ env.GO_VERSION_SEMVER }}
       -
         name: Test integration
         if: matrix.test == './...'
@@ -477,7 +480,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ env.GO_VERSION_SEMVER }}
       -
         name: Download artifacts
         uses: actions/download-artifact@v3

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG CROSS="false"
 ARG SYSTEMD="false"
-ARG GO_VERSION=1.18.6
+ARG GO_VERSION=1.19
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.6
+ARG GO_VERSION=1.19
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off

diff --git a/Dockerfile.simple b/Dockerfile.simple
@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-ARG GO_VERSION=1.18.6
+ARG GO_VERSION=1.19
 
 ARG BASE_DEBIAN_DISTRO="bullseye"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -165,10 +165,10 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG GO_VERSION=1.18.6
-ARG CONTAINERD_VERSION=v1.6.8
+ARG GO_VERSION=1.19
 ARG GOTESTSUM_VERSION=v1.8.1
 ARG GOWINRES_VERSION=v0.2.3
+ARG CONTAINERD_VERSION=v1.6.8
 
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

diff --git a/daemon/content.go b/daemon/content.go
@@ -63,7 +63,8 @@ func (cp namespacedContent) Info(ctx context.Context, dgst digest.Digest) (conte
 // If one or more fieldpaths are provided, only those
 // fields will be updated.
 // Mutable fields:
-//  labels.*
+//
+//	labels.*
 func (cp namespacedContent) Update(ctx context.Context, info content.Info, fieldpaths ...string) (content.Info, error) {
 	return cp.provider.Update(withDefaultNamespace(ctx, cp.ns), info, fieldpaths...)
 }

diff --git a/libnetwork/resolvconf/resolvconf_linux_test.go b/libnetwork/resolvconf/resolvconf_linux_test.go
@@ -77,12 +77,12 @@ nameserver 1.2.3.4 # not 4.3.2.1`: {"1.2.3.4/32"},
 
 func TestGetSearchDomains(t *testing.T) {
 	for resolv, result := range map[string][]string{
-		`search example.com`:           {"example.com"},
-		`search example.com # ignored`: {"example.com"},
-		`	  search	 example.com	  `: {"example.com"},
-		`	  search	 example.com	  # ignored`: {"example.com"},
-		`search foo.example.com example.com`: {"foo.example.com", "example.com"},
-		`	   search	   foo.example.com	 example.com	`: {"foo.example.com", "example.com"},
+		`search example.com`:                                   {"example.com"},
+		`search example.com # ignored`:                         {"example.com"},
+		`	  search	 example.com	  `:                            {"example.com"},
+		`	  search	 example.com	  # ignored`:                   {"example.com"},
+		`search foo.example.com example.com`:                   {"foo.example.com", "example.com"},
+		`	   search	   foo.example.com	 example.com	`:          {"foo.example.com", "example.com"},
 		`	   search	   foo.example.com	 example.com	# ignored`: {"foo.example.com", "example.com"},
 		``:          {},
 		`# ignored`: {},
@@ -104,13 +104,13 @@ nameserver 4.30.20.100`: {"foo.example.com", "example.com"},
 
 func TestGetOptions(t *testing.T) {
 	for resolv, result := range map[string][]string{
-		`options opt1`:           {"opt1"},
-		`options opt1 # ignored`: {"opt1"},
-		`	  options	 opt1	  `: {"opt1"},
-		`	  options	 opt1	  # ignored`: {"opt1"},
-		`options opt1 opt2 opt3`:           {"opt1", "opt2", "opt3"},
-		`options opt1 opt2 opt3 # ignored`: {"opt1", "opt2", "opt3"},
-		`	   options	 opt1	 opt2	 opt3	`: {"opt1", "opt2", "opt3"},
+		`options opt1`:                            {"opt1"},
+		`options opt1 # ignored`:                  {"opt1"},
+		`	  options	 opt1	  `:                     {"opt1"},
+		`	  options	 opt1	  # ignored`:            {"opt1"},
+		`options opt1 opt2 opt3`:                  {"opt1", "opt2", "opt3"},
+		`options opt1 opt2 opt3 # ignored`:        {"opt1", "opt2", "opt3"},
+		`	   options	 opt1	 opt2	 opt3	`:          {"opt1", "opt2", "opt3"},
 		`	   options	 opt1	 opt2	 opt3	# ignored`: {"opt1", "opt2", "opt3"},
 		``:                   {},
 		`# ignored`:          {},