refactor: split coderd/gitauth into two, add cli/gitauth

mafredri · mafredri · commit 055fc2e7e8e6 · 2023-09-01T10:28:42.000Z
Ref: #9380
diff --git 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
@@ -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/cli/gitauth/askpass.go b/cli/gitauth/askpass.go
diff --git a/cli/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/cli/gitauth/vscode.go b/cli/gitauth/vscode.go
diff --git a/cli/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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/v2/cli/clibase"`
`13`	`13`	`"github.com/coder/coder/v2/cli/cliui"`
`14`		`- "github.com/coder/coder/v2/coderd/gitauth"`
	`14`	`+ "github.com/coder/coder/v2/cli/gitauth"`
`15`	`15`	`"github.com/coder/coder/v2/codersdk"`
`16`	`16`	`"github.com/coder/retry"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/stretchr/testify/require"`
`7`	`7`
`8`		`- "github.com/coder/coder/v2/coderd/gitauth"`
	`8`	`+ "github.com/coder/coder/v2/cli/gitauth"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestCheckCommand(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/spf13/afero"`
`11`	`11`	`"github.com/stretchr/testify/require"`
`12`	`12`
`13`		`- "github.com/coder/coder/v2/coderd/gitauth"`
	`13`	`+ "github.com/coder/coder/v2/cli/gitauth"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestOverrideVSCodeConfigs(t *testing.T) {`