From 479c7add4d9318fde5d43b6b71e6ea720375f207 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 25 Apr 2025 18:07:28 +0200 Subject: [PATCH] cli/internal/oauth: move to top-level "internal" Signed-off-by: Sebastiaan van Stijn --- cli/command/registry/login.go | 2 +- cli/command/registry/logout.go | 2 +- {cli/internal => internal}/oauth/api/api.go | 0 {cli/internal => internal}/oauth/api/api_test.go | 0 {cli/internal => internal}/oauth/api/state.go | 0 {cli/internal => internal}/oauth/jwt.go | 0 {cli/internal => internal}/oauth/manager/manager.go | 4 ++-- {cli/internal => internal}/oauth/manager/manager_test.go | 2 +- {cli/internal => internal}/oauth/manager/util.go | 0 9 files changed, 5 insertions(+), 5 deletions(-) rename {cli/internal => internal}/oauth/api/api.go (100%) rename {cli/internal => internal}/oauth/api/api_test.go (100%) rename {cli/internal => internal}/oauth/api/state.go (100%) rename {cli/internal => internal}/oauth/jwt.go (100%) rename {cli/internal => internal}/oauth/manager/manager.go (98%) rename {cli/internal => internal}/oauth/manager/manager_test.go (99%) rename {cli/internal => internal}/oauth/manager/util.go (100%) diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index c33de68b5f..771cc3270a 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -13,7 +13,7 @@ import ( "github.com/docker/cli/cli/command/completion" "github.com/docker/cli/cli/config/configfile" configtypes "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/oauth/manager" + "github.com/docker/cli/internal/oauth/manager" "github.com/docker/cli/internal/tui" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" diff --git a/cli/command/registry/logout.go b/cli/command/registry/logout.go index 6b5355335a..6dc75dc585 100644 --- a/cli/command/registry/logout.go +++ b/cli/command/registry/logout.go @@ -7,7 +7,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/config/credentials" - "github.com/docker/cli/cli/internal/oauth/manager" + "github.com/docker/cli/internal/oauth/manager" "github.com/docker/docker/registry" "github.com/spf13/cobra" ) diff --git a/cli/internal/oauth/api/api.go b/internal/oauth/api/api.go similarity index 100% rename from cli/internal/oauth/api/api.go rename to internal/oauth/api/api.go diff --git a/cli/internal/oauth/api/api_test.go b/internal/oauth/api/api_test.go similarity index 100% rename from cli/internal/oauth/api/api_test.go rename to internal/oauth/api/api_test.go diff --git a/cli/internal/oauth/api/state.go b/internal/oauth/api/state.go similarity index 100% rename from cli/internal/oauth/api/state.go rename to internal/oauth/api/state.go diff --git a/cli/internal/oauth/jwt.go b/internal/oauth/jwt.go similarity index 100% rename from cli/internal/oauth/jwt.go rename to internal/oauth/jwt.go diff --git a/cli/internal/oauth/manager/manager.go b/internal/oauth/manager/manager.go similarity index 98% rename from cli/internal/oauth/manager/manager.go rename to internal/oauth/manager/manager.go index 80d4a039a3..1150064364 100644 --- a/cli/internal/oauth/manager/manager.go +++ b/internal/oauth/manager/manager.go @@ -11,9 +11,9 @@ import ( "github.com/docker/cli/cli/config/credentials" "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/oauth" - "github.com/docker/cli/cli/internal/oauth/api" "github.com/docker/cli/cli/streams" + "github.com/docker/cli/internal/oauth" + "github.com/docker/cli/internal/oauth/api" "github.com/docker/cli/internal/tui" "github.com/docker/docker/registry" "github.com/morikuni/aec" diff --git a/cli/internal/oauth/manager/manager_test.go b/internal/oauth/manager/manager_test.go similarity index 99% rename from cli/internal/oauth/manager/manager_test.go rename to internal/oauth/manager/manager_test.go index 37fae3f918..44a744999b 100644 --- a/cli/internal/oauth/manager/manager_test.go +++ b/internal/oauth/manager/manager_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/cli/cli/config/credentials" "github.com/docker/cli/cli/config/types" - "github.com/docker/cli/cli/internal/oauth/api" + "github.com/docker/cli/internal/oauth/api" "gotest.tools/v3/assert" ) diff --git a/cli/internal/oauth/manager/util.go b/internal/oauth/manager/util.go similarity index 100% rename from cli/internal/oauth/manager/util.go rename to internal/oauth/manager/util.go