From 6fe1eb02b9a9cc70d74d17edfb0a6a2a99583012 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Tue, 9 Jul 2024 08:31:26 +0530 Subject: [PATCH] sort based on goimports Signed-off-by: Akhil Mohan --- container/containerd/client.go | 10 +++++----- container/containerd/factory_test.go | 5 +++-- container/containerd/handler.go | 3 +-- container/containerd/namespaces/context.go | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/container/containerd/client.go b/container/containerd/client.go index 10c9d4b2f6..ff5625170a 100644 --- a/container/containerd/client.go +++ b/container/containerd/client.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "google.golang.org/grpc" - "google.golang.org/grpc/backoff" - "google.golang.org/grpc/credentials/insecure" - emptypb "google.golang.org/protobuf/types/known/emptypb" - containersapi "github.com/containerd/containerd/api/services/containers/v1" tasksapi "github.com/containerd/containerd/api/services/tasks/v1" versionapi "github.com/containerd/containerd/api/services/version/v1" tasktypes "github.com/containerd/containerd/api/types/task" "github.com/containerd/errdefs" + "google.golang.org/grpc" + "google.golang.org/grpc/backoff" + "google.golang.org/grpc/credentials/insecure" + emptypb "google.golang.org/protobuf/types/known/emptypb" + "github.com/google/cadvisor/container/containerd/containers" "github.com/google/cadvisor/container/containerd/pkg/dialer" ) diff --git a/container/containerd/factory_test.go b/container/containerd/factory_test.go index 57b7d2c0ce..fcd516f4f1 100644 --- a/container/containerd/factory_test.go +++ b/container/containerd/factory_test.go @@ -15,12 +15,13 @@ package containerd import ( - "github.com/containerd/typeurl/v2" "testing" - "github.com/google/cadvisor/container/containerd/containers" + "github.com/containerd/typeurl/v2" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" + + "github.com/google/cadvisor/container/containerd/containers" ) func TestIsContainerName(t *testing.T) { diff --git a/container/containerd/handler.go b/container/containerd/handler.go index dd6277e6a7..7746341cd9 100644 --- a/container/containerd/handler.go +++ b/container/containerd/handler.go @@ -24,9 +24,8 @@ import ( "github.com/containerd/errdefs" "github.com/opencontainers/runc/libcontainer/cgroups" - "golang.org/x/net/context" - specs "github.com/opencontainers/runtime-spec/specs-go" + "golang.org/x/net/context" "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/common" diff --git a/container/containerd/namespaces/context.go b/container/containerd/namespaces/context.go index c2f76c115d..36c52d81df 100644 --- a/container/containerd/namespaces/context.go +++ b/container/containerd/namespaces/context.go @@ -34,8 +34,9 @@ import ( "os" "github.com/containerd/errdefs" - "github.com/google/cadvisor/container/containerd/identifiers" "github.com/pkg/errors" + + "github.com/google/cadvisor/container/containerd/identifiers" ) const (