Remove usage and validation of port 8154.

ketan · ketan · commit 705a260f4b15 · 2020-02-25T12:14:45.000+05:30
diff --git a/INSTALL.md b/INSTALL.md
@@ -38,7 +38,7 @@ The cluster profile settings are used to provide cluster level configurations fo
 
     | Field Name                      | Mandatory | Description                                                                                                                                                                                     |
     |---------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-    | **Go server url**               | Yes       | GoCD server url(`https://YOUR_HOST_OR_IP_ADDRESS:8154/go`). The docker elastic agent will use this URL to register itself with GoCD. <br/>The GoCD hostname or ip must resolve in your container. Don't use `localhost` or `127.0.0.1` |
+    | **Go server url**               | Yes       | GoCD server url(`http://YOUR_HOST_OR_IP_ADDRESS:8153/go`). The docker elastic agent will use this URL to register itself with GoCD. <br/>The GoCD hostname or ip must resolve in your container. Don't use `localhost` or `127.0.0.1` |
     | **Environment variables**       | No        | The environment variable for docker container |
     | **Agent auto-register timeout** | Yes       | Agent auto-register timeout(in minutes). Plugin will kill the agent container if it fails to register within provided time limits |
     | **Maximum docker containers**   | Yes       | Maximum docker containers to run at any given point in time. Plugin will not create more container when running container count reached to specified limits |
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/ClusterProfileValidateRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/ClusterProfileValidateRequestExecutor.java
@@ -36,7 +36,7 @@ public ClusterProfileValidateRequestExecutor(ClusterProfileValidateRequest reque
     }
 
     @Override
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         ArrayList<Map<String, String>> result = new ArrayList<>();
 
         List<String> knownFields = new ArrayList<>();
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/CreateAgentRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/CreateAgentRequestExecutor.java
@@ -21,13 +21,9 @@
 import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
 import org.joda.time.LocalTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.DateTimeFormatterBuilder;
