1 files changed, 0 insertions, 124 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java
deleted file mode 100644
index 898f90e3438..00000000000
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java
+++ /dev/null
@@ -1,124 +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.container.jdisc.athenz.impl;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.conn.ssl.SSLContextBuilder;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.eclipse.jetty.http.HttpStatus;
-
-import javax.net.ssl.SSLContext;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.net.URI;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-/**
- * @author mortent
- * @author bjorncs
- */
-public class AthenzService {
-
-    private static final String INSTANCE_API_PATH = "/zts/v1/instance";
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private final HttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler(3, /*requestSentRetryEnabled*/true);
-
-    /**
-     * Send instance register request to ZTS, get InstanceIdentity
-     */
-     public InstanceIdentity sendInstanceRegisterRequest(InstanceRegisterInformation instanceRegisterInformation,
-                                                         URI uri) {
-        try(CloseableHttpClient client = HttpClientBuilder.create().setRetryHandler(retryHandler).build()) {
-            HttpUriRequest postRequest = RequestBuilder.post()
-                    .setUri(uri.resolve(INSTANCE_API_PATH))
-                    .setEntity(toJsonStringEntity(instanceRegisterInformation))
-                    .build();
-            return getInstanceIdentity(client, postRequest);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    public InstanceIdentity sendInstanceRefreshRequest(String providerService,
-                                                       String instanceDomain,
-                                                       String instanceServiceName,
-                                                       String instanceId,
-                                                       InstanceRefreshInformation instanceRefreshInformation,
-                                                       URI ztsEndpoint,
-                                                       X509Certificate certicate,
-                                                       PrivateKey privateKey) {
-        try (CloseableHttpClient client = createHttpClientWithTlsAuth(certicate, privateKey, retryHandler)) {
-            URI uri = ztsEndpoint
-                    .resolve(INSTANCE_API_PATH + '/')
-                    .resolve(providerService + '/')
-                    .resolve(instanceDomain + '/')
-                    .resolve(instanceServiceName + '/')
-                    .resolve(instanceId);
-            HttpUriRequest postRequest = RequestBuilder.post()
-                    .setUri(uri)
-                    .setEntity(toJsonStringEntity(instanceRefreshInformation))
-                    .build();
-            return getInstanceIdentity(client, postRequest);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    private InstanceIdentity getInstanceIdentity(CloseableHttpClient client, HttpUriRequest postRequest)
-            throws IOException {
-        try (CloseableHttpResponse response = client.execute(postRequest)) {
-            if(HttpStatus.isSuccess(response.getStatusLine().getStatusCode())) {
-                return objectMapper.readValue(response.getEntity().getContent(), InstanceIdentity.class);
-            } else {
-                String message = EntityUtils.toString(response.getEntity());
-                throw new RuntimeException(String.format("Unable to get identity. http code/message: %d/%s",
-                                                         response.getStatusLine().getStatusCode(), message));
-            }
-        }
-    }
-
-    private StringEntity toJsonStringEntity(Object value) throws JsonProcessingException {
-        return new StringEntity(objectMapper.writeValueAsString(value), ContentType.APPLICATION_JSON);
-    }
-
-    private static CloseableHttpClient createHttpClientWithTlsAuth(X509Certificate certificate,
-                                                                   PrivateKey privateKey,
-                                                                   HttpRequestRetryHandler retryHandler) {
-        try {
-            String dummyPassword = "athenz";
-            KeyStore keyStore = KeyStore.getInstance("JKS");
-            keyStore.load(null);
-            keyStore.setKeyEntry("athenz", privateKey, dummyPassword.toCharArray(), new Certificate[]{certificate});
-            SSLContext sslContext = new SSLContextBuilder()
-                    .loadKeyMaterial(keyStore, dummyPassword.toCharArray())
-                    .build();
-            return HttpClientBuilder.create()
-                    .setRetryHandler(retryHandler)
-                    .setSslcontext(sslContext)
-                    .build();
-        } catch (KeyStoreException | UnrecoverableKeyException | NoSuchAlgorithmException |
-                KeyManagementException | CertificateException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-}