Merge pull request #33 from bdpiparva/rename-oauth-token-key

Changed plugin settings key oauth_token to security_token

Author: bdpiprava

src/main/java/cd/go/contrib/elasticagent/KubernetesClientFactory.java

@@ -47,7 +47,7 @@ public synchronized KubernetesClient client(PluginSettings pluginSettings) {
 
     private KubernetesClient createClientFor(PluginSettings pluginSettings) {
         final ConfigBuilder configBuilder = new ConfigBuilder()
-                .withOauthToken(pluginSettings.getOauthToken())
+                .withOauthToken(pluginSettings.getSecurityToken())
                 .withMasterUrl(pluginSettings.getClusterUrl())
                 .withCaCertData(pluginSettings.getCaCertData())
                 .withNamespace(pluginSettings.getNamespace());

src/main/java/cd/go/contrib/elasticagent/PluginSettings.java

@@ -41,8 +41,8 @@ public class PluginSettings {
     private String clusterUrl;
 
     @Expose
-    @SerializedName("oauth_token")
-    private String oauthToken;
+    @SerializedName("security_token")
+    private String securityToken;
 
     @Expose
     @SerializedName("kubernetes_cluster_ca_cert")
@@ -86,8 +86,8 @@ public String getGoServerUrl() {
         return goServerUrl;
     }
 
-    public String getOauthToken() {
-        return oauthToken;
+    public String getSecurityToken() {
+        return securityToken;
     }
 
     public String getClusterUrl() {
@@ -127,7 +127,7 @@ public boolean equals(Object o) {
         if (maxPendingPods != null ? !maxPendingPods.equals(that.maxPendingPods) : that.maxPendingPods != null)
             return false;
         if (clusterUrl != null ? !clusterUrl.equals(that.clusterUrl) : that.clusterUrl != null) return false;
-        if (oauthToken != null ? !oauthToken.equals(that.oauthToken) : that.oauthToken != null) return false;
+        if (securityToken != null ? !securityToken.equals(that.securityToken) : that.securityToken != null) return false;
         if (clusterCACertData != null ? !clusterCACertData.equals(that.clusterCACertData) : that.clusterCACertData != null)
             return false;
         return namespace != null ? namespace.equals(that.namespace) : that.namespace == null;
@@ -139,7 +139,7 @@ public int hashCode() {
         result = 31 * result + (autoRegisterTimeout != null ? autoRegisterTimeout.hashCode() : 0);
         result = 31 * result + (maxPendingPods != null ? maxPendingPods.hashCode() : 0);
         result = 31 * result + (clusterUrl != null ? clusterUrl.hashCode() : 0);
-        result = 31 * result + (oauthToken != null ? oauthToken.hashCode() : 0);
+        result = 31 * result + (securityToken != null ? securityToken.hashCode() : 0);
         result = 31 * result + (clusterCACertData != null ? clusterCACertData.hashCode() : 0);
         result = 31 * result + (namespace != null ? namespace.hashCode() : 0);
         return result;

src/test/java/cd/go/contrib/elasticagent/PluginSettingsTest.java

@@ -35,7 +35,7 @@ public void shouldDeserializeFromJSON() {
         pluginSettingsMap.put("auto_register_timeout", "13");
         pluginSettingsMap.put("pending_pods_count", 14);
         pluginSettingsMap.put("kubernetes_cluster_url", "https://cloud.example.com");
-        pluginSettingsMap.put("oauth_token", "foo-token");
+        pluginSettingsMap.put("security_token", "foo-token");
         pluginSettingsMap.put("kubernetes_cluster_ca_cert", "foo-ca-certs");
         pluginSettingsMap.put("namespace", "gocd");
 
@@ -46,7 +46,7 @@ public void shouldDeserializeFromJSON() {
         assertThat(pluginSettings.getMaxPendingPods(), is(14));
         assertThat(pluginSettings.getClusterUrl(), is("https://cloud.example.com"));
         assertThat(pluginSettings.getCaCertData(), is("foo-ca-certs"));
-        assertThat(pluginSettings.getOauthToken(), is("foo-token"));
+        assertThat(pluginSettings.getSecurityToken(), is("foo-token"));
         assertThat(pluginSettings.getNamespace(), is("gocd"));
 
     }