Ensure at least one key/secret is defined per the AWS cli order of

operations instead of assuming in a specific location.

Author: virgofx

README.md

@@ -95,28 +95,32 @@ Status  | In Progress: 0  | Pending: 0  | Skipped: 0  | Succeeded: 1  | Failed:
   * The file can then be executed from the /vendor/bin directory: `bash vendor/bin/aws-code-deploy.sh`
 
 
-## Variables
+## Environment Variables
+
+Brief summary is listed in the table below. Full descriptions with recommendations can be found by searching
+the readme for the variable name.
+
+| Variable                                  | Required | Description                                                |
+| :---------------------------------------- | :------- | :----------------------------------------------------------|
+| `AWS_CODE_DEPLOY_KEY`                     | No       | If specified, sets the AWS key id |
+| `AWS_CODE_DEPLOY_SECRET`                  | No       | If specified, sets the AWS secret key |
+| `AWS_CODE_DEPLOY_REGION`                  | No       | If specified, sets the AWS region |
+| `AWS_CODE_DEPLOY_APPLICATION_NAME`        | **Yes**  | Application name. If it does not exist, will create. |
+| `AWS_CODE_DEPLOY_DEPLOYMENT_GROUP_NAME`   | **Yes**  | Deployment group name. If it does not exist, will create. |
+| `AWS_CODE_DEPLOY_DEPLOYMENT_CONFIG_NAME`  | No       | Deployment config name. By default: _CodeDeployDefault.OneAtATime_ |
+| `AWS_CODE_DEPLOY_MINIMUM_HEALTHY_HOSTS`   | No       | The minimum number of healthy instances during deployment. By default: _type=FLEET_PERCENT,value=75_ |
+| `AWS_CODE_DEPLOY_SERVICE_ROLE_ARN`        | No       | Service role arn giving permissions to use Code Deploy when creating a deployment group |
+| `AWS_CODE_DEPLOY_EC2_TAG_FILTERS`         | No       | EC2 tags to filter on when creating a deployment group |
+| `AWS_CODE_DEPLOY_AUTO_SCALING_GROUPS`     | No       | Auto Scaling groups when creating a deployment group |
+| `AWS_CODE_DEPLOY_APP_SOURCE`              | **Yes**  | The source directory used to create the deploy archive |
+| `AWS_CODE_DEPLOY_S3_BUCKET`               | **Yes**  | The name of the S3 bucket to deploy the revision |
+| `AWS_CODE_DEPLOY_S3_KEY_PREFIX`           | No       | A prefix to use for the revision bucket key |
+| `AWS_CODE_DEPLOY_S3_FILENAME`             | **Yes**  | The destination name within S3. |
+| `AWS_CODE_DEPLOY_S3_LIMIT_BUCKET_FILES`   | No       | Number of revisions to limit. If 0, unlimited. By default: 0 |
+| `AWS_CODE_DEPLOY_S3_SSE`                  | No       | If specified and `true` will ensure the CodeDeploy archive is stored in S3 with Server Side Encryption (SSE) |
+| `AWS_CODE_DEPLOY_REVISION_DESCRIPTION`    | No       | A description that is stored within AWS Code Deploy that stores information about the specific revision |
+| `AWS_CODE_DEPLOY_DEPLOYMENT_DESCRIPTION`  | No       | A description that is stored within AWS Code Deploy that stores information about the specific deployment |
 
-```
-AWS_CODE_DEPLOY_KEY
-AWS_CODE_DEPLOY_SECRET
-AWS_CODE_DEPLOY_REGION
-AWS_CODE_DEPLOY_APPLICATION_NAME
-AWS_CODE_DEPLOY_DEPLOYMENT_CONFIG_NAME
-AWS_CODE_DEPLOY_MINIMUM_HEALTHY_HOSTS
-AWS_CODE_DEPLOY_DEPLOYMENT_GROUP_NAME
-AWS_CODE_DEPLOY_SERVICE_ROLE_ARN
-AWS_CODE_DEPLOY_EC2_TAG_FILTERS
-AWS_CODE_DEPLOY_AUTO_SCALING_GROUPS
-AWS_CODE_DEPLOY_APP_SOURCE
-AWS_CODE_DEPLOY_S3_BUCKET
-AWS_CODE_DEPLOY_S3_KEY_PREFIX
-AWS_CODE_DEPLOY_S3_FILENAME
-AWS_CODE_DEPLOY_S3_LIMIT_BUCKET_FILES
-AWS_CODE_DEPLOY_S3_SSE
-AWS_CODE_DEPLOY_REVISION_DESCRIPTION
-AWS_CODE_DEPLOY_DEPLOYMENT_DESCRIPTION
-```
 
 ## Examples
 
@@ -291,7 +295,7 @@ This step ensures the deployment group exists within the specified application.
 Environment Variables:
 
 * `AWS_CODE_DEPLOY_DEPLOYMENT_GROUP_NAME` (required): Deployment group name
