Merge branch 's3-env-variables' of git://github.com/cosmincatalin/aws-codedeploy-plugin into cosmincatalin-s3-env-variables

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

Author: Jmcfar

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

@@ -34,6 +34,7 @@
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.Extension;
+import hudson.Util;
 import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;
 import hudson.model.AbstractProject;
@@ -58,6 +59,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Date;
+import java.util.Map;
 import java.util.UUID;
 
 import javax.servlet.ServletException;
@@ -168,7 +170,7 @@ public AWSCodeDeployPublisher(
     }
 
     @Override
-    public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) {
+    public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
 
         this.logger = listener.getLogger();
         final boolean buildFailed = build.getResult() == Result.FAILURE;
@@ -208,7 +210,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
             verifyCodeDeployApplication(aws);
 
             String projectName = build.getProject().getName();
-            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()));
+            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()), build.getEnvironment(listener));
 
             registerRevision(aws, revisionLocation);
             String deploymentId = createDeployment(aws, revisionLocation);
@@ -270,7 +272,7 @@ private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentE
         }
     }
 
-    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory) throws IOException,  InterruptedException {
+    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory, Map<String, String> envVars) throws IOException,  InterruptedException {
 
         File zipFile = File.createTempFile(projectName + "-", ".zip");
         String key;
@@ -286,14 +288,13 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
             if (this.s3prefix.isEmpty()) {
                 key = zipFile.getName();
             } else {
-                key = this.s3prefix;
+                key = Util.replaceMacro(this.s3prefix, envVars);
                 if (this.s3prefix.endsWith("/")) {
                     key += zipFile.getName();
                 } else {
                     key += "/" + zipFile.getName();
                 }
             }
-
             logger.println("Uploading zip to s3://" + this.s3bucket + "/" + key);
             PutObjectResult s3result = aws.s3.putObject(this.s3bucket, key, zipFile);
 

src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/help-s3prefix.html

@@ -1,3 +1,4 @@
 <div>
-  The prefix in the S3 Bucket to prepend to the AWS CodeDeploy revision. Default is the root of the bucket.
+  The prefix in the S3 Bucket to prepend to the AWS CodeDeploy revision. Default is the root of the bucket. You can
+  use environment variables in this field.
 </div>