From e2c402118cba0e84f1e360d2173017ce44646ae0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 21 Mar 2023 16:53:03 +0100 Subject: [PATCH 1/2] cli/command: ElectAuthServer: fix deprecation comment The comment was not formatted correctly, and because of that not picked up as being deprecated. updates b4ca1c7368daeead400fcc1b8f2d61951a0d9d1e Signed-off-by: Sebastiaan van Stijn (cherry picked from commit e3fa7280ad8bcb478aa5ce708b356bbe8dcf5e9c) Signed-off-by: Sebastiaan van Stijn --- cli/command/registry.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/command/registry.go b/cli/command/registry.go index 94b0c4171a..9958b7c0f8 100644 --- a/cli/command/registry.go +++ b/cli/command/registry.go @@ -21,8 +21,9 @@ import ( "github.com/pkg/errors" ) -// ElectAuthServer returns the default registry to use -// Deprecated: use registry.IndexServer instead +// ElectAuthServer returns the default registry to use. +// +// Deprecated: use [registry.IndexServer] instead. func ElectAuthServer(_ context.Context, _ Cli) string { return registry.IndexServer } From 114e17ac4bb56a14c64fa6a0697d790b70c0cbdc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 21 Mar 2023 16:55:34 +0100 Subject: [PATCH 2/2] cli/command: fix imports formatting Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 742881fc58e334b6cc9e27ce6034eb4414edd1aa) Signed-off-by: Sebastiaan van Stijn --- cli/command/registry_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cli/command/registry_test.go b/cli/command/registry_test.go index b7d3e82116..be518e3175 100644 --- a/cli/command/registry_test.go +++ b/cli/command/registry_test.go @@ -6,16 +6,13 @@ import ( "fmt" "testing" - "gotest.tools/v3/assert" - is "gotest.tools/v3/assert/cmp" - - // Prevents a circular import with "github.com/docker/cli/internal/test" - - . "github.com/docker/cli/cli/command" + . "github.com/docker/cli/cli/command" // Prevents a circular import with "github.com/docker/cli/internal/test" configtypes "github.com/docker/cli/cli/config/types" "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/client" + "gotest.tools/v3/assert" + is "gotest.tools/v3/assert/cmp" ) type fakeClient struct {