-
-import java.util.Date;
 
 public class CreateAgentRequestExecutor implements RequestExecutor {
     private static final DateTimeFormatter MESSAGE_PREFIX_FORMATTER = DateTimeFormat.forPattern("'##|'HH:mm:ss.SSS '[go]'");
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/Field.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/Field.java
@@ -18,10 +18,7 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
-import org.apache.commons.lang.StringUtils;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class Field {
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetClusterProfileMetadataExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetClusterProfileMetadataExecutor.java
@@ -64,7 +64,7 @@ public class GetClusterProfileMetadataExecutor implements RequestExecutor {
 
     @Override
 
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         return new DefaultGoPluginApiResponse(200, GSON.toJson(FIELDS));
     }
 }
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetClusterProfileViewRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetClusterProfileViewRequestExecutor.java
@@ -27,7 +27,7 @@ public class GetClusterProfileViewRequestExecutor implements RequestExecutor {
     private static final Gson GSON = new Gson();
 
     @Override
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("template", Util.readResource("/plugin-settings.template.html"));
         DefaultGoPluginApiResponse defaultGoPluginApiResponse = new DefaultGoPluginApiResponse(200, GSON.toJson(jsonObject));
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetPluginSettingsIconExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetPluginSettingsIconExecutor.java
@@ -28,7 +28,7 @@ public class GetPluginSettingsIconExecutor implements RequestExecutor {
     private static final Gson GSON = new Gson();
 
     @Override
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("content_type", "image/svg+xml");
         jsonObject.addProperty("data", Base64.encodeBase64String(Util.readResourceBytes("/docker-plain.svg")));
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetProfileMetadataExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetProfileMetadataExecutor.java
@@ -55,7 +55,7 @@ public class GetProfileMetadataExecutor implements RequestExecutor {
 
     @Override
 
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         return new DefaultGoPluginApiResponse(200, GSON.toJson(FIELDS));
     }
 }
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetProfileViewExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GetProfileViewExecutor.java
@@ -27,7 +27,7 @@ public class GetProfileViewExecutor implements RequestExecutor {
     private static final Gson GSON = new Gson();
 
     @Override
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("template", Util.readResource("/profile.template.html"));
         DefaultGoPluginApiResponse defaultGoPluginApiResponse = new DefaultGoPluginApiResponse(200, GSON.toJson(jsonObject));
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLField.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLField.java
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLMetadata.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLMetadata.java
@@ -19,6 +19,7 @@
 import org.apache.http.client.utils.URIBuilder;
 
 import java.net.URISyntaxException;
+import java.util.Arrays;
 
 import static org.apache.commons.lang.StringUtils.isBlank;
 
@@ -40,23 +41,23 @@ public String doValidate(String input) {
         try {
             uriBuilder = new URIBuilder(input);
         } catch (URISyntaxException e) {
-            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid URL (https://example.com:8154/go)";
+            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid URL (http://example.com:8153/go)";
         }
 
         if (isBlank(uriBuilder.getScheme())) {
-            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid URL (https://example.com:8154/go)";
+            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid URL (http://example.com:8153/go)";
         }
 
-        if (!uriBuilder.getScheme().equalsIgnoreCase("https")) {
-            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid HTTPs URL (https://example.com:8154/go)";
+        if (!Arrays.asList("http", "https").contains(uriBuilder.getScheme())) {
+            return GO_SERVER_URL_DISPLAY_VALUE + " must use http or https protocol";
         }
 
         if (uriBuilder.getHost().equalsIgnoreCase("localhost") || uriBuilder.getHost().equalsIgnoreCase("127.0.0.1")) {
             return GO_SERVER_URL_DISPLAY_VALUE + " must not be localhost, since this gets resolved on the agents";
         }
 
         if (!(uriBuilder.getPath().endsWith("/go") || uriBuilder.getPath().endsWith("/go/"))) {
-            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid URL ending with '/go' (https://example.com:8154/go)";
+            return GO_SERVER_URL_DISPLAY_VALUE + " must be a valid URL ending with '/go' (http://example.com:8153/go)";
         }
 
         return null;
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/MigrateConfigurationRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/MigrateConfigurationRequestExecutor.java
@@ -39,7 +39,7 @@ public MigrateConfigurationRequestExecutor(MigrateConfigurationRequest migrateCo
     }
 
     @Override
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         LOG.info("[Migrate Config] Request for Config Migration Started...");
 
         PluginSettings pluginSettings = migrateConfigurationRequest.getPluginSettings();
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/PositiveNumberField.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/PositiveNumberField.java
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/executors/ProfileValidateRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagents/docker/executors/ProfileValidateRequestExecutor.java
@@ -39,7 +39,7 @@ public ProfileValidateRequestExecutor(ProfileValidateRequest request) {
     }
 
     @Override
-    public GoPluginApiResponse execute() throws Exception {
+    public GoPluginApiResponse execute() {
         ArrayList<Map<String, String>> result = new ArrayList<>();
 
         List<String> knownFields = new ArrayList<>();
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/requests/AgentStatusReportRequest.java b/src/main/java/cd/go/contrib/elasticagents/docker/requests/AgentStatusReportRequest.java
@@ -52,7 +52,7 @@ public JobIdentifier getJobIdentifier() {
         return jobIdentifier;
     }
 
-    public AgentStatusReportExecutor executor(PluginRequest pluginRequest, DockerContainers dockerContainers) throws IOException {
+    public AgentStatusReportExecutor executor(PluginRequest pluginRequest, DockerContainers dockerContainers) {
         return new AgentStatusReportExecutor(this, pluginRequest, dockerContainers, ViewBuilder.instance());
     }
 
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/requests/ClusterProfileValidateRequest.java b/src/main/java/cd/go/contrib/elasticagents/docker/requests/ClusterProfileValidateRequest.java
@@ -18,7 +18,6 @@
 
 import cd.go.contrib.elasticagents.docker.RequestExecutor;
 import cd.go.contrib.elasticagents.docker.executors.ClusterProfileValidateRequestExecutor;
-import cd.go.contrib.elasticagents.docker.executors.ProfileValidateRequestExecutor;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/requests/ClusterStatusReportRequest.java b/src/main/java/cd/go/contrib/elasticagents/docker/requests/ClusterStatusReportRequest.java
@@ -1,6 +1,5 @@
 package cd.go.contrib.elasticagents.docker.requests;
 
-import cd.go.contrib.elasticagents.docker.ClusterProfile;
 import cd.go.contrib.elasticagents.docker.ClusterProfileProperties;
 import cd.go.contrib.elasticagents.docker.DockerContainers;
 import cd.go.contrib.elasticagents.docker.executors.ClusterStatusReportExecutor;
@@ -39,7 +38,7 @@ public static ClusterStatusReportRequest fromJSON(String json) {
         return GSON.fromJson(json, ClusterStatusReportRequest.class);
     }
 
-    public ClusterStatusReportExecutor executor(DockerContainers dockerContainers) throws IOException {
+    public ClusterStatusReportExecutor executor(DockerContainers dockerContainers) {
         return new ClusterStatusReportExecutor(this, dockerContainers, ViewBuilder.instance());
     }
 
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/requests/JobCompletionRequest.java b/src/main/java/cd/go/contrib/elasticagents/docker/requests/JobCompletionRequest.java
@@ -28,8 +28,6 @@
 
 import java.util.Map;
 
-import static cd.go.contrib.elasticagents.docker.DockerPlugin.LOG;
-
 public class JobCompletionRequest {
 
     private static final Gson GSON = new GsonBuilder().excludeFieldsWithoutExposeAnnotation()
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/requests/MigrateConfigurationRequest.java b/src/main/java/cd/go/contrib/elasticagents/docker/requests/MigrateConfigurationRequest.java
@@ -29,8 +29,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import static cd.go.contrib.elasticagents.docker.DockerPlugin.LOG;
-
 public class MigrateConfigurationRequest {
     public static final Gson GSON = new GsonBuilder()
             .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
diff --git a/src/main/resources/plugin-settings.template.html b/src/main/resources/plugin-settings.template.html
@@ -33,7 +33,7 @@
 	<div class="form_item_block">
 		<label>Go Server URL (this is passed to the agents, so don't use <code>localhost</code>):<span
 			class='asterix'> *</span></label>
-		<input type="text" ng-model="go_server_url" ng-required="true" placeholder="https://ipaddress:8154/go"/>
+		<input type="text" ng-model="go_server_url" ng-required="true" placeholder="http://ipaddress:8153/go"/>
 		<span class="form_error" ng-show="GOINPUTNAME[go_server_url].$error.server">{{GOINPUTNAME[go_server_url].$error.server}}</span>
 	</div>
 
diff --git a/src/test/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLFieldTest.java b/src/test/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLFieldTest.java
diff --git a/src/test/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLMetadataTest.java b/src/test/java/cd/go/contrib/elasticagents/docker/executors/GoServerURLMetadataTest.java

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public ClusterProfileValidateRequestExecutor(ClusterProfileValidateRequest reque`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public GoPluginApiResponse execute() throws Exception {`
	`39`	`+ public GoPluginApiResponse execute() {`
`40`	`40`	`ArrayList<Map<String, String>> result = new ArrayList<>();`
`41`	`41`
`42`	`42`	`List<String> knownFields = new ArrayList<>();`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public class GetClusterProfileMetadataExecutor implements RequestExecutor {`
`64`	`64`
`65`	`65`	`@Override`
`66`	`66`
`67`		`- public GoPluginApiResponse execute() throws Exception {`
	`67`	`+ public GoPluginApiResponse execute() {`
`68`	`68`	`return new DefaultGoPluginApiResponse(200, GSON.toJson(FIELDS));`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class GetProfileMetadataExecutor implements RequestExecutor {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`
`58`		`- public GoPluginApiResponse execute() throws Exception {`
	`58`	`+ public GoPluginApiResponse execute() {`
`59`	`59`	`return new DefaultGoPluginApiResponse(200, GSON.toJson(FIELDS));`
`60`	`60`	`}`
`61`	`61`	`}`