Bump up plugin version to 2.1.0 (#45)

Author: bdpiprava

CHANGELOG.md

@@ -1,5 +1,12 @@
-## 2.0.0 - 2017-09-20
+## 2.1.0 - 2017-09-28
+
+### Added
 
+- Support to start service with volume mount.
+- Support to start a service with an existing network.
+- UI improvement for status report. 
+
+## 2.0.0 - 2017-09-20
 
 ### Added
 

src/main/java/cd/go/contrib/elasticagents/dockerswarm/elasticagent/DockerService.java

@@ -16,38 +16,26 @@
 
 package cd.go.contrib.elasticagents.dockerswarm.elasticagent;
 
-import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.Constants.CONFIGURATION_LABEL_KEY;
-import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.Constants.CREATED_BY_LABEL_KEY;
-import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.Constants.ENVIRONMENT_LABEL_KEY;
-import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.DockerPlugin.LOG;
-import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.utils.Util.dockerApiVersionAtLeast;
-import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.utils.Util.splitIntoLinesAndTrimSpaces;
-import static org.apache.commons.lang.StringUtils.isBlank;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import cd.go.contrib.elasticagents.dockerswarm.elasticagent.requests.CreateAgentRequest;
 import cd.go.contrib.elasticagents.dockerswarm.elasticagent.utils.Size;
 import com.google.gson.Gson;
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.exceptions.ServiceNotFoundException;
 import com.spotify.docker.client.messages.ServiceCreateResponse;
-import com.spotify.docker.client.messages.swarm.ContainerSpec;
-import com.spotify.docker.client.messages.swarm.ResourceRequirements;
-import com.spotify.docker.client.messages.swarm.Resources;
-import com.spotify.docker.client.messages.swarm.Service;
-import com.spotify.docker.client.messages.swarm.ServiceSpec;
-import com.spotify.docker.client.messages.swarm.TaskSpec;
+import com.spotify.docker.client.messages.swarm.*;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
 
+import java.util.*;
+
+import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.Constants.*;
+import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.DockerPlugin.LOG;
+import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.utils.Util.dockerApiVersionAtLeast;
+import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.utils.Util.splitIntoLinesAndTrimSpaces;
+import static java.text.MessageFormat.format;
+import static org.apache.commons.lang.StringUtils.isBlank;
+
 public class DockerService {
     private static final Gson GSON = new Gson();
     private final DateTime createdAt;
@@ -113,6 +101,8 @@ public static DockerService create(CreateAgentRequest request, PluginSettings se
             containerSpecBuilder.mounts(dockerMounts.toMount(docker.listVolumes().volumes()));
             final DockerSecrets dockerSecrets = DockerSecrets.fromString(request.properties().get("Secrets"));
             containerSpecBuilder.secrets(dockerSecrets.toSecretBind(docker.listSecrets()));
+        } else {
+            LOG.warn(format("Detected docker version and api version is {0} and {1} respectively. Docker with api version 1.26 or above is required to use volume mounts, secrets and host file entries. Please refer https://docs.docker.com/engine/api/v1.32/#section/Versioning for more information about docker release.", docker.version().version(), docker.version().apiVersion()));
         }
 
         TaskSpec taskSpec = TaskSpec.builder()

src/test/java/cd/go/contrib/elasticagents/dockerswarm/elasticagent/BaseTest.java

@@ -34,8 +34,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.Constants.SWARM_SERVICE_NAME;
+import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.DockerPlugin.LOG;
 import static cd.go.contrib.elasticagents.dockerswarm.elasticagent.utils.Util.dockerApiVersionAtLeast;
 import static java.lang.System.getenv;
+import static java.text.MessageFormat.format;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
@@ -77,21 +79,25 @@ private static void removeSecrets() throws Exception {
                     }
                 }
             });
+        } else {
+            LOG.warn(format("Detected docker version and api version is {0} and {1} respectively. Docker with api version 1.26 or above is required to use volume mounts, secrets and host file entries. Please referhttps://docs.docker.com/engine/api/v1.32/#section/Versioning for more information about docker release.", docker.version().version(), docker.version().apiVersion()));
         }
     }
 
     private static void removeVolume() throws Exception {
         if (dockerApiVersionAtLeast(docker, "1.26")) {
             if (docker.listVolumes().volumes() != null) {
                 docker.listVolumes().volumes().forEach(volume -> {
-                    if (volume.labels().containsKey("cd.go.contrib.elasticagents.dockerswarm.elasticagent.DockerPlugin")) {
+                    if (volume.labels() != null && volume.labels().containsKey("cd.go.contrib.elasticagents.dockerswarm.elasticagent.DockerPlugin")) {
                         try {
                             docker.removeVolume(volume.name());
                         } catch (DockerException | InterruptedException e) {
                         }
                     }
                 });
             }
+        } else {
+            LOG.warn(format("Detected docker version and api version is {0} and {1} respectively. Docker with api version 1.26 or above is required to use volume mounts, secrets and host file entries. Please refer https://docs.docker.com/engine/api/v1.32/#section/Versioning for more information about docker release.", docker.version().version(), docker.version().apiVersion()));
         }
     }