Merge pull request #6 from awslabs/master

Merging in latest changes from awslabs repo.

Author: Jmcfar

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

@@ -77,12 +77,12 @@ public class AWSCodeDeployPublisher extends Publisher {
     public static final long      DEFAULT_TIMEOUT_SECONDS           = 900;
     public static final long      DEFAULT_POLLING_FREQUENCY_SECONDS = 15;
     public static final String    ROLE_SESSION_NAME                 = "jenkins-codedeploy-plugin";
-    public static final Regions[] AVAILABLE_REGIONS                 = {Regions.AP_NORTHEAST_1, Regions.AP_SOUTHEAST_2, Regions.EU_WEST_1, Regions.US_EAST_1, Regions.US_WEST_2, Regions.EU_CENTRAL_1};
+    public static final Regions[] AVAILABLE_REGIONS                 = {Regions.AP_NORTHEAST_1, Regions.AP_SOUTHEAST_1, Regions.AP_SOUTHEAST_2, Regions.EU_WEST_1, Regions.US_EAST_1, Regions.US_WEST_2, Regions.EU_CENTRAL_1};
 
     private final String  s3bucket;
     private final String  s3prefix;
     private final String  applicationName;
-    private       String  deploymentGroupName; // TODO allow for deployment to multiple groups
+    private final String  deploymentGroupName; // TODO allow for deployment to multiple groups
     private final String  deploymentConfig;
     private final Long    pollingTimeoutSec;
     private final Long    pollingFreqSec;
@@ -102,7 +102,7 @@ public class AWSCodeDeployPublisher extends Publisher {
     private final String credentials;
 
     private PrintStream logger;
-
+    private Map <String, String> envVars;
     // Fields in config.jelly must match the parameter names in the "DataBoundConstructor"
     @DataBoundConstructor
     public AWSCodeDeployPublisher(
@@ -172,13 +172,12 @@ public AWSCodeDeployPublisher(
         } else {
             this.s3prefix = s3prefix;
         }
-
     }
 
     @Override
     public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
-
         this.logger = listener.getLogger();
+        envVars = build.getEnvironment(listener);
         final boolean buildFailed = build.getResult() == Result.FAILURE;
         if (buildFailed) {
             logger.println("Skipping CodeDeploy publisher as build failed");
@@ -213,13 +212,10 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
 
         try {
 
-            Map<String, String> envVars = build.getEnvironment(listener);
-            this.deploymentGroupName = Util.replaceMacro(this.deploymentGroupName, envVars);
-
             verifyCodeDeployApplication(aws);
 
             String projectName = build.getProject().getName();
-            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()), envVars);
+            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()));
 
             registerRevision(aws, revisionLocation);
             String deploymentId = createDeployment(aws, revisionLocation);
