Merge pull request #5903 from AkihiroSuda/gofmt117

Run `go fmt` with Go 1.17
containerd · Aug 24, 2021 · 6fa9588 · 6fa9588
2 parents 8131735 + d3aa7ee
commit 6fa9588
Show file tree

Hide file tree

Showing 186 changed files with 187 additions and 1 deletion.
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_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/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/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-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/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_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_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/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
 
 /*

diff --git a/content/local/store_openbsd.go b/content/local/store_openbsd.go
@@ -1,3 +1,4 @@
+//go:build openbsd
 // +build openbsd
 
 /*

diff --git a/content/local/store_unix.go b/content/local/store_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || solaris
 // +build linux solaris
 
 /*

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

diff --git a/contrib/apparmor/apparmor_test.go b/contrib/apparmor/apparmor_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/contrib/apparmor/template_test.go b/contrib/apparmor/template_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package apparmor

diff --git a/contrib/seccomp/seccomp_default.go b/contrib/seccomp/seccomp_default.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/contrib/seccomp/seccomp_default_unsupported.go b/contrib/seccomp/seccomp_default_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

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

diff --git a/diff/apply/apply_other.go b/diff/apply/apply_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

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

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

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

diff --git a/integration/remote/util/util_unix.go b/integration/remote/util/util_unix.go
@@ -1,3 +1,4 @@
+//go:build freebsd || linux || darwin
 // +build freebsd linux darwin
 
 /*

diff --git a/integration/remote/util/util_unsupported.go b/integration/remote/util/util_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !freebsd && !linux && !windows && !darwin
 // +build !freebsd,!linux,!windows,!darwin
 
 /*

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

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

diff --git a/integration/util/boottime_util_linux.go b/integration/util/boottime_util_linux.go
@@ -1,3 +1,4 @@
+//go:build freebsd || linux
 // +build freebsd linux
 
 /*

diff --git a/integration/util/util_unix.go b/integration/util/util_unix.go
@@ -1,3 +1,4 @@
+//go:build freebsd || linux || darwin
 // +build freebsd linux darwin
 
 /*

diff --git a/integration/util/util_unsupported.go b/integration/util/util_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !freebsd && !linux && !windows && !darwin
 // +build !freebsd,!linux,!windows,!darwin
 
 /*

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

diff --git a/metrics/cgroups/v1/blkio.go b/metrics/cgroups/v1/blkio.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/cpu.go b/metrics/cgroups/v1/cpu.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/hugetlb.go b/metrics/cgroups/v1/hugetlb.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/memory.go b/metrics/cgroups/v1/memory.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/metric.go b/metrics/cgroups/v1/metric.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/oom.go b/metrics/cgroups/v1/oom.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v1/pids.go b/metrics/cgroups/v1/pids.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/cgroups.go b/metrics/cgroups/v2/cgroups.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/cpu.go b/metrics/cgroups/v2/cpu.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/io.go b/metrics/cgroups/v2/io.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/memory.go b/metrics/cgroups/v2/memory.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/metric.go b/metrics/cgroups/v2/metric.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/cgroups/v2/pids.go b/metrics/cgroups/v2/pids.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/types/v1/types.go b/metrics/types/v1/types.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/metrics/types/v2/types.go b/metrics/types/v2/types.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

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

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

diff --git a/mount/mount_unix.go b/mount/mount_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || openbsd
 // +build darwin openbsd
 
 /*

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

diff --git a/mount/temp_unsupported.go b/mount/temp_unsupported.go
@@ -1,3 +1,4 @@
+//go:build windows || darwin
 // +build windows darwin
 
 /*

diff --git a/oci/mounts.go b/oci/mounts.go
@@ -1,3 +1,4 @@
+//go:build !freebsd
 // +build !freebsd
 
 /*