diff options
| -rw-r--r-- | hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java | 4 | ||||
| -rw-r--r-- | tenant-auth/src/main/java/ai/vespa/hosted/auth/EndpointAuthenticator.java | 4 | ||||
| -rw-r--r-- | tenant-base/pom.xml | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java b/hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java index 68656f06d7d..c0fe2074809 100644 --- a/hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java +++ b/hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java @@ -61,8 +61,8 @@ public class Properties { return getNonBlankProperty("dataPlaneCertificateFile").map(Paths::get); } - /** Returns the path of the data plane private key file, if this is set with the 'dataPlanePrivateKeyFile' property. */ - public static Optional<Path> dataPlanePrivateKeyFile() { + /** Returns the path of the data plane private key file, if this is set with the 'dataPlaneKeyFile' property. */ + public static Optional<Path> dataPlaneKeyFile() { return getNonBlankProperty("dataPlaneKeyFile").map(Paths::get); } diff --git a/tenant-auth/src/main/java/ai/vespa/hosted/auth/EndpointAuthenticator.java b/tenant-auth/src/main/java/ai/vespa/hosted/auth/EndpointAuthenticator.java index e51476907e2..37d5106d0c2 100644 --- a/tenant-auth/src/main/java/ai/vespa/hosted/auth/EndpointAuthenticator.java +++ b/tenant-auth/src/main/java/ai/vespa/hosted/auth/EndpointAuthenticator.java @@ -50,8 +50,8 @@ public class EndpointAuthenticator implements ai.vespa.hosted.api.EndpointAuthen else { if (Properties.dataPlaneCertificateFile().isPresent()) certificateFile = Properties.dataPlaneCertificateFile().get(); - if (Properties.dataPlanePrivateKeyFile().isPresent()) - privateKeyFile = Properties.dataPlanePrivateKeyFile().get(); + if (Properties.dataPlaneKeyFile().isPresent()) + privateKeyFile = Properties.dataPlaneKeyFile().get(); } if (certificateFile != null && privateKeyFile != null) { X509Certificate certificate = X509CertificateUtils.fromPem(new String(Files.readAllBytes(certificateFile))); diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 0698cf3c54f..6488a681c95 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -270,9 +270,13 @@ <application>${application}</application> <tenant>${tenant}</tenant> <instance>${instance}</instance> + <environment>${environment}</environment> + <region>${region}</region> <endpoint>${endpoint}</endpoint> - <privateKeyFile>${privateKeyFile}</privateKeyFile> - <certificateFile>${certificateFile}</certificateFile> + <apiKeyFile>${apiKeyFile}</apiKeyFile> + <apiCertificateFile>${apiCertificateFile}</apiCertificateFile> + <dataPlaneKeyFile>${dataPlaneKeyFile}</dataPlaneKeyFile> + <dataPlaneCertificateFile>${dataPlaneCertificateFile}</dataPlaneCertificateFile> </systemPropertyVariables> </configuration> </plugin> |