Merge pull request #8 from danieljimenez/skipDuplicateVersions

First pass: Skip upload of Application Version if one already exists …

Author: rtfpessoa

aws-elasticbeanstalk-agent/src/main/java/jetbrains/buildServer/runner/elasticbeanstalk/ElasticBeanstalkRunner.java

@@ -54,9 +54,10 @@ protected BuildFinishedStatus runImpl() throws RunBuildException {
         final String applicationName = runnerParameters.get(APP_NAME_PARAM);
         final String environmentName = runnerParameters.get(ENV_NAME_PARAM);
         final String versionLabel = runnerParameters.get(APP_VERSION_PARAM);
+        final Boolean skipDuplicateVersions = Boolean.valueOf(runnerParameters.get(APP_VERSION_SKIP_DUPE_PARAM));
 
         if (!m.problemOccurred && !isInterrupted()) {
-          awsClient.createApplicationVersion(applicationName, versionLabel, s3BucketName, s3ObjectKey);
+          awsClient.createApplicationVersion(applicationName, versionLabel, skipDuplicateVersions, s3BucketName, s3ObjectKey);
         }
 
         if (!m.problemOccurred && !isInterrupted()) {

aws-elasticbeanstalk-agent/src/main/java/jetbrains/buildServer/runner/elasticbeanstalk/LoggingDeploymentListener.java

@@ -57,6 +57,12 @@ void createVersionStarted(@NotNull String applicationName, @NotNull String versi
     log(String.format("Creating application %s version %s with bucket %s and key %s", applicationName, versionLabel, s3BucketName, s3ObjectKey));
   }
 
+  @Override
+  void createVersionSkipped(@NotNull String applicationName, @NotNull String versionLabel) {
+    log(String.format("Application %s version %s already exists, skipping upload...", applicationName, versionLabel));
+    close(CREATE_VERSION);
+  }
+
   @Override
   void createVersionFinished(@NotNull String applicationName, @NotNull String versionLabel,
                              @NotNull String s3BucketName, @NotNull String s3ObjectKey) {
@@ -144,6 +150,7 @@ private Collection<String> getIdentityFormingParameters() {
       myRunnerParameters.get(ElasticBeanstalkConstants.S3_BUCKET_NAME_PARAM),
       myRunnerParameters.get(ElasticBeanstalkConstants.ENV_NAME_PARAM),
       myRunnerParameters.get(ElasticBeanstalkConstants.APP_NAME_PARAM),
+      myRunnerParameters.get(ElasticBeanstalkConstants.APP_VERSION_SKIP_DUPE_PARAM),
       myRunnerParameters.get(ElasticBeanstalkConstants.APP_VERSION_PARAM));
   }
 

aws-elasticbeanstalk-common/src/main/java/jetbrains/buildServer/runner/elasticbeanstalk/AWSClient.java

@@ -53,18 +53,25 @@ AWSClient withListener(@NotNull Listener listener) {
    * <p>
    * For performing this operation target AWSClient must have corresponding S3 permissions.
    *
-   * @param s3BucketName valid S3 bucket name
-   * @param s3ObjectKey  valid S3 object key
+   * @param skipDuplicateVersions if the application version already exists, do we error out?
+   * @param s3BucketName          valid S3 bucket name
+   * @param s3ObjectKey           valid S3 object key
    */
-  void createApplicationVersion(@NotNull String applicationName, @NotNull String versionLabel,
+  void createApplicationVersion(@NotNull String applicationName, @NotNull String versionLabel, @NotNull Boolean skipDuplicateVersions,
                                 @NotNull String s3BucketName, @NotNull String s3ObjectKey) {
     try {
       myListener.createVersionStarted(applicationName, versionLabel, s3BucketName, s3ObjectKey);
       S3Location location = new S3Location().withS3Bucket(s3BucketName).withS3Key(s3ObjectKey);
       CreateApplicationVersionRequest request = new CreateApplicationVersionRequest(applicationName, versionLabel)
         .withSourceBundle(location);
-      myElasticBeanstalkClient.createApplicationVersion(request);
-      myListener.createVersionFinished(applicationName, versionLabel, s3BucketName, s3ObjectKey);
+
+      if (skipDuplicateVersions && doesApplicationVersionExist(applicationName, versionLabel)) {
+        myListener.createVersionSkipped(applicationName, versionLabel);
+      } else {
+        myElasticBeanstalkClient.createApplicationVersion(request);
+        myListener.createVersionFinished(applicationName, versionLabel, s3BucketName, s3ObjectKey);
+      }
+
     } catch (Throwable t) {
       processFailure(t);
     }
@@ -233,6 +240,20 @@ private String removeTrailingDot(@Nullable String msg) {
     return (msg != null && msg.endsWith(".")) ? msg.substring(0, msg.length() - 1) : msg;
   }
 
+  private boolean doesApplicationVersionExist(@NotNull String applicationName, @NotNull String versionLabel) {
+    DescribeApplicationVersionsRequest request =
+      new DescribeApplicationVersionsRequest()
+        .withApplicationName(applicationName)
+        .withVersionLabels(versionLabel);
+
+    DescribeApplicationVersionsResult describeApplicationVersionsResult
+      = myElasticBeanstalkClient.describeApplicationVersions(request);
+
+    List<ApplicationVersionDescription> applicationVersions = describeApplicationVersionsResult.getApplicationVersions();
+
+    return applicationVersions != null && applicationVersions.size() > 0;
+  }
+
   static class Listener {
     void createVersionStarted(@NotNull String applicationName, @NotNull String versionLabel,
                               @NotNull String s3BucketName, @NotNull String s3ObjectKey) {
@@ -242,6 +263,10 @@ void createVersionFinished(@NotNull String applicationName, @NotNull String vers
                                @NotNull String s3BucketName, @NotNull String s3ObjectKey) {
     }
 
+    void createVersionSkipped(@NotNull String applicationName, @NotNull String versionLabel) {
+
+    }
+
     void deploymentStarted(@NotNull String environmentId, @NotNull String environmentName, @NotNull String versionLabel) {
     }
 

aws-elasticbeanstalk-common/src/main/java/jetbrains/buildServer/runner/elasticbeanstalk/ElasticBeanstalkConstants.java

@@ -47,10 +47,15 @@ public interface ElasticBeanstalkConstants {
   String APP_VERSION_PARAM = "elasticbeanstalk_version_label";
   String APP_VERSION_LABEL = "Application Version";
 
+  String APP_VERSION_SKIP_DUPE_PARAM = "elasticbeanstalk_version_skip_dupe_label";
+  String APP_VERSION_SKIP_DUPE_LABEL = "Skip Upload If Application Version Already Exists?";
+
   String WAIT_FLAG_PARAM = "elasticbeanstalk_wait";
   String WAIT_FLAG_LABEL = "Wait for deployment finish";
+
   String WAIT_TIMEOUT_SEC_PARAM = "elasticbeanstalk_wait_timeout_sec";
   String WAIT_TIMEOUT_SEC_LABEL = "Timeout (seconds)";
+
   String WAIT_POLL_INTERVAL_SEC_CONFIG_PARAM = "elasticbeanstalk.wait.poll.interval.sec";
   int WAIT_POLL_INTERVAL_SEC_DEFAULT = 20;
 

aws-elasticbeanstalk-server/src/main/resources/buildServerResources/editElasticBeanstalkParams.jsp

@@ -68,6 +68,10 @@
         <span class="smallNote">Version Label to Publish</span><span class="error" id="error_${app_version_param}"></span>
     </td>
 </tr>
+<tr>
+    <th><label for="${app_version_skip_dupe_param}">${app_version_skip_dupe_label}: </label></th>
+    <td><props:checkboxProperty name="${app_version_skip_dupe_param}" uncheckedValue="false" /></td>
+</tr>
 <tr>
     <th><label for="${wait_flag_param}">${wait_flag_label}: </label></th>
     <td><props:checkboxProperty name="${wait_flag_param}" uncheckedValue="false" onclick="elasticBeanstalkWaitFlag()"/></td>

aws-elasticbeanstalk-server/src/main/resources/buildServerResources/paramsConstants.jspf

@@ -36,6 +36,9 @@
 <c:set var="app_version_param" value="<%=ElasticBeanstalkConstants.APP_VERSION_PARAM%>"/>
 <c:set var="app_version_label" value="<%=ElasticBeanstalkConstants.APP_VERSION_LABEL%>"/>
 
+<c:set var="app_version_skip_dupe_param" value="<%=ElasticBeanstalkConstants.APP_VERSION_SKIP_DUPE_PARAM%>"/>
+<c:set var="app_version_skip_dupe_label" value="<%=ElasticBeanstalkConstants.APP_VERSION_SKIP_DUPE_LABEL%>"/>
+
 <c:set var="wait_flag_param" value="<%=ElasticBeanstalkConstants.WAIT_FLAG_PARAM%>"/>
 <c:set var="wait_flag_label" value="<%=ElasticBeanstalkConstants.WAIT_FLAG_LABEL%>"/>
 

aws-elasticbeanstalk-server/src/main/resources/buildServerResources/viewElasticBeanstalkParams.jsp

@@ -41,6 +41,10 @@
     ${app_version_label}: <props:displayValue name="${app_version_param}" emptyValue="empty"/>
 </div>
 
+<div class="parameter">
+    ${app_version_skip_dupe_label}: <strong><props:displayCheckboxValue name="${app_version_skip_dupe_param}"/></strong>
+</div>
+
 <div class="parameter">
     ${wait_flag_label}: <strong><props:displayCheckboxValue name="${wait_flag_param}"/></strong>
 </div>