Add support for environment variables defined in jenkins build

Author: Amine Fattouch

src/main/java/com/amazonaws/codedeploy/AWSClients.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
@@ -74,15 +74,15 @@ public AWSClients(String region, AWSCredentials credentials, String proxyHost, i
         codedeploy.setRegion(Region.getRegion(Regions.fromName(this.region)));
         s3.setRegion(Region.getRegion(Regions.fromName(this.region)));
     }
-    
+
     public static AWSClients fromDefaultCredentialChain(String region, String proxyHost, int proxyPort) {
         return new AWSClients(region, null, proxyHost, proxyPort);
     }
-    
+
     public static AWSClients fromIAMRole(String region, String iamRole, String externalId, String proxyHost, int proxyPort) {
         return new AWSClients(region, getCredentials(iamRole, externalId), proxyHost, proxyPort);
     }
-    
+
     public static AWSClients fromBasicCredentials(String region, String awsAccessKey, String awsSecretKey, String proxyHost, int proxyPort) {
         return new AWSClients(region, new BasicAWSCredentials(awsAccessKey, awsSecretKey), proxyHost, proxyPort);
     }

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

@@ -200,12 +200,21 @@ public void perform(@Nonnull Run<?,?> build, @Nonnull FilePath workspace, @Nonnu
                         this.proxyHost,
                         this.proxyPort);
             } else {
-                aws = AWSClients.fromBasicCredentials(
+                if (StringUtils.isEmpty(envVars.get(this.awsAccessKey)) && StringUtils.isEmpty(envVars.get(this.awsSecretKey))) {
+                    aws = AWSClients.fromBasicCredentials(
                         this.region,
                         this.awsAccessKey,
                         this.awsSecretKey,
                         this.proxyHost,
                         this.proxyPort);
+                } else {
+                    aws = AWSClients.fromBasicCredentials(
+                        this.region,
+                        envVars.get(this.awsAccessKey),
+                        envVars.get(this.awsSecretKey),
+                        this.proxyHost,
+                        this.proxyPort);
+                }
             }
         } else {
             aws = AWSClients.fromIAMRole(

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

@@ -1,6 +1,8 @@
 <div>
   <p>AWS Access and Secret keys to use for this deployment. At minimum the keys must be allowed to execute
-  <code>codedeploy:*</code> and <code>s3:Put*</code>. It's a best practice to have these keys be from an IAM role
+  <code>codedeploy:*</code> and <code>s3:Put*</code>. 
+  You can also use environment variables defined in jenkins's build for this fields.
+  It's a best practice to have these keys be from an IAM role
   with limited scope.</p>
 
   <p>

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

@@ -1,6 +1,8 @@
 <div>
   <p>AWS Access and Secret keys to use for this deployment. At minimum the keys must be allowed to execute
-  <code>codedeploy:*</code> and <code>s3:Put*</code>. It's a best practice to have these keys be from an IAM role
+  <code>codedeploy:*</code> and <code>s3:Put*</code>. 
+  You can also use environment variables defined in jenkins's build for this fields.
+  It's a best practice to have these keys be from an IAM role
   with limited scope.</p>
 
   <p>