@@ -265,38 +261,44 @@ private boolean isSubDirectory(FilePath parent, FilePath child) {
     private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentException {
         // Check that the application exists
         ListApplicationsResult applications = aws.codedeploy.listApplications();
-
-        if (!applications.getApplications().contains(this.applicationName)) {
-            throw new IllegalArgumentException("Cannot find application named '" + this.applicationName + "'");
+        String applicationName = getApplicationNameFromEnv();
+        String deploymentGroupName = getDeploymentGroupNameFromEnv();
+ 
+        if (!applications.getApplications().contains(applicationName)) {
+            throw new IllegalArgumentException("Cannot find application named '" + applicationName + "'");
         }
 
         // Check that the deployment group exists
         ListDeploymentGroupsResult deploymentGroups = aws.codedeploy.listDeploymentGroups(
                 new ListDeploymentGroupsRequest()
-                        .withApplicationName(this.applicationName)
+                        .withApplicationName(applicationName)
         );
 
-        if (!deploymentGroups.getDeploymentGroups().contains(this.deploymentGroupName)) {
-            throw new IllegalArgumentException("Cannot find deployment group named '" + this.deploymentGroupName + "'");
+        if (!deploymentGroups.getDeploymentGroups().contains(deploymentGroupName)) {
+            throw new IllegalArgumentException("Cannot find deployment group named '" + deploymentGroupName + "'");
         }
     }
 
-    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory, Map<String, String> envVars) throws IOException, InterruptedException, IllegalArgumentException {
+    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory) throws IOException, InterruptedException, IllegalArgumentException {
 
         File zipFile = File.createTempFile(projectName + "-", ".zip");
         String key;
         File appspec;
         File dest;
+        String deploymentGroupName = getDeploymentGroupNameFromEnv();
+        String prefix = getS3PrefixFromEnv();
+        String bucket = getS3BucketFromEnv();
+
         try {
             if (this.deploymentGroupAppspec) {
-                appspec = new File(sourceDirectory + "/appspec." + this.deploymentGroupName + ".yml");
+                appspec = new File(sourceDirectory + "/appspec." + deploymentGroupName + ".yml");
                 if (appspec.exists()) {
                     dest = new File(sourceDirectory + "/appspec.yml");
                     FileUtils.copyFile(appspec, dest);
-                    logger.println("Use appspec." + this.deploymentGroupName + ".yml");
+                    logger.println("Use appspec." + deploymentGroupName + ".yml");
                 }
                 if (!appspec.exists()) {
-                    throw new IllegalArgumentException("/appspec." + this.deploymentGroupName + ".yml file does not exist" );
+                    throw new IllegalArgumentException("/appspec." + deploymentGroupName + ".yml file does not exist" );
                 }
 
             }
@@ -310,22 +312,22 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
                     new DirScanner.Glob(this.includes, this.excludes)
             );
 
-            if (this.s3prefix.isEmpty()) {
+            if (prefix.isEmpty()) {
                 key = zipFile.getName();
             } else {
-                key = Util.replaceMacro(this.s3prefix, envVars);
-                if (this.s3prefix.endsWith("/")) {
+                key = Util.replaceMacro(prefix, envVars);
+                if (prefix.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);
+            logger.println("Uploading zip to s3://" + bucket + "/" + key);
+            PutObjectResult s3result = aws.s3.putObject(bucket, key, zipFile);
 
 
             S3Location s3Location = new S3Location();
-            s3Location.setBucket(this.s3bucket);
+            s3Location.setBucket(bucket);
             s3Location.setKey(key);
             s3Location.setBundleType(BundleType.Zip);
             s3Location.setETag(s3result.getETag());
@@ -342,11 +344,12 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
 
     private void registerRevision(AWSClients aws, RevisionLocation revisionLocation) {
 
-        this.logger.println("Registering revision for application '" + this.applicationName + "'");
+        String applicationName = getApplicationNameFromEnv();
+        this.logger.println("Registering revision for application '" + applicationName + "'");
 
         aws.codedeploy.registerApplicationRevision(
                 new RegisterApplicationRevisionRequest()
-                        .withApplicationName(this.applicationName)
+                        .withApplicationName(applicationName)
                         .withRevision(revisionLocation)
                         .withDescription("Application revision registered via Jenkins")
         );
@@ -358,9 +361,9 @@ private String createDeployment(AWSClients aws, RevisionLocation revisionLocatio
 
         CreateDeploymentResult createDeploymentResult = aws.codedeploy.createDeployment(
                 new CreateDeploymentRequest()
-                        .withDeploymentConfigName(this.deploymentConfig)
-                        .withDeploymentGroupName(this.deploymentGroupName)
-                        .withApplicationName(this.applicationName)
+                        .withDeploymentConfigName(getDeploymentConfigFromEnv())
+                        .withDeploymentGroupName(getDeploymentGroupNameFromEnv())
+                        .withApplicationName(getApplicationNameFromEnv())
                         .withRevision(revisionLocation)
                         .withDescription("Deployment created by Jenkins")
         );
@@ -591,6 +594,10 @@ public String getDeploymentGroupName() {
         return deploymentGroupName;
     }
 
+    public String getDeploymentConfig() {
+        return deploymentConfig;
+    }
+
     public String getS3bucket() {
         return s3bucket;
     }
@@ -619,10 +626,6 @@ public Long getPollingFreqSec() {
         return pollingFreqSec;
     }
 
-    public String getDeploymentConfig() {
-        return deploymentConfig;
-    }
-
     public String getExternalId() {
         return externalId;
     }
@@ -663,5 +666,24 @@ public int getProxyPort() {
         return proxyPort;
     }
 
+    public String getApplicationNameFromEnv() {
+        return Util.replaceMacro(this.applicationName, envVars);
+    }
+
+    public String getDeploymentGroupNameFromEnv() {
+        return Util.replaceMacro(this.deploymentGroupName, envVars);
+    }
+
+    public String getDeploymentConfigFromEnv() {
+        return Util.replaceMacro(this.deploymentConfig, envVars);
+    }
+
+    public String getS3BucketFromEnv() {
+        return Util.replaceMacro(this.s3bucket, envVars);
+    }
+
+    public String getS3PrefixFromEnv() {
+        return Util.replaceMacro(this.s3prefix, envVars);
+    }
 }