From 055fc2e7e8e6463e7c077a13e668a47273ac378e Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 1 Sep 2023 10:28:42 +0000 Subject: [PATCH 1/2] refactor: split coderd/gitauth into two, add cli/gitauth Ref: #9380 --- agent/agent.go | 5 ++--- 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, 6 insertions(+), 7 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 532e7e5a88392..df62b6e0756d3 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -37,8 +37,7 @@ 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/coderd/database" - "github.com/coder/coder/v2/coderd/gitauth" + "github.com/coder/coder/v2/cli/gitauth" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/tailnet" @@ -523,7 +522,7 @@ func (a *agent) reportLifecycleLoop(ctx context.Context) { func (a *agent) setLifecycle(ctx context.Context, state codersdk.WorkspaceAgentLifecycle) { report := agentsdk.PostLifecycleRequest{ State: state, - ChangedAt: database.Now(), + ChangedAt: time.Now().UTC(), // Like `database.Now()`, but avoid importing coderd/database. } a.lifecycleMu.Lock() diff --git a/cli/gitaskpass.go b/cli/gitaskpass.go index 4868eea95a452..b7636494c3a25 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 72fd6319a2303..d70e791c97afb 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 f940f151aadc3..7bff62fafdb06 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 3ab2f0d7f33b9..29cbca16bd2e4 100644 --- a/cli/root.go +++ b/cli/root.go @@ -35,8 +35,8 @@ 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/cli/gitauth" "github.com/coder/coder/v2/coderd" - "github.com/coder/coder/v2/coderd/gitauth" "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" From ee0461559cffa8f48b4adc0bab846eb5b8296851 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 1 Sep 2023 12:08:31 +0000 Subject: [PATCH 2/2] revert database.Now change in favor of #9482 --- agent/agent.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/agent.go b/agent/agent.go index df62b6e0756d3..48cc3fa009487 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -38,6 +38,7 @@ import ( "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/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/tailnet" @@ -522,7 +523,7 @@ func (a *agent) reportLifecycleLoop(ctx context.Context) { func (a *agent) setLifecycle(ctx context.Context, state codersdk.WorkspaceAgentLifecycle) { report := agentsdk.PostLifecycleRequest{ State: state, - ChangedAt: time.Now().UTC(), // Like `database.Now()`, but avoid importing coderd/database. + ChangedAt: database.Now(), } a.lifecycleMu.Lock()