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

Changed oauth_token in get plugin settings configuration

Author: bdpiprava

src/main/java/cd/go/contrib/elasticagent/executors/GetPluginConfigurationExecutor.java

@@ -33,7 +33,7 @@ public class GetPluginConfigurationExecutor implements RequestExecutor {
     public static final Field MAX_PENDING_PODS = new PositiveNumberField("pending_pods_count", "Maximum pending pods", "10", false, false, "2");
     public static final Field CLUSTER_URL = new HttpsURLField("kubernetes_cluster_url", "Cluster URL", true, "3");
     public static final Field NAMESPACE = new Field("namespace", "Namespace", "default", false, false, "4");
-    public static final Field OAUTH_TOKEN = new NonBlankField("oauth_token", "Oauth token", true, "5");
+    public static final Field SECURITY_TOKEN = new NonBlankField("security_token", "Security token", true, "5");
     public static final Field CLUSTER_CA_CERT = new Field("kubernetes_cluster_ca_cert", "Cluster ca certificate", null, false, true, "6");
 
     static {
@@ -42,7 +42,7 @@ public class GetPluginConfigurationExecutor implements RequestExecutor {
         FIELDS.put(MAX_PENDING_PODS.key(), MAX_PENDING_PODS);
         FIELDS.put(CLUSTER_URL.key(), CLUSTER_URL);
         FIELDS.put(CLUSTER_CA_CERT.key(), CLUSTER_CA_CERT);
-        FIELDS.put(OAUTH_TOKEN.key(), OAUTH_TOKEN);
+        FIELDS.put(SECURITY_TOKEN.key(), SECURITY_TOKEN);
         FIELDS.put(NAMESPACE.key(), NAMESPACE);
     }
 

src/main/resources/plugin-settings.template.html

@@ -116,8 +116,8 @@
 			<label>Security token
 				<span class='asterix'>*</span>
 			</label>
-			<textarea rows="5" ng-model="oauth_token"></textarea>
-			<span class="form_error form-error" ng-show="GOINPUTNAME[oauth_token].$error.server">{{GOINPUTNAME[oauth_token].$error.server}}</span>
+			<textarea rows="5" ng-model="security_token"></textarea>
+			<span class="form_error form-error" ng-show="GOINPUTNAME[security_token].$error.server">{{GOINPUTNAME[security_token].$error.server}}</span>
 			<label class="form-help-content">
 				Get the service account token by running following command <code>kubectl describe secret
 				TOKEN_NAME</code> and copy the value of token here.

src/test/java/cd/go/contrib/elasticagent/executors/GetPluginConfigurationExecutorTest.java

@@ -80,8 +80,8 @@ public void assertJsonStructure() throws Exception {
                 "    \"secure\": false,\n" +
                 "    \"display-order\": \"4\"\n" +
                 "  },\n" +
-                "  \"oauth_token\": {\n" +
-                "    \"display-name\": \"Oauth token\",\n" +
+                "  \"security_token\": {\n" +
+                "    \"display-name\": \"Security token\",\n" +
                 "    \"required\": true,\n" +
                 "    \"secure\": true,\n" +
                 "    \"display-order\": \"5\"\n" +

src/test/java/cd/go/contrib/elasticagent/executors/ValidateConfigurationExecutorTest.java

@@ -87,8 +87,8 @@ public void shouldValidateABadConfiguration() throws Exception {
                 "    \"key\": \"kubernetes_cluster_url\"\n" +
                 "  },\n" +
                 "  {\n" +
-                "    \"message\": \"Oauth token must not be blank.\",\n" +
-                "    \"key\": \"oauth_token\"\n" +
+                "    \"message\": \"Security token must not be blank.\",\n" +
+                "    \"key\": \"security_token\"\n" +
                 "  }\n" +
                 "]", response.responseBody(), true);
     }
@@ -100,7 +100,7 @@ public void shouldValidateAGoodConfiguration() throws Exception {
         ValidatePluginSettingsRequest settings = new ValidatePluginSettingsRequest();
         settings.put("go_server_url", "https://ci.example.com/go");
         settings.put("kubernetes_cluster_url", "https://cluster.example.com");
-        settings.put("oauth_token", "some-token");
+        settings.put("security_token", "some-token");
         GoPluginApiResponse response = new ValidateConfigurationExecutor(settings, null, factory).execute();
 
         assertThat(response.responseCode(), is(200));
@@ -114,7 +114,7 @@ public void shouldValidateGoServerUrl() throws Exception {
         ValidatePluginSettingsRequest settings = new ValidatePluginSettingsRequest();
         serverInfo.setSecureSiteUrl(null);
         settings.put("kubernetes_cluster_url", "https://cluster.example.com");
-        settings.put("oauth_token", "some-token");
+        settings.put("security_token", "some-token");
         GoPluginApiResponse response = new ValidateConfigurationExecutor(settings, pluginRequest, factory).execute();
 
         assertThat(response.responseCode(), is(200));
@@ -133,7 +133,7 @@ public void shouldValidateGoServerHTTPSUrlFormat() throws Exception {
         ValidatePluginSettingsRequest settings = new ValidatePluginSettingsRequest();
         settings.put("go_server_url", "foo.com/go(");
         settings.put("kubernetes_cluster_url", "https://cluster.example.com");
-        settings.put("oauth_token", "some-token");
+        settings.put("security_token", "some-token");
         GoPluginApiResponse response = new ValidateConfigurationExecutor(settings, pluginRequest, factory).execute();
 
         assertThat(response.responseCode(), is(200));
@@ -152,7 +152,7 @@ public void shouldValidateGoServerUrlFormat() throws Exception {
         ValidatePluginSettingsRequest settings = new ValidatePluginSettingsRequest();
         settings.put("go_server_url", "https://foo.com");
         settings.put("kubernetes_cluster_url", "https://cluster.example.com");
-        settings.put("oauth_token", "some-token");
+        settings.put("security_token", "some-token");
         GoPluginApiResponse response = new ValidateConfigurationExecutor(settings, pluginRequest, factory).execute();
 
         assertThat(response.responseCode(), is(200));
@@ -178,8 +178,8 @@ public void shouldValidateOAuthTokenWhenAuthenticationStrategyIsSetToOauthToken(
 
         JSONAssert.assertEquals("[" +
                 "  {\n" +
-                "    \"message\": \"Oauth token must not be blank.\",\n" +
-                "    \"key\": \"oauth_token\"\n" +
+                "    \"message\": \"Security token must not be blank.\",\n" +
+                "    \"key\": \"security_token\"\n" +
                 "  }\n" +
                 "]", response.responseBody(), true);
     }
@@ -191,7 +191,7 @@ public void shouldValidateNamespaceExistence() throws JSONException {
         ValidatePluginSettingsRequest settings = new ValidatePluginSettingsRequest();
         settings.put("go_server_url", "https://ci.example.com/go");
         settings.put("kubernetes_cluster_url", "https://cluster.example.com");
-        settings.put("oauth_token", "some-token");
+        settings.put("security_token", "some-token");
         settings.put("namespace", "gocd");
         GoPluginApiResponse response = new ValidateConfigurationExecutor(settings, null, factory).execute();