Refactor dbCache to remove feature validation

sreya · sreya · commit 93603a2a393a · 2024-10-03T08:12:17.000Z
diff --git a/coderd/cryptokeys/dbkeycache.go b/coderd/cryptokeys/dbkeycache.go
@@ -77,33 +77,18 @@ func newDBCache(logger slog.Logger, db database.Store, feature database.CryptoKe
 }
 
 func (d *dbCache) EncryptingKey(ctx context.Context) (id string, key interface{}, err error) {
-	if !isEncryptionKeyFeature(d.feature) {
-		return "", nil, xerrors.Errorf("invalid feature: %s", d.feature)
-	}
 	return d.latest(ctx)
 }
 
 func (d *dbCache) DecryptingKey(ctx context.Context, id string) (key interface{}, err error) {
-	if !isEncryptionKeyFeature(d.feature) {
-		return nil, xerrors.Errorf("invalid feature: %s", d.feature)
-	}
-
 	return d.sequence(ctx, id)
 }
 
 func (d *dbCache) SigningKey(ctx context.Context) (id string, key interface{}, err error) {
-	if !isSigningKeyFeature(d.feature) {
-		return "", nil, xerrors.Errorf("invalid feature: %s", d.feature)
-	}
-
 	return d.latest(ctx)
 }
 
 func (d *dbCache) VerifyingKey(ctx context.Context, id string) (key interface{}, err error) {
-	if !isSigningKeyFeature(d.feature) {
-		return nil, xerrors.Errorf("invalid feature: %s", d.feature)
-	}
-
 	return d.sequence(ctx, id)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,33 +77,18 @@ func newDBCache(logger slog.Logger, db database.Store, feature database.CryptoKe`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func (d *dbCache) EncryptingKey(ctx context.Context) (id string, key interface{}, err error) {`
`80`		`- if !isEncryptionKeyFeature(d.feature) {`
`81`		`- return "", nil, xerrors.Errorf("invalid feature: %s", d.feature)`
`82`		`- }`
`83`	`80`	`return d.latest(ctx)`
`84`	`81`	`}`
`85`	`82`
`86`	`83`	`func (d *dbCache) DecryptingKey(ctx context.Context, id string) (key interface{}, err error) {`
`87`		`- if !isEncryptionKeyFeature(d.feature) {`
`88`		`- return nil, xerrors.Errorf("invalid feature: %s", d.feature)`
`89`		`- }`
`90`		`-`
`91`	`84`	`return d.sequence(ctx, id)`
`92`	`85`	`}`
`93`	`86`
`94`	`87`	`func (d *dbCache) SigningKey(ctx context.Context) (id string, key interface{}, err error) {`
`95`		`- if !isSigningKeyFeature(d.feature) {`
`96`		`- return "", nil, xerrors.Errorf("invalid feature: %s", d.feature)`
`97`		`- }`
`98`		`-`
`99`	`88`	`return d.latest(ctx)`
`100`	`89`	`}`
`101`	`90`
`102`	`91`	`func (d *dbCache) VerifyingKey(ctx context.Context, id string) (key interface{}, err error) {`
`103`		`- if !isSigningKeyFeature(d.feature) {`
`104`		`- return nil, xerrors.Errorf("invalid feature: %s", d.feature)`
`105`		`- }`
`106`		`-`
`107`	`92`	`return d.sequence(ctx, id)`
`108`	`93`	`}`
`109`	`94`