summaryrefslogtreecommitdiffstats
path: root/tenant-auth
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-10-25 13:00:32 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-10-25 13:00:32 +0200
commitef9e8a057e6782a461869f186a98d85fe89563d3 (patch)
treea81d410bc150bd4fe8b22f82eee214ca411d4303 /tenant-auth
parent052987bb1acf8c78426a7f33e618560bb0269f50 (diff)
Change property names expected by plugins and test framework for auth files
Diffstat (limited to 'tenant-auth')
-rw-r--r--tenant-auth/src/main/java/ai/vespa/hosted/auth/ApiAuthenticator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tenant-auth/src/main/java/ai/vespa/hosted/auth/ApiAuthenticator.java b/tenant-auth/src/main/java/ai/vespa/hosted/auth/ApiAuthenticator.java
index f6a88ec83c2..c2d47622040 100644
--- a/tenant-auth/src/main/java/ai/vespa/hosted/auth/ApiAuthenticator.java
+++ b/tenant-auth/src/main/java/ai/vespa/hosted/auth/ApiAuthenticator.java
@@ -10,11 +10,11 @@ public class ApiAuthenticator implements ai.vespa.hosted.api.ApiAuthenticator {
public ControllerHttpClient controller() {
return Properties.apiCertificateFile()
.map(certificateFile -> ControllerHttpClient.withKeyAndCertificate(Properties.apiEndpoint(),
- Properties.apiPrivateKeyFile(),
+ Properties.apiKeyFile(),
certificateFile))
.orElseGet(() ->
ControllerHttpClient.withSignatureKey(Properties.apiEndpoint(),
- Properties.apiPrivateKeyFile(),
+ Properties.apiKeyFile(),
Properties.application()));
}