-* `AWS_CODE_DEPLOY_SERVICE_ROLE_ARN` (required): Service role arn giving permissions to use Code Deploy when creating a deployment group
+* `AWS_CODE_DEPLOY_SERVICE_ROLE_ARN` (optional): Service role arn giving permissions to use Code Deploy when creating a deployment group
 * `AWS_CODE_DEPLOY_EC2_TAG_FILTERS` (optional): EC2 tags to filter on when creating a deployment group. Specify as a string with the following comma separated keys:
     * **Key** *string*
     * **Value** *string*
@@ -323,7 +327,7 @@ This step consists to push the application to S3.
 Environment Variables:
 
 * `AWS_CODE_DEPLOY_S3_BUCKET` (required): The name of the S3 bucket to deploy the revision
-* `AWS_CODE_DEPLOY_S3_KEY_PREFIX` (optional): A prefix to use for the file key. It's highly recommended to structure a bucket with a prefix per deployment group. This allows to limit stored revisions per deployment group. Note: A leading or trailing slash is not required.  
+* `AWS_CODE_DEPLOY_S3_KEY_PREFIX` (optional): A prefix to use for the file key. It's highly recommended to structure a bucket with a prefix per deployment group. This allows to limit stored revisions per deployment group. Note: A leading or trailing slash is not required.
 
   For example:
 

bin/aws-code-deploy.sh

@@ -181,45 +181,38 @@ fi
 
 h1 "Step 2: Configuring AWS"
 if [ -z "$AWS_CODE_DEPLOY_KEY" ]; then
-  if [ ! -e ~/.aws/config ]; then
-    error "Please configure AWS credentials or explicitly set the \"\$AWS_CODE_DEPLOY_KEY\" variable"
-    exit 1    
-  fi
-  if [ $(grep aws_access_key_id ~/.aws/config | wc -l) -lt 1 ]; then
-    error "Unable to find \"aws_access_key_id\" in ~/.aws/config. Please configure AWS credentials or explicitly set the \"\$AWS_CODE_DEPLOY_KEY\" variable"
+  # Ensure an access key has already been set
+  if [ $(aws configure list | grep access_key | wc -l) -lt 1 ]; then
+    error "No AWS_CODE_DEPLOY_KEY specified and AWS cli is not configured with an access key via env, config, or shared credentials"
     exit 1  
   fi
   success "AWS Access Key already configured."
 else
-  CONFIGURE_KEY_OUTPUT=$(aws configure set aws_access_key_id $AWS_CODE_DEPLOY_KEY 2>&1)
+  $(aws configure set aws_access_key_id $AWS_CODE_DEPLOY_KEY 2>&1)
   success "Successfully configured AWS Access Key ID."
 fi
 
 if [ -z "$AWS_CODE_DEPLOY_SECRET" ]; then
-  if [ ! -e ~/.aws/config ]; then
-    error "Please configure AWS credentials or explicitly set the \"\$AWS_CODE_DEPLOY_SECRET\" variable"
-    exit 1    
-  fi
-  if [ $(grep aws_secret_access_key ~/.aws/config | wc -l) -lt 1 ]; then
-    error "Unable to find \"aws_secret_access_key\" in ~/.aws/config. Please configure AWS credentials or explicitly set the \"\$AWS_CODE_DEPLOY_SECRET\" variable"
+  # Ensure an access key secret has already been set
+  if [ $(aws configure list | grep secret_key | wc -l) -lt 1 ]; then
+    error "No AWS_CODE_DEPLOY_SECRET specified and AWS cli is not configured with an access secret via env, config, or shared credentials"
     exit 1  
   fi
   success "AWS Secret Access Key already configured."
 else
-  CONFIGURE_KEY_OUTPUT=$(aws configure set aws_secret_access_key $AWS_CODE_DEPLOY_SECRET 2>&1)
+  $(aws configure set aws_secret_access_key $AWS_CODE_DEPLOY_SECRET 2>&1)
   success "Successfully configured AWS Secret Access Key ID."
 fi
 
 if [ -z "$AWS_CODE_DEPLOY_REGION" ]; then
-  if [ -e ~/.aws/config ]; then
-    if [ $(grep region ~/.aws/config | wc -l) -lt 1 ]; then
-      warnNotice "Unable to configure AWS region."
-    else
-      success "AWS Region already configured."
-    fi
+  # Ensure AWS region has already been set
+  if [ $(aws configure list | grep region | wc -l) -lt 1 ]; then
+    error "No AWS_CODE_DEPLOY_REGION specified and AWS cli is not configured with an existing default region via env, config, or shared credentials"
+    exit 1  
   fi
+  success "AWS Region already configured."
 else
-  CONFIGURE_REGION_OUTPUT=$(aws configure set default.region $AWS_CODE_DEPLOY_REGION 2>&1)
+  $(aws configure set default.region $AWS_CODE_DEPLOY_REGION 2>&1)
   success "Successfully configured AWS default region."
 fi
 
@@ -610,4 +603,4 @@ if [ "true" = "$DEPLOYMENT_OVERVIEW" ]; then
 
       sleep 2
    done
-fi
+fi