Propagate more useful error message to vespa log

1 files changed, 11 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java
index 5afb2188fac..c6f9a0268c1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java
@@ -4,7 +4,10 @@ package com.yahoo.vespa.config.server.tenant;
 import com.yahoo.config.model.api.TenantSecretStore;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.container.jdisc.secretstore.SecretNotFoundException;
 import com.yahoo.container.jdisc.secretstore.SecretStore;
+import com.yahoo.vespa.config.server.http.InvalidApplicationException;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,10 +22,14 @@ public class SecretStoreExternalIdRetriever {
         return tenantSecretStores.stream()
                 .map(tenantSecretStore -> {
                     var secretName = secretName(tenant, system, tenantSecretStore.getName());
-                    String secret = secretStore.getSecret(secretName);
-                    if (secret == null)
-                     throw new RuntimeException("No secret found in secret store for " + secretName);
-                    return tenantSecretStore.withExternalId(secret);
+                    try {
+                        String secret = secretStore.getSecret(secretName);
+                        if (secret == null)
+                            throw new InvalidApplicationException("No secret found in secret store for " + secretName);
+                        return tenantSecretStore.withExternalId(secret);
+                    } catch (SecretNotFoundException e) {
+                        throw new InvalidApplicationException("Could not find externalId for secret store: %s".formatted(tenantSecretStore.getName()));
+                    }
                 })
                 .toList();
     }