Refactor key verification with db2sdk conversion

sreya · sreya · commit 201347f4daf3 · 2024-09-26T22:30:46.000Z
diff --git a/coderd/cryptokeys/dbkeycache.go b/coderd/cryptokeys/dbkeycache.go
@@ -113,14 +113,14 @@ func (d *DBCache) Latest(ctx context.Context) (codersdk.CryptoKey, error) {
 
 	now := d.clock.Now().UTC()
 	if latest.CanSign(now) {
-		return checkKey(latest, now)
+		return db2sdk.CryptoKey(latest), nil
 	}
 
 	d.cacheMu.Lock()
 	defer d.cacheMu.Unlock()
 
 	if latest.CanSign(now) {
-		return checkKey(latest, now)
+		return db2sdk.CryptoKey(latest), nil
 	}
 
 	// Refetch all keys for this feature so we can find the latest valid key.
@@ -139,7 +139,7 @@ func (d *DBCache) Latest(ctx context.Context) (codersdk.CryptoKey, error) {
 
 	d.cache, d.latestKey = cache, latest
 
-	return checkKey(latest, now)
+	return db2sdk.CryptoKey(latest), nil
 }
 
 func (d *DBCache) refresh(ctx context.Context) {

Original file line number	Diff line number	Diff line change
`@@ -113,14 +113,14 @@ func (d *DBCache) Latest(ctx context.Context) (codersdk.CryptoKey, error) {`
`113`	`113`
`114`	`114`	`now := d.clock.Now().UTC()`
`115`	`115`	`if latest.CanSign(now) {`
`116`		`- return checkKey(latest, now)`
	`116`	`+ return db2sdk.CryptoKey(latest), nil`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`d.cacheMu.Lock()`
`120`	`120`	`defer d.cacheMu.Unlock()`
`121`	`121`
`122`	`122`	`if latest.CanSign(now) {`
`123`		`- return checkKey(latest, now)`
	`123`	`+ return db2sdk.CryptoKey(latest), nil`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// Refetch all keys for this feature so we can find the latest valid key.`
`@@ -139,7 +139,7 @@ func (d *DBCache) Latest(ctx context.Context) (codersdk.CryptoKey, error) {`
`139`	`139`
`140`	`140`	`d.cache, d.latestKey = cache, latest`
`141`	`141`
`142`		`- return checkKey(latest, now)`
	`142`	`+ return db2sdk.CryptoKey(latest), nil`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`func (d *DBCache) refresh(ctx context.Context) {`