From 310493bc8bef0b0301e4526ffef2377088d83a87 Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Mon, 11 Dec 2017 23:49:32 +0100 Subject: Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient" --- .../athenz/AthenzIdentityCertificate.java | 27 ---------------------- .../integration/athenz/AthenzRoleCertificate.java | 27 ---------------------- .../athenz/AthenzSslContextProvider.java | 14 ----------- .../api/integration/athenz/ZtsClient.java | 4 ---- 4 files changed, 72 deletions(-) delete mode 100644 controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityCertificate.java delete mode 100644 controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzRoleCertificate.java delete mode 100644 controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzSslContextProvider.java (limited to 'controller-api') diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityCertificate.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityCertificate.java deleted file mode 100644 index d53817c09e4..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityCertificate.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.integration.athenz; - -import java.security.PrivateKey; -import java.security.cert.X509Certificate; - -/** - * @author bjorncs - */ -public class AthenzIdentityCertificate { - - private final X509Certificate certificate; - private final PrivateKey privateKey; - - public AthenzIdentityCertificate(X509Certificate certificate, PrivateKey privateKey) { - this.certificate = certificate; - this.privateKey = privateKey; - } - - public X509Certificate getCertificate() { - return certificate; - } - - public PrivateKey getPrivateKey() { - return privateKey; - } -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzRoleCertificate.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzRoleCertificate.java deleted file mode 100644 index 80548cccd89..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzRoleCertificate.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.integration.athenz; - -import java.security.PrivateKey; -import java.security.cert.X509Certificate; - -/** - * @author bjorncs - */ -public class AthenzRoleCertificate { - - private final X509Certificate certificate; - private final PrivateKey privateKey; - - public AthenzRoleCertificate(X509Certificate certificate, PrivateKey privateKey) { - this.certificate = certificate; - this.privateKey = privateKey; - } - - public X509Certificate getCertificate() { - return certificate; - } - - public PrivateKey getPrivateKey() { - return privateKey; - } -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzSslContextProvider.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzSslContextProvider.java deleted file mode 100644 index 480105a2d86..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzSslContextProvider.java +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.integration.athenz; - -import com.google.inject.Provider; - -import javax.net.ssl.SSLContext; - -/** - * Provides a {@link SSLContext} for use in controller clients communicating with Athenz TLS secured services. - * It is configured with a keystore containing the Athenz service certificate and a trust store with the Athenz CA certificates. - * - * @author bjorncs - */ -public interface AthenzSslContextProvider extends Provider {} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClient.java index f37c1679d1e..c7a2adfb17e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClient.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClient.java @@ -12,8 +12,4 @@ public interface ZtsClient { List getTenantDomainsForUser(AthenzIdentity principal); - AthenzIdentityCertificate getIdentityCertificate(); - - AthenzRoleCertificate getRoleCertificate(AthenzDomain roleDomain, String roleName); - } -- cgit v1.2.3