Merge pull request #4 from awslabs/master

Merging pull requests from the parent repo

Author: surybala

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

@@ -50,6 +50,7 @@
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.io.FileUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
@@ -76,15 +77,16 @@ 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};
+    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};
 
     private final String  s3bucket;
     private final String  s3prefix;
     private final String  applicationName;
-    private final String  deploymentGroupName; // TODO allow for deployment to multiple groups
+    private       String  deploymentGroupName; // TODO allow for deployment to multiple groups
     private final String  deploymentConfig;
     private final Long    pollingTimeoutSec;
     private final Long    pollingFreqSec;
+    private final boolean deploymentGroupAppspec;
     private final boolean waitForCompletion;
     private final String  externalId;
     private final String  iamRoleArn;
@@ -110,6 +112,7 @@ public AWSCodeDeployPublisher(
             String deploymentGroupName,
             String deploymentConfig,
             String region,
+            Boolean deploymentGroupAppspec,
             Boolean waitForCompletion,
             Long pollingTimeoutSec,
             Long pollingFreqSec,
@@ -142,6 +145,7 @@ public AWSCodeDeployPublisher(
         this.awsAccessKey = awsAccessKey;
         this.awsSecretKey = awsSecretKey;
         this.iamRoleArn = iamRoleArn;
+        this.deploymentGroupAppspec = deploymentGroupAppspec;
 
         if (waitForCompletion != null && waitForCompletion) {
             this.waitForCompletion = waitForCompletion;
@@ -209,10 +213,13 @@ 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()), build.getEnvironment(listener));
+            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()), envVars);
 
             registerRevision(aws, revisionLocation);
             String deploymentId = createDeployment(aws, revisionLocation);
@@ -274,13 +281,29 @@ private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentE
         }
     }
 
-    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory, Map<String, String> envVars) throws IOException,  InterruptedException {
+    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory, Map<String, String> envVars) throws IOException, InterruptedException, IllegalArgumentException {
 
         File zipFile = File.createTempFile(projectName + "-", ".zip");
         String key;
-
+        File appspec;
+        File dest;
         try {
-            this.logger.println("Zipping files into " + zipFile.getAbsolutePath());
+            if (this.deploymentGroupAppspec) {
+                appspec = new File(sourceDirectory + "/appspec." + this.deploymentGroupName + ".yml");
+                if (appspec.exists()) {
+                    dest = new File(sourceDirectory + "/appspec.yml");
+                    FileUtils.copyFile(appspec, dest);
+                    logger.println("Use appspec." + this.deploymentGroupName + ".yml");
+                }
+                if (!appspec.exists()) {
+                    throw new IllegalArgumentException("/appspec." + this.deploymentGroupName + ".yml file does not exist" );
+                }
+
+            }
+
+            logger.println("Zipping files into " + zipFile.getAbsolutePath());
+
+
 
             sourceDirectory.zip(
                     new FileOutputStream(zipFile),
@@ -608,6 +631,10 @@ public boolean getWaitForCompletion() {
         return waitForCompletion;
     }
 
+    public boolean getDeploymentGroupAppspec() {
+        return deploymentGroupAppspec;
+    }
+
     public String getCredentials() {
         return credentials;
     }

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

@@ -33,6 +33,10 @@
     <f:textbox default="" />
   </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"/>

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

@@ -2,5 +2,6 @@
   The name of the AWS CodeDeploy application you wish to deploy to. This plugin assumes that you've
   already created the application and deployment group. If you haven't already, work through the <a
   href="http://alpha-docs-aws.amazon.com/codedeploy/latest/userguide/how-to-create-application.html">How
-  to create an Application with AWS CodeDeploy</a> documentation.
+  to create an Application with AWS CodeDeploy</a> documentation. You can use environment variables
+  in this field.
 </div>

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

@@ -0,0 +1,5 @@
+<div>
+    <p>If checked, the build will use a dedicated appspec.yml file per deployment group.</p>
+    <p>The appspec file should be named "appspec.DEPLOYMENT_GROUP_NAME.yml" and must be present in the jenkins project workspace.</p><br><br>
+    <p>e.g.: appsec.staging.yml</p>
+</div>