diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-03-24 21:54:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 21:54:00 +0100 |
| commit | c58525742b95c6c8a71879437ade8550cd046db8 (patch) | |
| tree | b828cd976e71a0f086f316191830edc690edcb30 /tenant-auth | |
| parent | a73887e903ae0dcf7277dbf97bf678822752b45e (diff) | |
Revert "Support api key variable for signature based test framework controlle…"
Diffstat (limited to 'tenant-auth')
| -rw-r--r-- | tenant-auth/src/main/java/ai/vespa/hosted/auth/ApiAuthenticator.java | 10 |
1 files changed, 4 insertions, 6 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 55b3af93050..82d859b08bd 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 @@ -13,12 +13,10 @@ public class ApiAuthenticator implements ai.vespa.hosted.api.ApiAuthenticator { .map(certificateFile -> ControllerHttpClient.withKeyAndCertificate(Properties.apiEndpoint(), Properties.apiKeyFile(), certificateFile)) - .or(() -> Properties.apiKey().map(apiKey -> ControllerHttpClient.withSignatureKey(Properties.apiEndpoint(), - apiKey, - Properties.application()))) - .orElseGet(() -> ControllerHttpClient.withSignatureKey(Properties.apiEndpoint(), - Properties.apiKeyFile(), - Properties.application())); + .orElseGet(() -> + ControllerHttpClient.withSignatureKey(Properties.apiEndpoint(), + Properties.apiKeyFile(), + Properties.application())); } } |