Merge pull request #81 from NoodlesNZ/master

Add Github deploy

Author: asaf-erlich

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

@@ -30,6 +30,7 @@
 import com.amazonaws.services.codedeploy.model.GetDeploymentRequest;
 import com.amazonaws.services.codedeploy.model.RegisterApplicationRevisionRequest;
 import com.amazonaws.services.codedeploy.model.S3Location;
+import com.amazonaws.services.codedeploy.model.GitHubLocation;
 
 import hudson.AbortException;
 import hudson.FilePath;
@@ -84,6 +85,8 @@ public class AWSCodeDeployPublisher extends Publisher implements SimpleBuildStep
 
     private final String  s3bucket;
     private final String  s3prefix;
+    private final String  githubRepository;
+    private final String  githubCommitId;
     private final String  applicationName;
     private final String  deploymentGroupName; // TODO allow for deployment to multiple groups
     private final String  deploymentConfig;
@@ -113,6 +116,8 @@ public class AWSCodeDeployPublisher extends Publisher implements SimpleBuildStep
     public AWSCodeDeployPublisher(
             String s3bucket,
             String s3prefix,
+            String githubRepository,
+            String githubCommitId,
             String applicationName,
             String deploymentGroupName,
             String deploymentConfig,
@@ -180,6 +185,9 @@ public AWSCodeDeployPublisher(
         } else {
             this.s3prefix = s3prefix;
         }
+
+        this.githubRepository = githubRepository;
+        this.githubCommitId = githubCommitId;
     }
 
     @Override
@@ -226,8 +234,15 @@ public void perform(@Nonnull Run<?,?> build, @Nonnull FilePath workspace, @Nonnu
             if (workspace == null) {
                 throw new IllegalArgumentException("No workspace present for the build.");
             }
-            final FilePath sourceDirectory = getSourceDirectory(workspace);
-            final RevisionLocation revisionLocation = zipAndUpload(aws, projectName, sourceDirectory);
+
+            RevisionLocation revisionLocation;
+
+            if (!StringUtils.isEmpty(this.githubRepository) && !StringUtils.isEmpty(this.githubCommitId)) {
+              revisionLocation = createFromGitHub();
+            } else {
+              final FilePath sourceDirectory = getSourceDirectory(workspace);
+              revisionLocation = zipAndUpload(aws, projectName, sourceDirectory);
+            }
 
             registerRevision(aws, revisionLocation);
             if ("onlyRevision".equals(deploymentMethod)){
@@ -395,6 +410,18 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
         }
     }
 
+    private RevisionLocation createFromGitHub() {
+      GitHubLocation githubLocation = new GitHubLocation();
+      githubLocation.setRepository(this.githubRepository);
+      githubLocation.setCommitId(this.githubCommitId);
+
+      RevisionLocation revisionLocation = new RevisionLocation();
+      revisionLocation.setRevisionType(RevisionLocationType.GitHub);
+      revisionLocation.setGitHubLocation(githubLocation);
+
+      return revisionLocation;
+    }
+
     private void registerRevision(AWSClients aws, RevisionLocation revisionLocation) {
 
         String applicationName = getApplicationNameFromEnv();

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

@@ -18,6 +18,12 @@
   <f:entry title="S3 Prefix" field="s3prefix">
     <f:textbox default="" />
   </f:entry>
+  <f:entry title="GitHub Repository" field="githubRespository">
+    <f:textbox default="" />
+  </f:entry>
+  <f:entry title="GitHub Commit Id" field="githubCommitId">
+    <f:textbox default="" />
+  </f:entry>
   <f:entry title="Subdirectory" field="subdirectory">
     <f:textbox default="" />
   </f:entry>

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

@@ -0,0 +1,3 @@
+<div>
+  The GitHub commit id hash of the revision to be pushed to CodeDeploy. This is to be used in Pipeline mode.
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+  The GitHub repository used to pull the revision from. This is to be used in Pipeline mode.
+</div>