From 43c94d8a5f4fdbf6847c119b98cb5d4089e38edf Mon Sep 17 00:00:00 2001 From: jonmv Date: Wed, 6 Sep 2023 16:01:53 +0200 Subject: Avoid verbose complaint about missing keys when testing locally --- .../main/java/ai/vespa/hosted/api/TestConfig.java | 6 +----- .../cd/commons/DefaultEndpointAuthenticator.java | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java b/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java index d8bd08773ee..d77dfc23577 100644 --- a/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java +++ b/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java @@ -67,10 +67,6 @@ public class TestConfig { if (config.field("localEndpoints").valid()) return TestConfig.fromEndpointsOnly(toClusterMap(config.field("localEndpoints"))); - if (config.field("deployments").valid()) { - - } - ApplicationId application = ApplicationId.fromSerializedForm(config.field("application").asString()); ZoneId zone = ZoneId.from(config.field("zone").asString()); SystemName system = SystemName.from(config.field("system").asString()); @@ -104,7 +100,7 @@ public class TestConfig { public static TestConfig fromEndpointsOnly(Map endpoints) { return new TestConfig(ApplicationId.defaultId(), ZoneId.defaultId(), - SystemName.defaultSystem(), + SystemName.dev, false, "", 0, diff --git a/tenant-cd-commons/src/main/java/ai/vespa/hosted/cd/commons/DefaultEndpointAuthenticator.java b/tenant-cd-commons/src/main/java/ai/vespa/hosted/cd/commons/DefaultEndpointAuthenticator.java index b8030afd901..a39253e00e3 100644 --- a/tenant-cd-commons/src/main/java/ai/vespa/hosted/cd/commons/DefaultEndpointAuthenticator.java +++ b/tenant-cd-commons/src/main/java/ai/vespa/hosted/cd/commons/DefaultEndpointAuthenticator.java @@ -31,8 +31,12 @@ public class DefaultEndpointAuthenticator implements EndpointAuthenticator { private static final Logger logger = Logger.getLogger(DefaultEndpointAuthenticator.class.getName()); + private final boolean hasLocalTestConfig; + /** Don't touch. */ - public DefaultEndpointAuthenticator(@SuppressWarnings("unused") SystemName __) { } + public DefaultEndpointAuthenticator(SystemName system) { + hasLocalTestConfig = system == SystemName.dev; + } /** * If {@code System.getProperty("vespa.test.credentials.root")} is set, key and certificate files @@ -65,12 +69,14 @@ public class DefaultEndpointAuthenticator implements EndpointAuthenticator { PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(new String(Files.readAllBytes(privateKeyFile))); return new SslContextBuilder().withKeyStore(privateKey, certificate).build(); } - logger.warning( "##################################################################################\n" - + "# Data plane key and/or certificate missing; please specify #\n" - + "# '-DdataPlaneCertificateFile=/path/to/certificate' and #\n" - + "# '-DdataPlaneKeyFile=/path/to/private_key'. #\n" - + "# Trying the default SSLContext, but this will most likely cause HTTP error 401. #\n" - + "##################################################################################"); + if ( ! hasLocalTestConfig) + logger.warning(""" + ################################################################################## + # Data plane key and/or certificate missing; please specify # + # '-DdataPlaneCertificateFile=/path/to/certificate' and # + # '-DdataPlaneKeyFile=/path/to/private_key'. # + # Trying the default SSLContext, but this will most likely cause HTTP error 401. # + ##################################################################################"""); return SSLContext.getDefault(); } catch (IOException e) { throw new UncheckedIOException(e); -- cgit v1.2.3