Merge branch 'zip-subdirectory' of git://github.com/cosmincatalin/aws-codedeploy-plugin into cosmincatalin-zip-subdirectory

Add the posibility of zipping a specific subdirectory from the workspace

Conflicts:
	src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java
	src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/config.jelly

Author: Jmcfar

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

@@ -1,12 +1,12 @@
 /*
  * Copyright 2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
  * A copy of the License is located at
- * 
+ *
  *  http://aws.amazon.com/apache2.0
- * 
+ *
  * or in the "license" file accompanying this file. This file is distributed
  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
  * express or implied. See the License for the specific language governing
@@ -91,6 +91,7 @@ public class AWSCodeDeployPublisher extends Publisher {
     private final String region;
     private final String includes;
     private final String excludes;
+    private final String subdirectory;
     private final String proxyHost;
     private final int proxyPort;
 
@@ -118,7 +119,8 @@ public AWSCodeDeployPublisher(
             String includes,
             String proxyHost,
             int proxyPort,
-            String excludes) {
+            String excludes,
+            String subdirectory) {
 
         this.externalId = externalId;
         this.applicationName = applicationName;
@@ -127,6 +129,7 @@ public AWSCodeDeployPublisher(
         this.region = region;
         this.includes = includes;
         this.excludes = excludes;
+        this.subdirectory = subdirectory;
         this.proxyHost = proxyHost;
         this.proxyPort = proxyPort;
         this.credentials = credentials;
@@ -178,8 +181,8 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
         if ("awsAccessKey".equals(credentials)) {
             if (StringUtils.isEmpty(this.awsAccessKey) && StringUtils.isEmpty(this.awsSecretKey)) {
                 aws = AWSClients.fromDefaultCredentialChain(
-                        this.region, 
-                        this.proxyHost, 
+                        this.region,
+                        this.proxyHost,
                         this.proxyPort);
             } else {
                 aws = AWSClients.fromBasicCredentials(
@@ -205,7 +208,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
             verifyCodeDeployApplication(aws);
 
             String projectName = build.getProject().getName();
-            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, build.getWorkspace());
+            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()));
 
             registerRevision(aws, revisionLocation);
             String deploymentId = createDeployment(aws, revisionLocation);
@@ -224,6 +227,30 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
         return success;
     }
 
+    private FilePath getSourceDirectory(FilePath basePath) throws IOException, InterruptedException {
+        String subdirectory = this.subdirectory.trim().length() > 0 ? this.subdirectory.trim() : "";
+        if (!subdirectory.isEmpty() && !subdirectory.startsWith("/")) {
+            subdirectory = "/" + subdirectory;
+        }
+        FilePath sourcePath = basePath.withSuffix(subdirectory).absolutize();
+        File sourceDirectory = new File(sourcePath.getRemote());
+        if (!sourceDirectory.isDirectory() || !isSubDirectory(basePath, sourcePath)) {
+            throw new IllegalArgumentException("Provided path is not a subdirectory of the workspace: " + sourcePath );
+        }
+        return sourcePath;
+    }
+
+    private boolean isSubDirectory(FilePath parent, FilePath child) {
+        FilePath parentFolder = child;
+        while (parentFolder!=null) {
+            if (parent.equals(parentFolder)) {
+                return true;
+            }
+            parentFolder = child.getParent();
+        }
+        return false;
+    }
+
     private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentException {
         // Check that the application exists
         ListApplicationsResult applications = aws.codedeploy.listApplications();
@@ -243,15 +270,15 @@ private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentE
         }
     }
 
-    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath workspace) throws IOException,  InterruptedException {
-        
+    private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath sourceDirectory) throws IOException,  InterruptedException {
+
         File zipFile = File.createTempFile(projectName + "-", ".zip");
         String key;
-        
+
         try {
+            this.logger.println("Zipping files into " + zipFile.getAbsolutePath());
 
-            this.logger.println("Zipping workspace into " + zipFile.getAbsolutePath());
-            workspace.zip(
+            sourceDirectory.zip(
                     new FileOutputStream(zipFile),
                     new DirScanner.Glob(this.includes, this.excludes)
             );
@@ -418,7 +445,7 @@ public FormValidation doCheckName(@QueryParameter String value)
         }
 
         public boolean isApplicable(Class<? extends AbstractProject> aClass) {
-            // Indicates that this builder can be used with all kinds of project types 
+            // Indicates that this builder can be used with all kinds of project types
             return true;
         }
 
@@ -588,6 +615,10 @@ public String getExcludes() {
         return excludes;
     }
 
+    public String getSubdirectory() {
+        return subdirectory;
+    }
+
     public String getRegion() {
         return region;
     }

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

@@ -17,6 +17,9 @@
   <f:entry title="S3 Prefix" field="s3prefix">
     <f:textbox default="" />
   </f:entry>
+  <f:entry title="Subdirectory" field="subdirectory">
+    <f:textbox default="" />
+  </f:entry>
   <f:entry title="Include Files" field="includes">
     <f:textbox default="**" />
   </f:entry>

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

@@ -0,0 +1,5 @@
+<div>
+    A subdirectory inside the workspace to be packed instead of the whole workspace. Remember that the
+    <i>appspec.yml</i> must be placed at the top of the .zip archive. The <i>excludes</i> and <i>includes</i> will
+    be applied based on this path.
+</div>