From 702b064cacafe5a943705fb30cabfd802b11a230 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 1 Sep 2023 18:41:22 +0300 Subject: [PATCH] refactor: split coderd/gitauth into two, add cli/gitauth (#9479) * refactor: split coderd/gitauth into two, add cli/gitauth Ref: #9380 --- agent/agent.go | 2 +- cli/gitaskpass.go | 2 +- {coderd => cli}/gitauth/askpass.go | 0 {coderd => cli}/gitauth/askpass_test.go | 2 +- {coderd => cli}/gitauth/vscode.go | 0 {coderd => cli}/gitauth/vscode_test.go | 2 +- cli/root.go | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename {coderd => cli}/gitauth/askpass.go (100%) rename {coderd => cli}/gitauth/askpass_test.go (97%) rename {coderd => cli}/gitauth/vscode.go (100%) rename {coderd => cli}/gitauth/vscode_test.go (97%) diff --git a/agent/agent.go b/agent/agent.go index 532e7e5a88..48cc3fa009 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -37,8 +37,8 @@ import ( "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/agent/reconnectingpty" "github.com/coder/coder/v2/buildinfo" + "github.com/coder/coder/v2/cli/gitauth" "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/gitauth" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/tailnet" diff --git a/cli/gitaskpass.go b/cli/gitaskpass.go index 4868eea95a..b7636494c3 100644 --- a/cli/gitaskpass.go +++ b/cli/gitaskpass.go @@ -11,7 +11,7 @@ import ( "github.com/coder/coder/v2/cli/clibase" "github.com/coder/coder/v2/cli/cliui" - "github.com/coder/coder/v2/coderd/gitauth" + "github.com/coder/coder/v2/cli/gitauth" "github.com/coder/coder/v2/codersdk" "github.com/coder/retry" ) diff --git a/coderd/gitauth/askpass.go b/cli/gitauth/askpass.go similarity index 100% rename from coderd/gitauth/askpass.go rename to cli/gitauth/askpass.go diff --git a/coderd/gitauth/askpass_test.go b/cli/gitauth/askpass_test.go similarity index 97% rename from coderd/gitauth/askpass_test.go rename to cli/gitauth/askpass_test.go index 72fd6319a2..d70e791c97 100644 --- a/coderd/gitauth/askpass_test.go +++ b/cli/gitauth/askpass_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/coder/v2/coderd/gitauth" + "github.com/coder/coder/v2/cli/gitauth" ) func TestCheckCommand(t *testing.T) { diff --git a/coderd/gitauth/vscode.go b/cli/gitauth/vscode.go similarity index 100% rename from coderd/gitauth/vscode.go rename to cli/gitauth/vscode.go diff --git a/coderd/gitauth/vscode_test.go b/cli/gitauth/vscode_test.go similarity index 97% rename from coderd/gitauth/vscode_test.go rename to cli/gitauth/vscode_test.go index f940f151aa..7bff62fafd 100644 --- a/coderd/gitauth/vscode_test.go +++ b/cli/gitauth/vscode_test.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/require" - "github.com/coder/coder/v2/coderd/gitauth" + "github.com/coder/coder/v2/cli/gitauth" ) func TestOverrideVSCodeConfigs(t *testing.T) { diff --git a/cli/root.go b/cli/root.go index 3d0daafbfa..3849738817 100644 --- a/cli/root.go +++ b/cli/root.go @@ -35,7 +35,7 @@ import ( "github.com/coder/coder/v2/cli/clibase" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/config" - "github.com/coder/coder/v2/coderd/gitauth" + "github.com/coder/coder/v2/cli/gitauth" "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk"