summaryrefslogtreecommitdiffstats
path: root/hosted-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-06 16:40:48 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-06 16:40:48 +0200
commita6bfd3c44e86cc78482d97c5fe3d3697b393f07b (patch)
tree15106faad283d0ccfaf76411c3e1e09c57bafddf /hosted-api
parent726ba08018dad3254e8fcdbaa8fd5fa58e4bb30e (diff)
Remove traces of Athenz
Diffstat (limited to 'hosted-api')
-rw-r--r--hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index 9b4f91d8a41..e76115931a3 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -55,9 +55,9 @@ public abstract class ControllerHttpClient {
return new SigningControllerHttpClient(endpoint, privateKeyFile, id);
}
- /** Creates an HTTP client against the given endpoint, which uses the given private key and certificate of an Athenz identity. */
- public static ControllerHttpClient withAthenzIdentity(URI endpoint, Path privateKeyFile, Path certificateFile) {
- return new AthenzControllerHttpClient(endpoint, privateKeyFile, certificateFile);
+ /** Creates an HTTP client against the given endpoint, which uses the given private key and certificate identity. */
+ public static ControllerHttpClient withKeyAndCertificate(URI endpoint, Path privateKeyFile, Path certificateFile) {
+ return new MutualTlsControllerHttpClient(endpoint, privateKeyFile, certificateFile);
}
/** Sends submission to the remote controller and returns the version of the accepted package, or throws if this fails. */
@@ -173,10 +173,10 @@ public abstract class ControllerHttpClient {
}
- /** Client that uses a given Athenz identity to authenticate to the remote controller. */
- private static class AthenzControllerHttpClient extends ControllerHttpClient {
+ /** Client that uses a given key / certificate identity to authenticate to the remote controller. */
+ private static class MutualTlsControllerHttpClient extends ControllerHttpClient {
- private AthenzControllerHttpClient(URI endpoint, Path privateKeyFile, Path certificateFile) {
+ private MutualTlsControllerHttpClient(URI endpoint, Path privateKeyFile, Path certificateFile) {
super(endpoint,
HttpClient.newBuilder().sslContext(new SslContextBuilder().withKeyStore(privateKeyFile, certificateFile).build()));
}