From 1dfd845f51e0ca8d5d0b101e6e2b7dbbb78560dc Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Fri, 25 Nov 2022 11:07:28 +0800 Subject: [PATCH] runtime: go fix code for 1.19 We have starting to use golang 1.19, some features are not supported later, so run `go fix` to fix them. Fixes: #5750 Signed-off-by: Bin Liu --- src/runtime/cmd/kata-runtime/kata-check_generic_test.go | 1 - src/runtime/cmd/kata-runtime/kata-env_generic_test.go | 1 - src/runtime/go.mod | 2 +- src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go | 1 - src/runtime/pkg/resourcecontrol/cgroups.go | 1 - src/runtime/virtcontainers/acrn.go | 1 - src/runtime/virtcontainers/acrn_arch_base.go | 1 - src/runtime/virtcontainers/acrn_test.go | 1 - src/runtime/virtcontainers/agent.go | 2 +- src/runtime/virtcontainers/clh.go | 1 - src/runtime/virtcontainers/clh_test.go | 1 - src/runtime/virtcontainers/fc.go | 1 - src/runtime/virtcontainers/fc_metrics.go | 1 - src/runtime/virtcontainers/fc_test.go | 1 - src/runtime/virtcontainers/ipvlan_endpoint.go | 1 - src/runtime/virtcontainers/ipvlan_endpoint_test.go | 1 - src/runtime/virtcontainers/kata_agent.go | 2 +- src/runtime/virtcontainers/macvlan_endpoint.go | 1 - src/runtime/virtcontainers/macvlan_endpoint_test.go | 1 - src/runtime/virtcontainers/macvtap_endpoint.go | 1 - src/runtime/virtcontainers/macvtap_endpoint_test.go | 1 - src/runtime/virtcontainers/mock_agent.go | 2 +- src/runtime/virtcontainers/physical_endpoint.go | 1 - src/runtime/virtcontainers/physical_endpoint_test.go | 1 - src/runtime/virtcontainers/qemu.go | 1 - src/runtime/virtcontainers/qemu_amd64.go | 1 - src/runtime/virtcontainers/qemu_amd64_test.go | 1 - src/runtime/virtcontainers/qemu_arch_base.go | 1 - src/runtime/virtcontainers/qemu_arch_base_test.go | 1 - src/runtime/virtcontainers/qemu_arm64.go | 1 - src/runtime/virtcontainers/qemu_arm64_test.go | 1 - src/runtime/virtcontainers/qemu_ppc64le.go | 1 - src/runtime/virtcontainers/qemu_ppc64le_test.go | 1 - src/runtime/virtcontainers/qemu_s390x.go | 1 - src/runtime/virtcontainers/qemu_s390x_test.go | 1 - src/runtime/virtcontainers/qemu_test.go | 1 - src/runtime/virtcontainers/tap_endpoint.go | 1 - src/runtime/virtcontainers/tuntap_endpoint.go | 1 - src/runtime/virtcontainers/utils/utils_linux_generic.go | 1 - src/runtime/virtcontainers/veth_endpoint.go | 1 - src/runtime/virtcontainers/veth_endpoint_test.go | 1 - src/runtime/virtcontainers/vhostuser_endpoint.go | 1 - src/runtime/virtcontainers/vhostuser_endpoint_test.go | 1 - 43 files changed, 4 insertions(+), 43 deletions(-) diff --git a/src/runtime/cmd/kata-runtime/kata-check_generic_test.go b/src/runtime/cmd/kata-runtime/kata-check_generic_test.go index 6584b66e04..18e722e431 100644 --- a/src/runtime/cmd/kata-runtime/kata-check_generic_test.go +++ b/src/runtime/cmd/kata-runtime/kata-check_generic_test.go @@ -4,7 +4,6 @@ // //go:build arm64 || ppc64le -// +build arm64 ppc64le package main diff --git a/src/runtime/cmd/kata-runtime/kata-env_generic_test.go b/src/runtime/cmd/kata-runtime/kata-env_generic_test.go index 8e22ba74ae..ca862338ba 100644 --- a/src/runtime/cmd/kata-runtime/kata-env_generic_test.go +++ b/src/runtime/cmd/kata-runtime/kata-env_generic_test.go @@ -4,7 +4,6 @@ // //go:build arm64 || ppc64le -// +build arm64 ppc64le package main diff --git a/src/runtime/go.mod b/src/runtime/go.mod index 54d5742d8a..895f62c629 100644 --- a/src/runtime/go.mod +++ b/src/runtime/go.mod @@ -50,7 +50,6 @@ require ( go.opentelemetry.io/otel/exporters/jaeger v1.0.0 go.opentelemetry.io/otel/sdk v1.3.0 go.opentelemetry.io/otel/trace v1.3.0 - golang.org/x/net v0.0.0-20220722155237-a158d28d115b golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f google.golang.org/grpc v1.47.0 @@ -99,6 +98,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect go.mongodb.org/mongo-driver v1.7.5 // indirect go.opencensus.io v0.23.0 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go b/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go index 26b2ac5474..ec70767d73 100644 --- a/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go +++ b/src/runtime/pkg/govmm/qemu/qemu_arch_base_test.go @@ -1,5 +1,4 @@ //go:build !s390x -// +build !s390x // Copyright contributors to the Virtual Machine Manager for Go project // diff --git a/src/runtime/pkg/resourcecontrol/cgroups.go b/src/runtime/pkg/resourcecontrol/cgroups.go index 9434cd8977..da88820efa 100644 --- a/src/runtime/pkg/resourcecontrol/cgroups.go +++ b/src/runtime/pkg/resourcecontrol/cgroups.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2021-2022 Apple Inc. // diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go index fec7f159b0..3863000a60 100644 --- a/src/runtime/virtcontainers/acrn.go +++ b/src/runtime/virtcontainers/acrn.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2019 Intel Corporation // diff --git a/src/runtime/virtcontainers/acrn_arch_base.go b/src/runtime/virtcontainers/acrn_arch_base.go index 7379274b07..8d8c42242f 100644 --- a/src/runtime/virtcontainers/acrn_arch_base.go +++ b/src/runtime/virtcontainers/acrn_arch_base.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2019 Intel Corporation // diff --git a/src/runtime/virtcontainers/acrn_test.go b/src/runtime/virtcontainers/acrn_test.go index 25c79f9606..9ce189812c 100644 --- a/src/runtime/virtcontainers/acrn_test.go +++ b/src/runtime/virtcontainers/acrn_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2019 Intel Corporation // diff --git a/src/runtime/virtcontainers/agent.go b/src/runtime/virtcontainers/agent.go index 90730153e3..dc5d1d9adb 100644 --- a/src/runtime/virtcontainers/agent.go +++ b/src/runtime/virtcontainers/agent.go @@ -9,12 +9,12 @@ import ( "syscall" "time" + "context" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" pbTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" specs "github.com/opencontainers/runtime-spec/specs-go" - "golang.org/x/net/context" ) type newAgentFuncKey struct{} diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index afe48b8040..92089a537b 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2019 Ericsson Eurolab Deutschland GmbH // diff --git a/src/runtime/virtcontainers/clh_test.go b/src/runtime/virtcontainers/clh_test.go index e8f02101e8..6865f4b1f1 100644 --- a/src/runtime/virtcontainers/clh_test.go +++ b/src/runtime/virtcontainers/clh_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2019 Ericsson Eurolab Deutschland G.m.b.H. // diff --git a/src/runtime/virtcontainers/fc.go b/src/runtime/virtcontainers/fc.go index dc86f6b405..4fb1dddfe1 100644 --- a/src/runtime/virtcontainers/fc.go +++ b/src/runtime/virtcontainers/fc.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/fc_metrics.go b/src/runtime/virtcontainers/fc_metrics.go index 32cbd5c1d2..90832707b3 100644 --- a/src/runtime/virtcontainers/fc_metrics.go +++ b/src/runtime/virtcontainers/fc_metrics.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2020 Ant Group // diff --git a/src/runtime/virtcontainers/fc_test.go b/src/runtime/virtcontainers/fc_test.go index 78ab704eea..64bde22322 100644 --- a/src/runtime/virtcontainers/fc_test.go +++ b/src/runtime/virtcontainers/fc_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2019 Intel Corporation // diff --git a/src/runtime/virtcontainers/ipvlan_endpoint.go b/src/runtime/virtcontainers/ipvlan_endpoint.go index 53a57e740d..f3da40e88e 100644 --- a/src/runtime/virtcontainers/ipvlan_endpoint.go +++ b/src/runtime/virtcontainers/ipvlan_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/ipvlan_endpoint_test.go b/src/runtime/virtcontainers/ipvlan_endpoint_test.go index 7fe33d166b..2bec272e6f 100644 --- a/src/runtime/virtcontainers/ipvlan_endpoint_test.go +++ b/src/runtime/virtcontainers/ipvlan_endpoint_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/kata_agent.go b/src/runtime/virtcontainers/kata_agent.go index f10f81daea..c5b49e59b6 100644 --- a/src/runtime/virtcontainers/kata_agent.go +++ b/src/runtime/virtcontainers/kata_agent.go @@ -34,10 +34,10 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" + "context" "github.com/gogo/protobuf/proto" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" - "golang.org/x/net/context" "golang.org/x/sys/unix" "google.golang.org/grpc/codes" grpcStatus "google.golang.org/grpc/status" diff --git a/src/runtime/virtcontainers/macvlan_endpoint.go b/src/runtime/virtcontainers/macvlan_endpoint.go index 061a36f156..76dc911a8b 100644 --- a/src/runtime/virtcontainers/macvlan_endpoint.go +++ b/src/runtime/virtcontainers/macvlan_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/macvlan_endpoint_test.go b/src/runtime/virtcontainers/macvlan_endpoint_test.go index 896be917e3..8e0e9a2b69 100644 --- a/src/runtime/virtcontainers/macvlan_endpoint_test.go +++ b/src/runtime/virtcontainers/macvlan_endpoint_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/macvtap_endpoint.go b/src/runtime/virtcontainers/macvtap_endpoint.go index 1a2452cf1b..d223c0bc76 100644 --- a/src/runtime/virtcontainers/macvtap_endpoint.go +++ b/src/runtime/virtcontainers/macvtap_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/macvtap_endpoint_test.go b/src/runtime/virtcontainers/macvtap_endpoint_test.go index 6b7e009434..3787f2b151 100644 --- a/src/runtime/virtcontainers/macvtap_endpoint_test.go +++ b/src/runtime/virtcontainers/macvtap_endpoint_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/mock_agent.go b/src/runtime/virtcontainers/mock_agent.go index a3c4d44b06..67ec52319a 100644 --- a/src/runtime/virtcontainers/mock_agent.go +++ b/src/runtime/virtcontainers/mock_agent.go @@ -9,12 +9,12 @@ import ( "syscall" "time" + "context" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" pbTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" specs "github.com/opencontainers/runtime-spec/specs-go" - "golang.org/x/net/context" ) // mockAgent is an empty Agent implementation, for testing and diff --git a/src/runtime/virtcontainers/physical_endpoint.go b/src/runtime/virtcontainers/physical_endpoint.go index ea64ba926b..b71e512d7b 100644 --- a/src/runtime/virtcontainers/physical_endpoint.go +++ b/src/runtime/virtcontainers/physical_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/physical_endpoint_test.go b/src/runtime/virtcontainers/physical_endpoint_test.go index cac41358f2..bba7f7d1c7 100644 --- a/src/runtime/virtcontainers/physical_endpoint_test.go +++ b/src/runtime/virtcontainers/physical_endpoint_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index 2933f854c7..d33f02f6ed 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2016 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index 233fafcc0d..124fd4534c 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu_amd64_test.go b/src/runtime/virtcontainers/qemu_amd64_test.go index 73641ab455..33d506dcd4 100644 --- a/src/runtime/virtcontainers/qemu_amd64_test.go +++ b/src/runtime/virtcontainers/qemu_amd64_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu_arch_base.go b/src/runtime/virtcontainers/qemu_arch_base.go index 07282afa78..e16c285ab7 100644 --- a/src/runtime/virtcontainers/qemu_arch_base.go +++ b/src/runtime/virtcontainers/qemu_arch_base.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu_arch_base_test.go b/src/runtime/virtcontainers/qemu_arch_base_test.go index 41d3bbd430..37611bb5bb 100644 --- a/src/runtime/virtcontainers/qemu_arch_base_test.go +++ b/src/runtime/virtcontainers/qemu_arch_base_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu_arm64.go b/src/runtime/virtcontainers/qemu_arm64.go index 378b89c6d7..ccf164139e 100644 --- a/src/runtime/virtcontainers/qemu_arm64.go +++ b/src/runtime/virtcontainers/qemu_arm64.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/qemu_arm64_test.go b/src/runtime/virtcontainers/qemu_arm64_test.go index 15ae382223..07e67ac8c1 100644 --- a/src/runtime/virtcontainers/qemu_arm64_test.go +++ b/src/runtime/virtcontainers/qemu_arm64_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 IBM // diff --git a/src/runtime/virtcontainers/qemu_ppc64le.go b/src/runtime/virtcontainers/qemu_ppc64le.go index 6e62551b62..7f6de2fcd9 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le.go +++ b/src/runtime/virtcontainers/qemu_ppc64le.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 IBM // diff --git a/src/runtime/virtcontainers/qemu_ppc64le_test.go b/src/runtime/virtcontainers/qemu_ppc64le_test.go index fd59f51b3a..85e1dfe805 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le_test.go +++ b/src/runtime/virtcontainers/qemu_ppc64le_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 IBM // diff --git a/src/runtime/virtcontainers/qemu_s390x.go b/src/runtime/virtcontainers/qemu_s390x.go index 46a1af4ad5..422db2b87d 100644 --- a/src/runtime/virtcontainers/qemu_s390x.go +++ b/src/runtime/virtcontainers/qemu_s390x.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 IBM // diff --git a/src/runtime/virtcontainers/qemu_s390x_test.go b/src/runtime/virtcontainers/qemu_s390x_test.go index 909e1b87ea..24a67bdd9e 100644 --- a/src/runtime/virtcontainers/qemu_s390x_test.go +++ b/src/runtime/virtcontainers/qemu_s390x_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 IBM // diff --git a/src/runtime/virtcontainers/qemu_test.go b/src/runtime/virtcontainers/qemu_test.go index b932189e8d..f30dd0a696 100644 --- a/src/runtime/virtcontainers/qemu_test.go +++ b/src/runtime/virtcontainers/qemu_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2016 Intel Corporation // diff --git a/src/runtime/virtcontainers/tap_endpoint.go b/src/runtime/virtcontainers/tap_endpoint.go index 62b855382b..4bd88d50fd 100644 --- a/src/runtime/virtcontainers/tap_endpoint.go +++ b/src/runtime/virtcontainers/tap_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Huawei Corporation // diff --git a/src/runtime/virtcontainers/tuntap_endpoint.go b/src/runtime/virtcontainers/tuntap_endpoint.go index 888e666ef7..c76fef5add 100644 --- a/src/runtime/virtcontainers/tuntap_endpoint.go +++ b/src/runtime/virtcontainers/tuntap_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Huawei Corporation // Copyright (c) 2019 Intel Corporation diff --git a/src/runtime/virtcontainers/utils/utils_linux_generic.go b/src/runtime/virtcontainers/utils/utils_linux_generic.go index bf57f77e2e..b3d12f2999 100644 --- a/src/runtime/virtcontainers/utils/utils_linux_generic.go +++ b/src/runtime/virtcontainers/utils/utils_linux_generic.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 || s390x || !ppc64le -// +build amd64 arm64 s390x !ppc64le // Copyright (c) 2019 IBM // diff --git a/src/runtime/virtcontainers/veth_endpoint.go b/src/runtime/virtcontainers/veth_endpoint.go index 52a7ae4795..e3ed63d707 100644 --- a/src/runtime/virtcontainers/veth_endpoint.go +++ b/src/runtime/virtcontainers/veth_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/veth_endpoint_test.go b/src/runtime/virtcontainers/veth_endpoint_test.go index c6ae2ce67b..dc6f03270a 100644 --- a/src/runtime/virtcontainers/veth_endpoint_test.go +++ b/src/runtime/virtcontainers/veth_endpoint_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/vhostuser_endpoint.go b/src/runtime/virtcontainers/vhostuser_endpoint.go index 55f37f1893..6656f33dc2 100644 --- a/src/runtime/virtcontainers/vhostuser_endpoint.go +++ b/src/runtime/virtcontainers/vhostuser_endpoint.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation // diff --git a/src/runtime/virtcontainers/vhostuser_endpoint_test.go b/src/runtime/virtcontainers/vhostuser_endpoint_test.go index c75930ff6e..a49a3e61e0 100644 --- a/src/runtime/virtcontainers/vhostuser_endpoint_test.go +++ b/src/runtime/virtcontainers/vhostuser_endpoint_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux // Copyright (c) 2018 Intel Corporation //