@@ -28,24 +28,24 @@ type SecretResolver struct {
2828 // TTL-based cache that exists to limit load on the database. It maps a secret
2929 // type to the result from the database query.
3030 //
31- // database(cookie_key) -> projects/p/secrets/s/versions/1
31+ // database(cookie_key) -> []string{ projects/p/secrets/s/versions/1}
3232 //
33- referencesCache * cache.Cache
33+ referencesCache * cache.Cache [[] string ]
3434
3535 // valuesCache maps the references to their actual secret values. Since secret
3636 // versions are immutable, this is a long-running cache.
3737 //
38- // projects/p/secrets/s/versions/1 -> abcd1234
38+ // projects/p/secrets/s/versions/1 -> []byte( abcd1234)
3939 //
40- valuesCache * cache.Cache
40+ valuesCache * cache.Cache [[] byte ]
4141}
4242
4343// NewSecretResolver makes a new secret resolver using the provided database and
4444// secret manager instance.
4545func NewSecretResolver () * SecretResolver {
4646 // These only return an error if the duration is < 0.
47- referencesCache , _ := cache .New (60 * time .Second )
48- valuesCache , _ := cache .New (120 * time .Minute )
47+ referencesCache , _ := cache.New [[] string ] (60 * time .Second )
48+ valuesCache , _ := cache.New [[] byte ] (120 * time .Minute )
4949
5050 return & SecretResolver {
5151 referencesCache : referencesCache ,
@@ -77,7 +77,7 @@ func (r *SecretResolver) Resolve(ctx context.Context, db *Database, sm secrets.S
7777// ResolveReferences resolves the database references for the given secret type,
7878// handling caching where appropriate.
7979func (r * SecretResolver ) ResolveReferences (db * Database , typ SecretType ) ([]string , error ) {
80- iface , err := r .referencesCache .WriteThruLookup (string (typ ), func () (interface {} , error ) {
80+ list , err := r .referencesCache .WriteThruLookup (string (typ ), func () ([] string , error ) {
8181 records , err := db .ListSecretsForType (typ )
8282 if err != nil {
8383 return nil , fmt .Errorf ("failed to list secrets for %s: %w" , typ , err )
@@ -92,17 +92,12 @@ func (r *SecretResolver) ResolveReferences(db *Database, typ SecretType) ([]stri
9292 if err != nil {
9393 return nil , err
9494 }
95-
96- list , ok := iface .([]string )
97- if ! ok {
98- return nil , fmt .Errorf ("result for %s is not []string: %T" , typ , iface )
99- }
10095 return list , nil
10196}
10297
10398// ResolveValue resolves a single secret, taking caching into account.
10499func (r * SecretResolver ) ResolveValue (ctx context.Context , sm secrets.SecretManager , ref string ) ([]byte , error ) {
105- iface , err := r .valuesCache .WriteThruLookup (ref , func () (interface {} , error ) {
100+ typ , err := r .valuesCache .WriteThruLookup (ref , func () ([] byte , error ) {
106101 result , err := sm .GetSecretValue (ctx , ref )
107102 if err != nil {
108103 return nil , fmt .Errorf ("failed to get secret value %s: %w" , ref , err )
@@ -112,11 +107,6 @@ func (r *SecretResolver) ResolveValue(ctx context.Context, sm secrets.SecretMana
112107 if err != nil {
113108 return nil , err
114109 }
115-
116- typ , ok := iface .([]byte )
117- if ! ok {
118- return nil , fmt .Errorf ("result for %s is not []byte: %T" , ref , iface )
119- }
120110 return typ , nil
121111}
122112
0 commit comments