[0.8] gofmt with go1.18

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
moby · Sep 4, 2022 · 3290ffe · 3290ffe
1 parent 3502d5d
commit 3290ffe
Show file tree

Hide file tree

Showing 74 changed files with 74 additions and 0 deletions.
diff --git a/cache/contenthash/filehash_unix.go b/cache/contenthash/filehash_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package contenthash

diff --git a/cache/contenthash/filehash_windows.go b/cache/contenthash/filehash_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package contenthash

diff --git a/client/client_unix.go b/client/client_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package client

diff --git a/cmd/buildctl/main_unix.go b/cmd/buildctl/main_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/buildkitd/config/gcpolicy_unix.go b/cmd/buildkitd/config/gcpolicy_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config

diff --git a/cmd/buildkitd/config/gcpolicy_windows.go b/cmd/buildkitd/config/gcpolicy_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config

diff --git a/cmd/buildkitd/main_containerd_worker.go b/cmd/buildkitd/main_containerd_worker.go
@@ -1,3 +1,4 @@
+//go:build (linux && !no_containerd_worker) || (windows && !no_containerd_worker)
 // +build linux,!no_containerd_worker windows,!no_containerd_worker
 
 package main

diff --git a/cmd/buildkitd/main_oci_worker.go b/cmd/buildkitd/main_oci_worker.go
@@ -1,3 +1,4 @@
+//go:build linux && !no_oci_worker
 // +build linux,!no_oci_worker
 
 package main

diff --git a/cmd/buildkitd/main_unix.go b/cmd/buildkitd/main_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/buildkitd/main_windows.go b/cmd/buildkitd/main_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package main

diff --git a/cmd/buildkitd/util_unsupported.go b/cmd/buildkitd/util_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package main

diff --git a/examples/gobuild/main.go b/examples/gobuild/main.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

diff --git a/executor/oci/spec_unix.go b/executor/oci/spec_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package oci

diff --git a/executor/oci/spec_windows.go b/executor/oci/spec_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package oci

diff --git a/executor/runcexecutor/executor_common.go b/executor/runcexecutor/executor_common.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package runcexecutor

diff --git a/frontend/dockerfile/dockerfile2llb/convert_norunnetwork.go b/frontend/dockerfile/dockerfile2llb/convert_norunnetwork.go
@@ -1,3 +1,4 @@
+//go:build !dfrunnetwork
 // +build !dfrunnetwork
 
 package dockerfile2llb

diff --git a/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go b/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go
@@ -1,3 +1,4 @@
+//go:build !dfrunsecurity
 // +build !dfrunsecurity
 
 package dockerfile2llb

diff --git a/frontend/dockerfile/dockerfile2llb/convert_runnetwork.go b/frontend/dockerfile/dockerfile2llb/convert_runnetwork.go
@@ -1,3 +1,4 @@
+//go:build dfrunnetwork
 // +build dfrunnetwork
 
 package dockerfile2llb

diff --git a/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go b/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go
@@ -1,3 +1,4 @@
+//go:build dfrunsecurity
 // +build dfrunsecurity
 
 package dockerfile2llb

diff --git a/frontend/dockerfile/dockerfile_runnetwork_test.go b/frontend/dockerfile/dockerfile_runnetwork_test.go
@@ -1,3 +1,4 @@
+//go:build dfrunnetwork
 // +build dfrunnetwork
 
 package dockerfile

diff --git a/frontend/dockerfile/dockerfile_runsecurity_test.go b/frontend/dockerfile/dockerfile_runsecurity_test.go
@@ -1,3 +1,4 @@
+//go:build dfrunsecurity
 // +build dfrunsecurity
 
 package dockerfile

diff --git a/frontend/dockerfile/instructions/commands_runnetwork.go b/frontend/dockerfile/instructions/commands_runnetwork.go
@@ -1,3 +1,4 @@
+//go:build dfrunnetwork
 // +build dfrunnetwork
 
 package instructions

