fix tests

sreya · sreya · commit 2194b4d05667 · 2024-10-24T18:48:31.000Z
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -29,7 +29,6 @@ import (
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/coderdtest/oidctest"
-	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbfake"
@@ -563,7 +562,7 @@ func TestWorkspaceAgentClientCoordinate_ResumeToken(t *testing.T) {
 		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
 		clock := quartz.NewMock(t)
 		resumeTokenSigningKey, err := tailnet.GenerateResumeTokenSigningKey()
-		mgr := cryptokeys.StaticKey{
+		mgr := jwtutils.StaticKey{
 			ID:  uuid.New().String(),
 			Key: resumeTokenSigningKey[:],
 		}
@@ -635,7 +634,7 @@ func TestWorkspaceAgentClientCoordinate_ResumeToken(t *testing.T) {
 		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
 		clock := quartz.NewMock(t)
 		resumeTokenSigningKey, err := tailnet.GenerateResumeTokenSigningKey()
-		mgr := cryptokeys.StaticKey{
+		mgr := jwtutils.StaticKey{
 			ID:  uuid.New().String(),
 			Key: resumeTokenSigningKey[:],
 		}
diff --git a/coderd/workspaceapps/token_test.go b/coderd/workspaceapps/token_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/jwtutils"
 	"github.com/coder/coder/v2/coderd/workspaceapps"
 )
@@ -344,10 +343,10 @@ func Test_FromRequest(t *testing.T) {
 	})
 }
 
-func newSigner(t *testing.T) cryptokeys.StaticKey {
+func newSigner(t *testing.T) jwtutils.StaticKey {
 	t.Helper()
 
-	return cryptokeys.StaticKey{
+	return jwtutils.StaticKey{
 		ID:  "test",
 		Key: generateSecret(t, 64),
 	}
diff --git a/codersdk/workspacesdk/connector_internal_test.go b/codersdk/workspacesdk/connector_internal_test.go
@@ -24,8 +24,8 @@ import (
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/apiversion"
-	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/httpapi"
+	"github.com/coder/coder/v2/coderd/jwtutils"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/tailnet"
 	"github.com/coder/coder/v2/tailnet/proto"
@@ -166,7 +166,7 @@ func TestTailnetAPIConnector_ResumeToken(t *testing.T) {
 	clock := quartz.NewMock(t)
 	resumeTokenSigningKey, err := tailnet.GenerateResumeTokenSigningKey()
 	require.NoError(t, err)
-	mgr := cryptokeys.StaticKey{
+	mgr := jwtutils.StaticKey{
 		ID:  "123",
 		Key: resumeTokenSigningKey[:],
 	}
@@ -285,7 +285,7 @@ func TestTailnetAPIConnector_ResumeTokenFailure(t *testing.T) {
 	clock := quartz.NewMock(t)
 	resumeTokenSigningKey, err := tailnet.GenerateResumeTokenSigningKey()
 	require.NoError(t, err)
-	mgr := cryptokeys.StaticKey{
+	mgr := jwtutils.StaticKey{
 		ID:  uuid.New().String(),
 		Key: resumeTokenSigningKey[:],
 	}
diff --git a/tailnet/resume_test.go b/tailnet/resume_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/v2/coderd/cryptokeys"
+	"github.com/coder/coder/v2/coderd/jwtutils"
 	"github.com/coder/coder/v2/tailnet"
 	"github.com/coder/coder/v2/testutil"
 	"github.com/coder/quartz"
@@ -91,8 +91,8 @@ func TestResumeTokenKeyProvider(t *testing.T) {
 	})
 }
 
-func newKeySigner(key tailnet.ResumeTokenSigningKey) cryptokeys.StaticKey {
-	return cryptokeys.StaticKey{
+func newKeySigner(key tailnet.ResumeTokenSigningKey) jwtutils.StaticKey {
+	return jwtutils.StaticKey{
 		ID:  "123",
 		Key: key[:],
 	}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ import (`
`15`	`15`	`"github.com/google/uuid"`
`16`	`16`	`"github.com/stretchr/testify/require"`
`17`	`17`
`18`		`- "github.com/coder/coder/v2/coderd/cryptokeys"`
`19`	`18`	`"github.com/coder/coder/v2/coderd/jwtutils"`
`20`	`19`	`"github.com/coder/coder/v2/coderd/workspaceapps"`
`21`	`20`	`)`
`@@ -344,10 +343,10 @@ func Test_FromRequest(t *testing.T) {`
`344`	`343`	`})`
`345`	`344`	`}`
`346`	`345`
`347`		`-func newSigner(t *testing.T) cryptokeys.StaticKey {`
	`346`	`+func newSigner(t *testing.T) jwtutils.StaticKey {`
`348`	`347`	`t.Helper()`
`349`	`348`
`350`		`- return cryptokeys.StaticKey{`
	`349`	`+ return jwtutils.StaticKey{`
`351`	`350`	`ID: "test",`
`352`	`351`	`Key: generateSecret(t, 64),`
`353`	`352`	`}`