Update to Go 1.17.0, and gofmt with Go 1.17

Movified from 686be57d0a, and re-ran
gofmt again to address for files not present in 20.10 and vice-versa.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 686be57d0a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Dockerfile

@@ -3,7 +3,7 @@
 ARG CROSS="false"
 ARG SYSTEMD="false"
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.0
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG DOCKER_BUILDTAGS="apparmor seccomp"

Dockerfile.e2e

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.0
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off

Dockerfile.simple

@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.0
 
 FROM golang:${GO_VERSION}-buster
 ENV GO111MODULE=off

Dockerfile.windows

@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.0
 ARG GOTESTSUM_VERSION=v1.7.0
 
 # Environment variable notes:

api/common_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package api // import "github.com/docker/docker/api"

api/types/container/hostconfig_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/api/types/container"

builder/builder-next/executor_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package buildkit

builder/builder-next/worker/gc_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package worker

builder/builder-next/worker/gc_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package worker

builder/dockerfile/builder_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

builder/dockerfile/copy_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

builder/dockerfile/dispatchers_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

builder/dockerfile/dispatchers_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

builder/dockerfile/dispatchers_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

builder/dockerfile/internals_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

client/client_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd || openbsd || netbsd || darwin || solaris || illumos || dragonfly
 // +build linux freebsd openbsd netbsd darwin solaris illumos dragonfly
 
 package client // import "github.com/docker/docker/client"

cmd/dockerd/config_common_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package main

cmd/dockerd/config_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package main

cmd/dockerd/config_unix_test.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package main

cmd/dockerd/daemon_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

cmd/dockerd/daemon_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

cmd/dockerd/docker_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

cmd/dockerd/service_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

container/container_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/container"

container/mounts_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/container"

contrib/docker-device-tool/device_tool.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

daemon/apparmor_default.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/apparmor_default_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/archive_tarcopyoptions_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/archive_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/cluster/executor/container/health_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"

daemon/cluster/executor/container/validate_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"

daemon/cluster/executor/container/validate_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"

daemon/cluster/listen_addr_others.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package cluster // import "github.com/docker/docker/daemon/cluster"

daemon/config/config_common_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package config // import "github.com/docker/docker/daemon/config"

daemon/config/config_common_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config // import "github.com/docker/docker/daemon/config"

daemon/config/config_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package config // import "github.com/docker/docker/daemon/config"

daemon/config/config_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config // import "github.com/docker/docker/daemon/config"

daemon/config/config_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config // import "github.com/docker/docker/daemon/config"

daemon/configs_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/container_linux.go

@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/container_operations_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/container_unix_test.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package daemon

daemon/create_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/daemon_linux_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/daemon_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/daemon_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/daemon_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux && !freebsd && !windows
 // +build !linux,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/daemon_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/debugtrap_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/debugtrap_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !freebsd && !windows
 // +build !linux,!darwin,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"

daemon/exec_linux_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package daemon

daemon/graphdriver/aufs/aufs.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

daemon/graphdriver/aufs/aufs_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

daemon/graphdriver/aufs/dirs.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

daemon/graphdriver/aufs/mount.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

daemon/graphdriver/btrfs/btrfs.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

daemon/graphdriver/btrfs/btrfs_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

daemon/graphdriver/btrfs/dummy_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux || !cgo
 // +build !linux !cgo
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

daemon/graphdriver/btrfs/version.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

daemon/graphdriver/btrfs/version_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

daemon/graphdriver/copy/copy.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package copy // import "github.com/docker/docker/daemon/graphdriver/copy"

daemon/graphdriver/copy/copy_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package copy // import "github.com/docker/docker/daemon/graphdriver/copy"

daemon/graphdriver/devmapper/deviceset.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

daemon/graphdriver/devmapper/devmapper_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

daemon/graphdriver/devmapper/driver.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

daemon/graphdriver/devmapper/mount.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

daemon/graphdriver/driver_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux && !windows && !freebsd
 // +build !linux,!windows,!freebsd
 
 package graphdriver // import "github.com/docker/docker/daemon/graphdriver"

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

daemon/graphdriver/graphtest/graphbench_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

daemon/graphdriver/graphtest/graphtest_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

daemon/graphdriver/graphtest/testutil_unix.go

@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

daemon/graphdriver/lcow/lcow.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 // Locale:      en-gb

daemon/graphdriver/lcow/lcow_svm.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"

daemon/graphdriver/lcow/remotefs.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"

daemon/graphdriver/lcow/remotefs_file.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"

daemon/graphdriver/lcow/remotefs_filedriver.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"

daemon/graphdriver/lcow/remotefs_pathdriver.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"

daemon/graphdriver/overlay/overlay.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

daemon/graphdriver/overlay/overlay_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

daemon/graphdriver/overlay/overlay_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

daemon/graphdriver/overlay2/check.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

daemon/graphdriver/overlay2/mount.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

daemon/graphdriver/overlay2/overlay.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

daemon/graphdriver/overlay2/overlay_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

daemon/graphdriver/overlay2/overlay_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

daemon/graphdriver/overlayutils/overlayutils.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlayutils // import "github.com/docker/docker/daemon/graphdriver/overlayutils"

daemon/graphdriver/overlayutils/randomid.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package overlayutils // import "github.com/docker/docker/daemon/graphdriver/overlayutils"

daemon/graphdriver/overlayutils/userxattr.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 // Forked from https://github.com/containerd/containerd/blob/9ade247b38b5a685244e1391c86ff41ab109556e/snapshots/overlay/check.go

daemon/graphdriver/register/register_aufs.go

@@ -1,3 +1,4 @@
+//go:build !exclude_graphdriver_aufs && linux
 // +build !exclude_graphdriver_aufs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/register/register_btrfs.go

@@ -1,3 +1,4 @@
+//go:build !exclude_graphdriver_btrfs && linux
 // +build !exclude_graphdriver_btrfs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/register/register_devicemapper.go

@@ -1,3 +1,4 @@
+//go:build !exclude_graphdriver_devicemapper && !static_build && linux
 // +build !exclude_graphdriver_devicemapper,!static_build,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/register/register_fuseoverlayfs.go

@@ -1,3 +1,4 @@
+//go:build !exclude_graphdriver_fuseoverlayfs && linux
 // +build !exclude_graphdriver_fuseoverlayfs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/register/register_overlay.go

@@ -1,3 +1,4 @@
+//go:build !exclude_graphdriver_overlay && linux
 // +build !exclude_graphdriver_overlay,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/register/register_overlay2.go

@@ -1,3 +1,4 @@
+//go:build !exclude_graphdriver_overlay2 && linux
 // +build !exclude_graphdriver_overlay2,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/register/register_zfs.go

@@ -1,3 +1,4 @@
+//go:build (!exclude_graphdriver_zfs && linux) || (!exclude_graphdriver_zfs && freebsd)
 // +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"

daemon/graphdriver/vfs/copy_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"

daemon/graphdriver/vfs/quota_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"