diff --git a/frontend/dockerfile/instructions/commands_runsecurity.go b/frontend/dockerfile/instructions/commands_runsecurity.go
@@ -1,3 +1,4 @@
+//go:build dfrunsecurity
 // +build dfrunsecurity
 
 package instructions

diff --git a/frontend/dockerfile/instructions/errors_unix.go b/frontend/dockerfile/instructions/errors_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package instructions

diff --git a/frontend/dockerfile/shell/equal_env_unix.go b/frontend/dockerfile/shell/equal_env_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package shell

diff --git a/snapshot/localmounter_unix.go b/snapshot/localmounter_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package snapshot

diff --git a/solver/llbsolver/file/user_nolinux.go b/solver/llbsolver/file/user_nolinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package file

diff --git a/source/git/gitsource_unix.go b/source/git/gitsource_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package git

diff --git a/source/git/gitsource_windows.go b/source/git/gitsource_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package git

diff --git a/source/git/redact_credentials_go114.go b/source/git/redact_credentials_go114.go
@@ -1,3 +1,4 @@
+//go:build !go1.15
 // +build !go1.15
 
 package git

diff --git a/util/appcontext/appcontext_unix.go b/util/appcontext/appcontext_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package appcontext

diff --git a/util/appdefaults/appdefaults_unix.go b/util/appdefaults/appdefaults_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package appdefaults

diff --git a/util/archutil/386_binary.go b/util/archutil/386_binary.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 package archutil

diff --git a/util/archutil/386_check.go b/util/archutil/386_check.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 package archutil

diff --git a/util/archutil/386_check_386.go b/util/archutil/386_check_386.go
@@ -1,3 +1,4 @@
+//go:build 386
 // +build 386
 
 package archutil

diff --git a/util/archutil/amd64_binary.go b/util/archutil/amd64_binary.go
@@ -1,3 +1,4 @@
+//go:build !amd64
 // +build !amd64
 
 package archutil

diff --git a/util/archutil/amd64_check.go b/util/archutil/amd64_check.go
@@ -1,3 +1,4 @@
+//go:build !amd64
 // +build !amd64
 
 package archutil

diff --git a/util/archutil/amd64_check_amd64.go b/util/archutil/amd64_check_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package archutil

diff --git a/util/archutil/arm64_binary.go b/util/archutil/arm64_binary.go
@@ -1,3 +1,4 @@
+//go:build !arm64
 // +build !arm64
 
 package archutil

diff --git a/util/archutil/arm64_check.go b/util/archutil/arm64_check.go
@@ -1,3 +1,4 @@
+//go:build !arm64
 // +build !arm64
 
 package archutil

diff --git a/util/archutil/arm64_check_arm64.go b/util/archutil/arm64_check_arm64.go
@@ -1,3 +1,4 @@
+//go:build arm64
 // +build arm64
 
 package archutil

diff --git a/util/archutil/arm_binary.go b/util/archutil/arm_binary.go
@@ -1,3 +1,4 @@
+//go:build !arm
 // +build !arm
 
 package archutil

diff --git a/util/archutil/arm_check.go b/util/archutil/arm_check.go
@@ -1,3 +1,4 @@
+//go:build !arm
 // +build !arm
 
 package archutil

diff --git a/util/archutil/arm_check_arm.go b/util/archutil/arm_check_arm.go
@@ -1,3 +1,4 @@
+//go:build arm
 // +build arm
 
 package archutil

diff --git a/util/archutil/check_unix.go b/util/archutil/check_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package archutil

diff --git a/util/archutil/check_windows.go b/util/archutil/check_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package archutil

diff --git a/util/archutil/generate.go b/util/archutil/generate.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

diff --git a/util/archutil/ppc64le_binary.go b/util/archutil/ppc64le_binary.go
@@ -1,3 +1,4 @@
+//go:build !ppc64le
 // +build !ppc64le
 
 package archutil

diff --git a/util/archutil/ppc64le_check.go b/util/archutil/ppc64le_check.go
@@ -1,3 +1,4 @@
+//go:build !ppc64le
 // +build !ppc64le
 
 package archutil

