Refactor key cache initialization and retrieval

sreya · sreya · commit 34a77d5c0f7d · 2024-09-24T01:37:30.000Z
- Simplify error handling by removing redundant checks in `newCache`.
- Ensure `Latest` returns appropriate errors for key cache state.
- Update tests to align with new error handling logic.
diff --git a/coderd/cryptokeys/dbkeycache.go b/coderd/cryptokeys/dbkeycache.go
@@ -39,6 +39,7 @@ func NewDBKeyCache(ctx context.Context, logger slog.Logger, db database.Store, f
 	for _, opt := range opts {
 		opt(d)
 	}
+
 	err := d.newCache(ctx)
 	if err != nil {
 		return nil, xerrors.Errorf("new cache: %w", err)
@@ -115,6 +116,14 @@ func (d *DBKeyCache) Latest(ctx context.Context) (database.CryptoKey, error) {
 		return database.CryptoKey{}, xerrors.Errorf("new cache: %w", err)
 	}
 
+	if len(d.cache) == 0 {
+		return database.CryptoKey{}, ErrKeyNotFound
+	}
+
+	if !d.latestKey.IsActive(now) {
+		return database.CryptoKey{}, ErrKeyInvalid
+	}
+
 	return d.latestKey, nil
 }
 
@@ -135,12 +144,7 @@ func (d *DBKeyCache) newCache(ctx context.Context) error {
 	if err != nil {
 		return xerrors.Errorf("get crypto keys by feature: %w", err)
 	}
-	if len(keys) == 0 {
-		return ErrKeyNotFound
-	}
-
 	cache := toMap(keys)
-
 	var latest database.CryptoKey
 	for _, key := range keys {
 		if !key.IsActive(now) {
@@ -150,10 +154,6 @@ func (d *DBKeyCache) newCache(ctx context.Context) error {
 		break
 	}
 
-	if latest.IsInvalid(now) {
-		return ErrKeyInvalid
-	}
-
 	d.cache = cache
 	d.latestKey = latest
 	return nil
diff --git a/coderd/cryptokeys/dbkeycache_test.go b/coderd/cryptokeys/dbkeycache_test.go
@@ -31,7 +31,7 @@ func TestDBKeyCache(t *testing.T) {
 		)
 
 		_, err := cryptokeys.NewDBKeyCache(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, withClock(clock))
-		require.ErrorIs(t, err, cryptokeys.ErrKeyNotFound)
+		require.NoError(t, err)
 	})
 
 	t.Run("Version", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func TestDBKeyCache(t *testing.T) {`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`_, err := cryptokeys.NewDBKeyCache(ctx, logger, db, database.CryptoKeyFeatureWorkspaceApps, withClock(clock))`
`34`		`- require.ErrorIs(t, err, cryptokeys.ErrKeyNotFound)`
	`34`	`+ require.NoError(t, err)`
`35`	`35`	`})`
`36`	`36`
`37`	`37`	`t.Run("Version", func(t *testing.T) {`