Address PR comments

Author: lewisheadden

util/src/main/java/io/kubernetes/client/util/ClientBuilder.java

@@ -149,7 +149,7 @@ public static ClientBuilder kubeconfig(KubeConfig config) throws IOException {
     final ClientBuilder builder = new ClientBuilder();
 
     String server = config.getServer();
-    if (!server.startsWith("http://") && !server.startsWith("https://")) {
+    if (!server.contains("://")) {
       if (server.contains(":443")) {
         server = "https://" + server;
       } else {
@@ -160,7 +160,10 @@ public static ClientBuilder kubeconfig(KubeConfig config) throws IOException {
     if(config.verifySSL()) {
       final byte[] caBytes = KubeConfig.getDataOrFile(config.getCertificateAuthorityData(),
           config.getCertificateAuthorityFile());
-      builder.setCertificateAuthority(caBytes);
+      if(caBytes != null) {
+        builder.setCertificateAuthority(caBytes);
+      }
+      builder.setVerifyingSsl(true);
     } else {
       builder.setVerifyingSsl(false);
     }

util/src/main/java/io/kubernetes/client/util/credentials/AccessTokenAuthentication.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.util.credentials;
 
+import com.google.common.base.Preconditions;
 import io.kubernetes.client.ApiClient;
 
 /**
@@ -9,6 +10,7 @@ public class AccessTokenAuthentication implements Authentication {
   private String token;
 
   public AccessTokenAuthentication(final String token) {
+    Preconditions.checkNotNull(token, "Access Token cannot be null");
     this.token = token;
   }
 

util/src/main/java/io/kubernetes/client/util/credentials/ClientCertificateAuthentication.java

@@ -31,6 +31,7 @@ public ClientCertificateAuthentication(final byte[] certificate, final byte[] ke
       client.setKeyManagers(keyManagers);
     } catch (NoSuchAlgorithmException | UnrecoverableKeyException | CertificateException | KeyStoreException | InvalidKeySpecException | IOException e) {
       log.warn("Could not create key manager for Client Certificate authentication.", e);
+      throw new RuntimeException(e);
     }
   }
 }

util/src/test/java/io/kubernetes/client/util/ClientBuilderTest.java

@@ -157,30 +157,6 @@ public void testCredentialProviderInvoked() throws IOException {
 		verify(provider).provide(client);
 	}
 
-	@Test
-	public void testUserNamePasswordClientBuilder() throws Exception{
-    final ApiClient client = (new ClientBuilder())
-        .setBasePath(basePath)
-        .setAuthentication(new UsernamePasswordAuthentication(userName, password))
-        .build();
-    assertEquals(basePath, client.getBasePath());
-    assertEquals(true, client.isVerifyingSsl());
-    assertEquals("Basic", ((io.kubernetes.client.auth.ApiKeyAuth)client.getAuthentications().get("BearerToken")).getApiKeyPrefix());
-    assertEquals(ByteString.of((userName+":"+password).getBytes(Charset.forName("ISO-8859-1"))).base64(), ((io.kubernetes.client.auth.ApiKeyAuth)client.getAuthentications().get("BearerToken")).getApiKey());
-	}
-
-	@Test
-	public void testApiKeyConfigbuilder() throws Exception {
-		final ApiClient client = new ClientBuilder()
-				.setBasePath(basePath)
-				.setAuthentication(new AccessTokenAuthentication(apiKey))
-				.build();
-		assertEquals(basePath, client.getBasePath());
-		assertEquals(apiKeyPrefix, ((io.kubernetes.client.auth.ApiKeyAuth)client.getAuthentications().get("BearerToken")).getApiKeyPrefix());
-		assertEquals( apiKey, ((io.kubernetes.client.auth.ApiKeyAuth)client.getAuthentications().get("BearerToken")).getApiKey());
-		assertEquals(null,((io.kubernetes.client.auth.HttpBasicAuth)client.getAuthentications().get("BasicAuth")).getUsername());
-	}
-
 	/**
 	 * We can't verify anything here because of how things are configured in swagger-codegen and
 	 * okhttp but combined with {@link #testSslCertCaBad()} we have some certainty that it is being

util/src/test/java/io/kubernetes/client/util/TestUtils.java

@@ -0,0 +1,12 @@
+package io.kubernetes.client.util;
+
+import io.kubernetes.client.ApiClient;
+import io.kubernetes.client.auth.ApiKeyAuth;
+
+public class TestUtils {
+
+  public static ApiKeyAuth getApiKeyAuthFromClient(ApiClient client) {
+    return (ApiKeyAuth)client.getAuthentications().get("BearerToken");
+  }
+
+}

util/src/test/java/io/kubernetes/client/util/credentials/AccessTokenAuthenticationTest.java

@@ -1,7 +1,25 @@
 package io.kubernetes.client.util.credentials;
 
+import io.kubernetes.client.ApiClient;
+import org.junit.Test;
+
+import static io.kubernetes.client.util.TestUtils.getApiKeyAuthFromClient;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
 
 public class AccessTokenAuthenticationTest {
 
+  @Test
+  public void testTokenProvided() {
+    final ApiClient client = new ApiClient();
+    new AccessTokenAuthentication("token").provide(client);
+    assertThat(getApiKeyAuthFromClient(client).getApiKeyPrefix(), is("Bearer"));
+    assertThat(getApiKeyAuthFromClient(client).getApiKey(), is("token"));
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testTokenNonnull() {
+    new AccessTokenAuthentication(null);
+  }
+
 }

util/src/test/java/io/kubernetes/client/util/credentials/ClientCertificateAuthenticationTest.java

@@ -0,0 +1,26 @@
+package io.kubernetes.client.util.credentials;
+
+import com.google.common.io.Resources;
+import io.kubernetes.client.ApiClient;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import org.junit.Test;
+
+public class ClientCertificateAuthenticationTest {
+  private static final String CLIENT_CERT_PATH = Resources.getResource("clientauth.cert").getPath();
+  private static final String CLIENT_KEY_PATH = Resources.getResource("clientauth.key").getPath();
+
+  @Test
+  public void testValidCertificates() throws Exception {
+    final ApiClient client = new ApiClient();
+    final byte[] certificate = Files.readAllBytes(Paths.get(CLIENT_CERT_PATH));
+    final byte[] key = Files.readAllBytes(Paths.get(CLIENT_KEY_PATH));
+    new ClientCertificateAuthentication(certificate, key).provide(client);
+  }
+
+  @Test(expected = RuntimeException.class)
+  public void testInvalidCertificates()  {
+    final ApiClient client = new ApiClient();
+    new ClientCertificateAuthentication(new byte[]{}, new byte[]{}).provide(client);
+  }
+}

util/src/test/java/io/kubernetes/client/util/credentials/UsernamePasswordAuthenticationTest.java

@@ -0,0 +1,28 @@
+package io.kubernetes.client.util.credentials;
+
+import com.google.common.base.Charsets;
+import io.kubernetes.client.ApiClient;
+import java.nio.charset.Charset;
+import okio.ByteString;
+import org.junit.Test;
+
+import static io.kubernetes.client.util.TestUtils.getApiKeyAuthFromClient;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
+public class UsernamePasswordAuthenticationTest {
+
+  private static final String USERNAME = "username";
+  private static final String PASSWORD = "password";
+  public static final byte[] USERNAME_PASSWORD_BYTES = (USERNAME + ":" + PASSWORD).getBytes(
+      Charsets.ISO_8859_1);
+
+  @Test
+  public void testUsernamePasswordProvided() {
+    final ApiClient client = new ApiClient();
+    new UsernamePasswordAuthentication(USERNAME, PASSWORD).provide(client);
+    assertThat(getApiKeyAuthFromClient(client).getApiKeyPrefix(), is("Basic"));
+    assertThat(getApiKeyAuthFromClient(client).getApiKey(), is(ByteString.of(USERNAME_PASSWORD_BYTES).base64()));
+  }
+
+}

util/src/test/resources/clientauth.cert

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNDCCAp2gAwIBAgIJANpXxe5h/f0+MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJOWTERMA8GA1UEBxMITmV3IFlvcmsxGjAYBgNVBAoT
+EUt1YmVybmV0ZXMgQ2xpZW50MSUwIwYDVQQDExxDbGllbnQgQ2VydGlmaWNhdGUg
+QXV0aCBUZXN0MB4XDTE4MDIwNjE2Mzg1NloXDTI4MDIwNDE2Mzg1NlowcDELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAk5ZMREwDwYDVQQHEwhOZXcgWW9yazEaMBgGA1UE
+ChMRS3ViZXJuZXRlcyBDbGllbnQxJTAjBgNVBAMTHENsaWVudCBDZXJ0aWZpY2F0
+ZSBBdXRoIFRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPPZeFjGKAzV
+NWXr476eXiUz65M2zhPyHafZtRzsZWCNI3dePovpy4h37Dqj2MoQL3RmBt7ZSRYC
+TFIbdsbOGVMczpCHjOLyj3JuD5i399jNHoqGwi3bLUP/KLIwLgUJzegBFeHt2OGT
+epm5Lixt5f8OyoTrVKv03NZHpG+qCKYPAgMBAAGjgdUwgdIwHQYDVR0OBBYEFHKm
+d7b+opkmBW5It4A6/nq3ZEqbMIGiBgNVHSMEgZowgZeAFHKmd7b+opkmBW5It4A6
+/nq3ZEqboXSkcjBwMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTlkxETAPBgNVBAcT
+CE5ldyBZb3JrMRowGAYDVQQKExFLdWJlcm5ldGVzIENsaWVudDElMCMGA1UEAxMc
+Q2xpZW50IENlcnRpZmljYXRlIEF1dGggVGVzdIIJANpXxe5h/f0+MAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAKs/UhwO9r+uW7wUnoGwDvGSwkgQO2rwp
+xOPgwkbptoxQIaKyIRwqnnxIVKwNZop8Thrr94fOsn0oVe6PSSVZLOi4BqIZ3LtH
+5z3O2m3f318fYudQfZIzTCrreViK2f2zmPgZDRqYmWSIFB5EcjAutckE8ZTQUB6C
+OWkzeV5IvUI=
+-----END CERTIFICATE-----

util/src/test/resources/clientauth.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDz2XhYxigM1TVl6+O+nl4lM+uTNs4T8h2n2bUc7GVgjSN3Xj6L
+6cuId+w6o9jKEC90Zgbe2UkWAkxSG3bGzhlTHM6Qh4zi8o9ybg+Yt/fYzR6KhsIt
+2y1D/yiyMC4FCc3oARXh7djhk3qZuS4sbeX/DsqE61Sr9NzWR6RvqgimDwIDAQAB
+AoGBAKnZs6MaO3Fc3TnmChePVgJR3OgIx5hLD+8HjMjdvGt5Q9f0dFqeed/PsGLU
+F7//cB6Cpox5Cxhid2jFqoEls6q9jnnVGYGDJHDQ7u//xigVfHf9lJzmdxQWId6G
+F6VoU0N6Oh2AtG4L/SQqnbacG1JVXZun/8J8bBon6C4PeacZAkEA/YaNeLcLtv22
+992UJaj3Rd9i5Sxs6dH6PDoABvkbipqWtj4osiMt6a5h32Xy/811CYDI1wvcVDDr
+9HAQP1pfPQJBAPY6vcA+JuKdg9KSZzCh77aE5LGXqz62rcMlUHPtRchNfcFo06MC
+ehKA+YIBmT5we0GrdyAXsYGIVypK0l8irzsCQEkr43r6wavP8FX7or131d5Zye5A
+8zJNAz8MsmNQ1G0djvAMYqx/UMoIJYFXqFnCD8xtWgoPB0lZUVCcY2QVjjUCQGYk
+A+alYZgL400MckXYRwodooiQ8/Z17SrQZclRGet3Sb1bcL9kHaNjYR0u8JTYMCkT
+qbzkVzv2hMIEe7P/PVUCQQCxLiT5qDxQawP1/ZFnp4KCHTKTQ1Mvw8cGajEG+DKP
+2GzD8K03HaJU5eN4Z1Uo1TYPQY1tRD3nM+sDH9EcLvqP
+-----END RSA PRIVATE KEY-----