backport of commit d16505f

hashicorp · Mar 17, 2022 · 85686aa · 85686aa
1 parent f34492d
commit 85686aa
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/vault/identity_store_oidc.go b/vault/identity_store_oidc.go
@@ -1656,10 +1656,6 @@ func (i *IdentityStore) generatePublicJWKS(ctx context.Context, s logical.Storag
 		return nil, err
 	}
 
-	jwks := &jose.JSONWebKeySet{
-		Keys: make([]jose.JSONWebKey, 0),
-	}
-
 	// only return keys that are associated with a role
 	roleNames, err := s.List(ctx, roleConfigPath)
 	if err != nil {
@@ -1687,6 +1683,10 @@ func (i *IdentityStore) generatePublicJWKS(ctx context.Context, s logical.Storag
 		}
 	}
 
+	jwks := &jose.JSONWebKeySet{
+		Keys: make([]jose.JSONWebKey, 0, len(keyIDs)),
+	}
+
 	// load the JSON web key for each key ID
 	for keyID := range keyIDs {
 		key, err := loadOIDCPublicKey(ctx, s, keyID)