diff --git a/util/archutil/ppc64le_check_ppc64le.go b/util/archutil/ppc64le_check_ppc64le.go
@@ -1,3 +1,4 @@
+//go:build ppc64le
 // +build ppc64le
 
 package archutil

diff --git a/util/archutil/riscv64_binary.go b/util/archutil/riscv64_binary.go
@@ -1,3 +1,4 @@
+//go:build !riscv64
 // +build !riscv64
 
 package archutil

diff --git a/util/archutil/riscv64_check.go b/util/archutil/riscv64_check.go
@@ -1,3 +1,4 @@
+//go:build !riscv64
 // +build !riscv64
 
 package archutil

diff --git a/util/archutil/riscv64_check_riscv64.go b/util/archutil/riscv64_check_riscv64.go
@@ -1,3 +1,4 @@
+//go:build riscv64
 // +build riscv64
 
 package archutil

diff --git a/util/archutil/s390x_binary.go b/util/archutil/s390x_binary.go
@@ -1,3 +1,4 @@
+//go:build !s390x
 // +build !s390x
 
 package archutil

diff --git a/util/archutil/s390x_check.go b/util/archutil/s390x_check.go
@@ -1,3 +1,4 @@
+//go:build !s390x
 // +build !s390x
 
 package archutil

diff --git a/util/archutil/s390x_check_s390x.go b/util/archutil/s390x_check_s390x.go
@@ -1,3 +1,4 @@
+//go:build s390x
 // +build s390x
 
 package archutil

diff --git a/util/network/cniprovider/cni_unsafe.go b/util/network/cniprovider/cni_unsafe.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cniprovider

diff --git a/util/network/cniprovider/createns_linux.go b/util/network/cniprovider/createns_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cniprovider

diff --git a/util/network/cniprovider/createns_unix.go b/util/network/cniprovider/createns_unix.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 package cniprovider

diff --git a/util/network/cniprovider/createns_windows.go b/util/network/cniprovider/createns_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package cniprovider

diff --git a/util/network/host.go b/util/network/host.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package network

diff --git a/util/network/netproviders/network_unix.go b/util/network/netproviders/network_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package netproviders

diff --git a/util/network/netproviders/network_windows.go b/util/network/netproviders/network_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package netproviders

diff --git a/util/rootless/specconv/specconv_nonlinux.go b/util/rootless/specconv/specconv_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package specconv

diff --git a/util/system/path_unix.go b/util/system/path_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package system

diff --git a/util/system/path_windows.go b/util/system/path_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package system

diff --git a/util/system/path_windows_test.go b/util/system/path_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package system

diff --git a/util/system/seccomp_linux.go b/util/system/seccomp_linux.go
@@ -1,3 +1,4 @@
+//go:build linux && seccomp
 // +build linux,seccomp
 
 package system

diff --git a/util/system/seccomp_nolinux.go b/util/system/seccomp_nolinux.go
@@ -1,3 +1,4 @@
+//go:build !linux && seccomp
 // +build !linux,seccomp
 
 package system

diff --git a/util/system/seccomp_noseccomp.go b/util/system/seccomp_noseccomp.go
@@ -1,3 +1,4 @@
+//go:build !seccomp
 // +build !seccomp
 
 package system

diff --git a/util/testutil/integration/sandbox_unix.go b/util/testutil/integration/sandbox_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package integration

diff --git a/util/testutil/integration/sandbox_windows.go b/util/testutil/integration/sandbox_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package integration

diff --git a/worker/containerd/containerd_test.go b/worker/containerd/containerd_test.go
@@ -1,3 +1,4 @@
+//go:build linux && !no_containerd_worker
 // +build linux,!no_containerd_worker
 
 package containerd

diff --git a/worker/runc/runc_test.go b/worker/runc/runc_test.go
@@ -1,3 +1,4 @@
+//go:build linux && !no_runc_worker
 // +build linux,!no_runc_worker
 
 package runc