Merge branch 'wspi-master'

Author: Jmcfar

src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java

@@ -57,6 +57,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Date;
@@ -100,6 +101,8 @@ public class AWSCodeDeployPublisher extends Publisher {
     private final String awsAccessKey;
     private final String awsSecretKey;
     private final String credentials;
+    private final String deploymentMethod;
+    private final String versionFileName;
 
     private PrintStream logger;
     private Map <String, String> envVars;
@@ -117,6 +120,8 @@ public AWSCodeDeployPublisher(
             Long pollingTimeoutSec,
             Long pollingFreqSec,
             String credentials,
+            String versionFileName,
+            String deploymentMethod,
             String awsAccessKey,
             String awsSecretKey,
             String iamRoleArn,
@@ -142,6 +147,8 @@ public AWSCodeDeployPublisher(
         this.proxyHost = proxyHost;
         this.proxyPort = proxyPort;
         this.credentials = credentials;
+        this.deploymentMethod = deploymentMethod;
+        this.versionFileName = versionFileName;
         this.awsAccessKey = awsAccessKey;
         this.awsSecretKey = awsSecretKey;
         this.iamRoleArn = iamRoleArn;
@@ -165,7 +172,6 @@ public AWSCodeDeployPublisher(
             this.pollingFreqSec = null;
         }
 
-
         this.s3bucket = s3bucket;
         if (s3prefix == null || s3prefix.equals("/") || s3prefix.length() == 0) {
             this.s3prefix = "";
@@ -218,9 +224,14 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
             RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()));
 
             registerRevision(aws, revisionLocation);
-            String deploymentId = createDeployment(aws, revisionLocation);
+            if ("onlyRevision".equals(deploymentMethod)){
+              success = true;
+            } else {
+
+              String deploymentId = createDeployment(aws, revisionLocation);
 
-            success = waitForDeployment(aws, deploymentId);
+              success = waitForDeployment(aws, deploymentId);
+            }
 
         } catch (Exception e) {
 
@@ -263,7 +274,7 @@ private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentE
         ListApplicationsResult applications = aws.codedeploy.listApplications();
         String applicationName = getApplicationNameFromEnv();
         String deploymentGroupName = getDeploymentGroupNameFromEnv();
- 
+
         if (!applications.getApplications().contains(applicationName)) {
             throw new IllegalArgumentException("Cannot find application named '" + applicationName + "'");
         }
@@ -281,7 +292,31 @@ private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentE
 
     private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory) throws IOException, InterruptedException, IllegalArgumentException {
 
-        File zipFile = File.createTempFile(projectName + "-", ".zip");
+        File zipFile = null;
+        File versionFile;
+        versionFile = new File(sourceDirectory + "/" + versionFileName);
+
+        FileReader reader = null;
+        String version = null;
+        try {
+          reader = new FileReader(versionFile);
+          char[] chars = new char[(int) versionFile.length() -1];
+          reader.read(chars);
+          version = new String(chars);
+          reader.close();
+        } catch (IOException e) {
+          e.printStackTrace();
+        } finally {
+          if(reader !=null){reader.close();}
+        }
+
+        if (version != null){
+          zipFile = new File("/tmp/" + projectName + "-" + version + ".zip");
+          zipFile.createNewFile();
+        } else {
+          zipFile = File.createTempFile(projectName + "-", ".zip");
+        }
+
         String key;
         File appspec;
         File dest;
@@ -329,7 +364,6 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
             logger.println("Uploading zip to s3://" + bucket + "/" + key);
             PutObjectResult s3result = aws.s3.putObject(bucket, key, zipFile);
 
-
             S3Location s3Location = new S3Location();
             s3Location.setBucket(bucket);
             s3Location.setKey(key);
@@ -418,9 +452,9 @@ private boolean waitForDeployment(AWSClients aws, String deploymentId) throws In
 
             Thread.sleep(pollingFreqMillis);
         }
-        
+
         logger.println("Deployment status: " + deployStatus.getStatus() + "; instances: " + deployStatus.getDeploymentOverview());
-        
+
         if (!deployStatus.getStatus().equals(DeploymentStatus.Succeeded.toString())) {
             this.logger.println("Deployment did not succeed. Final status: " + deployStatus.getStatus());
             success = false;
@@ -634,6 +668,14 @@ public String getExternalId() {
         return externalId;
     }
 
+    public String getDeploymentMethod() {
+        return deploymentMethod;
+    }
+
+    public String getVersionFileName() {
+        return versionFileName;
+    }
+
     public boolean getWaitForCompletion() {
         return waitForCompletion;
     }
@@ -690,4 +732,3 @@ public String getS3PrefixFromEnv() {
         return Util.replaceMacro(this.s3prefix, envVars);
     }
 }
-

src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/config.jelly

@@ -29,22 +29,36 @@
   <f:entry title="Proxy Host" field="proxyHost">
     <f:textbox default="" />
   </f:entry>
-    <f:entry title="Proxy Port" field="proxyPort">
+  <f:entry title="Proxy Port" field="proxyPort">
     <f:textbox default="" />
   </f:entry>
+  <f:entry title="Version File" field="versionFileName">
+    <f:textbox />
+  </f:entry>
 
     <f:entry title="Appspec.yml per Deployment Group"  field="deploymentGroupAppspec">
       <f:checkbox field="deploymentGroupAppspec" checked="${instance.getDeploymentGroupAppspec}"/>
     </f:entry>
 
-  <f:optionalBlock title="Wait for deployment to finish?" field="waitForCompletion"  checked="${instance.getWaitForCompletion()}" inline="true">
-    <f:entry title="Polling Timeout (s)" field="pollingTimeoutSec">
-      <f:textbox default="300"/>
-    </f:entry>
-    <f:entry title="Polling Frequency (s)" field="pollingFreqSec">
-      <f:textbox default="15"/>
-    </f:entry>
-  </f:optionalBlock>
+    <f:radioBlock title="Register Revision" name="deploymentMethod" value="onlyRevision" checked="${instance.getDeploymentMethod() == 'onlyRevision'}" inline="true">
+      <f:description>
+        Register the new revision with the specified CodeDeploy application but do not deploy it.
+      </f:description>
+    </f:radioBlock>
+
+    <f:radioBlock title="Deploy Revision" name="deploymentMethod" value="deploy" checked="${instance.getDeploymentMethod() == 'deploy'}" inline="true">
+      <f:description>
+        Register the new revision and deploy it to the specified CodeDeploy deployment group.
+      </f:description>
+      <f:optionalBlock title="Wait for deployment to finish?" field="waitForCompletion" checked="${instance.getWaitForCompletion()}" inline="true">
+        <f:entry title="Polling Timeout (s)" field="pollingTimeoutSec">
+          <f:textbox default="300"/>
+        </f:entry>
+        <f:entry title="Polling Frequency (s)" field="pollingFreqSec">
+          <f:textbox default="15"/>
+        </f:entry>
+      </f:optionalBlock>
+    </f:radioBlock>
 
   <f:radioBlock title="Use Access/Secret keys" name="credentials" checked="${instance.getCredentials() == 'awsAccessKey'}" inline="true" value="awsAccessKey">
     <f:description>