consolidate into new cryptokeys package

sreya · sreya · commit f0f32d1f3808 · 2024-09-24T00:37:26.000Z
diff --git a/coderd/cryptokeys/dbkeychain.go b/coderd/cryptokeys/dbkeychain.go
@@ -1,4 +1,4 @@
-package keychain
+package cryptokeys
 
 import (
 	"context"
diff --git a/coderd/cryptokeys/dbkeychain_internal_test.go b/coderd/cryptokeys/dbkeychain_internal_test.go
@@ -1,4 +1,4 @@
-package keychain
+package cryptokeys
 
 import (
 	"database/sql"
diff --git a/coderd/cryptokeys/dbkeychain_test.go b/coderd/cryptokeys/dbkeychain_test.go
@@ -1,4 +1,4 @@
-package keychain_test
+package cryptokeys_test
 
 import (
 	"database/sql"
@@ -12,7 +12,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/coderd/keychain"
+	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/testutil"
 	"github.com/coder/quartz"
 )
@@ -30,8 +30,8 @@ func TestDBKeychain(t *testing.T) {
 			logger = slogtest.Make(t, nil)
 		)
 
-		_, err := keychain.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
-		require.ErrorIs(t, err, keychain.ErrKeyNotFound)
+		_, err := cryptokeys.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
+		require.ErrorIs(t, err, cryptokeys.ErrKeyNotFound)
 	})
 
 	t.Run("Version", func(t *testing.T) {
@@ -57,7 +57,7 @@ func TestDBKeychain(t *testing.T) {
 				StartsAt: clock.Now().UTC(),
 			})
 
-			k, err := keychain.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
+			k, err := cryptokeys.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
 			require.NoError(t, err)
 
 			got, err := k.Version(ctx, key.Sequence)
@@ -85,7 +85,7 @@ func TestDBKeychain(t *testing.T) {
 				StartsAt: clock.Now().UTC(),
 			})
 
-			k, err := keychain.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
+			k, err := cryptokeys.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
 			require.NoError(t, err)
 
 			key := dbgen.CryptoKey(t, db, database.CryptoKey{
@@ -132,7 +132,7 @@ func TestDBKeychain(t *testing.T) {
 			StartsAt: clock.Now().UTC(),
 		})
 
-		k, err := keychain.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
+		k, err := cryptokeys.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
 		require.NoError(t, err)
 
 		got, err := k.Latest(ctx)
@@ -169,7 +169,7 @@ func TestDBKeychain(t *testing.T) {
 			},
 		})
 		trap := clock.Trap().TickerFunc()
-		k, err := keychain.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
+		k, err := cryptokeys.NewDBKeychain(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, clock)
 		require.NoError(t, err)
 
 		// Should be able to fetch the expiring key since it's still valid.
@@ -205,6 +205,6 @@ func TestDBKeychain(t *testing.T) {
 		// The expiring key should be gone.
 
 		_, err = k.Version(ctx, expiringKey.Sequence)
-		require.ErrorIs(t, err, keychain.ErrKeyNotFound)
+		require.ErrorIs(t, err, cryptokeys.ErrKeyNotFound)
 	})
 }
diff --git a/coderd/cryptokeys/keychain.go b/coderd/cryptokeys/keychain.go
@@ -1,4 +1,4 @@
-package keychain
+package cryptokeys
 
 import (
 	"context"
diff --git a/coderd/cryptokeys/rotate.go b/coderd/cryptokeys/rotate.go
@@ -1,4 +1,4 @@
-package keyrotate
+package cryptokeys
 
 import (
 	"context"
diff --git a/coderd/cryptokeys/rotate_internal_test.go b/coderd/cryptokeys/rotate_internal_test.go
@@ -1,4 +1,4 @@
-package keyrotate
+package cryptokeys
 
 import (
 	"database/sql"
diff --git a/coderd/cryptokeys/rotate_test.go b/coderd/cryptokeys/rotate_test.go
@@ -1,4 +1,4 @@
-package keyrotate_test
+package cryptokeys_test
 
 import (
 	"testing"
@@ -12,7 +12,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/coderd/keyrotate"
+	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/testutil"
 	"github.com/coder/quartz"
 )
@@ -34,7 +34,7 @@ func TestRotator(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, dbkeys, 0)
 
-		err = keyrotate.StartRotator(ctx, logger, db, keyrotate.WithClock(clock))
+		err = cryptokeys.StartRotator(ctx, logger, db, cryptokeys.WithClock(clock))
 		require.NoError(t, err)
 
 		// Fetch the keys from the database and ensure they
@@ -59,14 +59,14 @@ func TestRotator(t *testing.T) {
 
 		rotatingKey := dbgen.CryptoKey(t, db, database.CryptoKey{
 			Feature:  database.CryptoKeyFeatureWorkspaceApps,
-			StartsAt: now.Add(-keyrotate.DefaultKeyDuration + time.Hour + time.Minute),
+			StartsAt: now.Add(-cryptokeys.DefaultKeyDuration + time.Hour + time.Minute),
 			Sequence: 12345,
 		})
 
 		trap := clock.Trap().TickerFunc()
 		t.Cleanup(trap.Close)
 
-		err := keyrotate.StartRotator(ctx, logger, db, keyrotate.WithClock(clock))
+		err := cryptokeys.StartRotator(ctx, logger, db, cryptokeys.WithClock(clock))
 		require.NoError(t, err)
 
 		initialKeyLen := len(database.AllCryptoKeyFeatureValues())
@@ -88,14 +88,14 @@ func TestRotator(t *testing.T) {
 		newKey, err := db.GetLatestCryptoKeyByFeature(ctx, database.CryptoKeyFeatureWorkspaceApps)
 		require.NoError(t, err)
 		require.Equal(t, rotatingKey.Sequence+1, newKey.Sequence)
-		require.Equal(t, rotatingKey.ExpiresAt(keyrotate.DefaultKeyDuration), newKey.StartsAt.UTC())
+		require.Equal(t, rotatingKey.ExpiresAt(cryptokeys.DefaultKeyDuration), newKey.StartsAt.UTC())
 		require.False(t, newKey.DeletesAt.Valid)
 
 		oldKey, err := db.GetCryptoKeyByFeatureAndSequence(ctx, database.GetCryptoKeyByFeatureAndSequenceParams{
 			Feature:  rotatingKey.Feature,
 			Sequence: rotatingKey.Sequence,
 		})
-		expectedDeletesAt := rotatingKey.StartsAt.Add(keyrotate.DefaultKeyDuration + time.Hour + keyrotate.WorkspaceAppsTokenDuration)
+		expectedDeletesAt := rotatingKey.StartsAt.Add(cryptokeys.DefaultKeyDuration + time.Hour + cryptokeys.WorkspaceAppsTokenDuration)
 		require.NoError(t, err)
 		require.Equal(t, rotatingKey.StartsAt, oldKey.StartsAt)
 		require.True(t, oldKey.DeletesAt.Valid)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package keychain`
	`1`	`+package cryptokeys`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package keyrotate`
	`1`	`+package cryptokeys`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`