Remove unused test code and mock cleanup

sreya · sreya · commit 0efabfd277a6 · 2024-10-03T22:36:26.000Z
Removing unused test and mock code simplifies maintenance and reduces clutter.
diff --git a/coderd/cryptokeys/dbkeycache_test.go b/coderd/cryptokeys/dbkeycache_test.go
@@ -69,7 +69,6 @@ func TestDBKeyCache(t *testing.T) {
 			_, err = k.VerifyingKey(ctx, "123")
 			require.ErrorIs(t, err, cryptokeys.ErrKeyNotFound)
 		})
-
 	})
 
 	t.Run("Signing", func(t *testing.T) {
@@ -173,7 +172,6 @@ func TestDBKeyCache(t *testing.T) {
 		_, err := cryptokeys.NewEncryptionCache(logger, db, database.CryptoKeyFeatureOidcConvert, cryptokeys.WithDBCacheClock(clock))
 		require.ErrorIs(t, err, cryptokeys.ErrInvalidFeature)
 	})
-
 }
 
 func keyID(key database.CryptoKey) string {
diff --git a/coderd/cryptokeys/doc.go b/coderd/cryptokeys/doc.go
@@ -1,4 +1,2 @@
 // Package cryptokeys provides an abstraction for fetching internally used cryptographic keys mainly for JWT signing and verification.
 package cryptokeys
-
-//go:generate mockgen -destination keycachemock.go -package cryptokeys . Keycache
diff --git a/coderd/cryptokeys/keycachemock.go b/coderd/cryptokeys/keycachemock.go
diff --git a/coderd/jwtutils/jwt_test.go b/coderd/jwtutils/jwt_test.go
@@ -3,7 +3,6 @@ package jwtutils_test
 import (
 	"context"
 	"crypto/rand"
-	"encoding/hex"
 	"testing"
 	"time"
 
@@ -19,7 +18,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
 	"github.com/coder/coder/v2/coderd/jwtutils"
-	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -355,19 +353,6 @@ func TestJWE(t *testing.T) {
 	})
 }
 
-func generateCryptoKey(t *testing.T, seq int32, now time.Time, keySize int) codersdk.CryptoKey {
-	t.Helper()
-
-	secret := generateSecret(t, keySize)
-
-	return codersdk.CryptoKey{
-		Feature:  codersdk.CryptoKeyFeatureTailnetResume,
-		Secret:   hex.EncodeToString(secret),
-		Sequence: seq,
-		StartsAt: now,
-	}
-}
-
 func generateSecret(t *testing.T, keySize int) []byte {
 	t.Helper()
 
@@ -431,22 +416,22 @@ func newKey(t *testing.T, size int) *key {
 	}
 }
 
-func (k *key) SigningKey(ctx context.Context) (id string, key interface{}, err error) {
+func (k *key) SigningKey(_ context.Context) (id string, key interface{}, err error) {
 	return k.id, k.secret, nil
 }
 
-func (k *key) VerifyingKey(ctx context.Context, id string) (key interface{}, err error) {
+func (k *key) VerifyingKey(_ context.Context, id string) (key interface{}, err error) {
 	k.t.Helper()
 
 	require.Equal(k.t, k.id, id)
 	return k.secret, nil
 }
 
-func (k *key) EncryptingKey(ctx context.Context) (id string, key interface{}, err error) {
+func (k *key) EncryptingKey(_ context.Context) (id string, key interface{}, err error) {
 	return k.id, k.secret, nil
 }
 
-func (k *key) DecryptingKey(ctx context.Context, id string) (key interface{}, err error) {
+func (k *key) DecryptingKey(_ context.Context, id string) (key interface{}, err error) {
 	k.t.Helper()
 
 	require.Equal(k.t, k.id, id)
