Set version 0.0.16

Author: Nicolas Huray

README.md

@@ -1,73 +1,82 @@
 Wercker step for AWS Code Deploy
 =======================
 
+[![wercker status](https://app.wercker.com/status/3810984a0833d6af679f0609bd3e18be/m "wercker status")](https://app.wercker.com/project/bykey/3810984a0833d6af679f0609bd3e18be)
+
 This wercker step allows to deploy applications with [AWS Code Deploy](http://docs.aws.amazon.com/codedeploy/latest/userguide/welcome.html) service.
 
 Please read the [AWS Code Deploy](http://docs.aws.amazon.com/codedeploy/latest/userguide/welcome.html) documentation and [API](http://docs.aws.amazon.com/cli/latest/reference/deploy/index.html) before using this step.
 
-This step use the [AWS Cli](http://docs.aws.amazon.com/cli/latest/reference/), so you have to use this step with a box where AWS Cli is already installed
-or install AWS Cli with this Wercker step : [EdgecaseInc/wercker-step-install-aws-cli](https://github.com/EdgecaseInc/wercker-step-install-aws-cli).
-
 ## AWS Code Deploy workflow
 
 To deploy an application with AWS Code Deploy, the Wercker step follow this steps : 
 
-#### Step 1 : [Defining Application](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-application.html) 
+#### Step 1 : [Configuring AWS](http://docs.aws.amazon.com/cli/latest/reference/configure/index.html)
+
+This initial step consists on configuring AWS. 
+ 
+The following configuration allows to setup this step :
+
+* `key` (required): AWS Access Key ID
+* `secret` (required): AWS Secret Access Key
+* `region` (optional): Default region name
+
+#### Step 2 : [Defining Application](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-application.html) 
 
-This first step consists on defining the application. If the application does not exists this step create the application in Code Deploy.
+This second step consists on defining the application. If the application does not exists this step create the application in Code Deploy.
 
-The following configuration allows to configure this step :
+The following configuration allows to setup this step :
 
-* `application-name` (required) Name of the application to deploy
-* `application-version` (optional) Version of the application to deploy. By default: Short commit id _(eg. fec8f4a)_
+* `application-name` (required): Name of the application to deploy
+* `application-version` (optional): Version of the application to deploy. By default: Short commit id _(eg. fec8f4a)_
 
-#### Step 2 : [Defining Deployment Config](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-deployment-config.html) (optional)
+#### Step 3 : [Defining Deployment Config](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-deployment-config.html) (optional)
 
-The second step consists on creating a deployment config. This step is totally *optional* because you can use the deployment strategy already defined in Code Deploy.
+This step consists on creating a deployment config. This step is totally *optional* because you can use the deployment strategy already defined in Code Deploy.
 
-The following configuration allows to configure this step :
+The following configuration allows to setup this step :
 
-* `deployment-config-name` (optional) Deployment config name. By default : _CodeDeployDefault.OneAtATime_
-* `minimum-healthy-hosts` (optional) The minimum number of healthy instances during deployment. By default : _type=FLEET_PERCENT,value=75_
+* `deployment-config-name` (optional): Deployment config name. By default : _CodeDeployDefault.OneAtATime_
+* `minimum-healthy-hosts` (optional): The minimum number of healthy instances during deployment. By default : _type=FLEET_PERCENT,value=75_
 
-#### Step 3 : [Defining Deployment Group](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-deployment-group.html)
+#### Step 4 : [Defining Deployment Group](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-deployment-group.html)
 
-The third step consists on defining a deployment group. If the deployment group provided does not exists this step create a deployment group in Code Deploy.
+This step consists on defining a deployment group. If the deployment group provided does not exists this step create a deployment group in Code Deploy.
 
-The following configuration allows to configure this step :
+The following configuration allows to setup this step :
 
-* `deployment-group-name` (required) Deployment group name
-* `service-role-arn` (optional) Service role arn giving permissions to use Code Deploy when creating a deployment group
-* `ec2-tag-filters` (optional) EC2 tags to filter on when creating a deployment group
-* `auto-scaling-groups` (optional) Auto Scaling groups when creating a deployment group 
+* `deployment-group-name` (required): Deployment group name
+* `service-role-arn` (optional): Service role arn giving permissions to use Code Deploy when creating a deployment group
+* `ec2-tag-filters` (optional): EC2 tags to filter on when creating a deployment group
+* `auto-scaling-groups` (optional): Auto Scaling groups when creating a deployment group 
 
-#### Step 4 : [Pushing to S3](http://docs.aws.amazon.com/cli/latest/reference/deploy/push.html)
+#### Step 5 : [Pushing to S3](http://docs.aws.amazon.com/cli/latest/reference/deploy/push.html)
 
 This step consists to push the application to S3.
 
-The following configuration allows to configure this step :
+The following configuration allows to setup this step :
 
-* `s3-bucket` (required) S3 Bucket
-* `s3-source` (optional) S3 Source. By default : _._
-* `s3-key` (optional) S3 Key. By default: _{application-name}_
+* `s3-bucket` (required): S3 Bucket
+* `s3-source` (optional): S3 Source. By default : _._
+* `s3-key` (optional): S3 Key. By default: _{application-name}_
 
-#### Step 5 : [Registering Revision](http://docs.aws.amazon.com/cli/latest/reference/deploy/register-application-revision.html) 
+#### Step 6 : [Registering Revision](http://docs.aws.amazon.com/cli/latest/reference/deploy/register-application-revision.html) 
 
 This step consists to register the revision in Code Deploy.
 
-The following configuration allows to configure this step :
+The following configuration allows to setup this step :
 
-* `revision` (optional) Revision of the application to deploy. By default: _{application-name}-{application-version}.zip_
-* `revision-description` (optional) Description of the revision of the application to deploy
+* `revision` (optional): Revision of the application to deploy. By default: _{application-name}-{application-version}.zip_
+* `revision-description` (optional): Description of the revision of the application to deploy
 
-#### Step 6 : [Creating Deployment](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-deployment.html) 
+#### Step 7 : [Creating Deployment](http://docs.aws.amazon.com/cli/latest/reference/deploy/create-deployment.html) 
 
 This final step consists to create the deployment in Code Deploy.
 
-The following configuration allows to configure this step :
+The following configuration allows to setup this step :
 
-* `deployment-description` (optional) Description of the deployment
-* `deployment-overview` (optional) Visualize the deployment. By default : _true_
+* `deployment-description` (optional): Description of the deployment
+* `deployment-overview` (optional): Visualize the deployment. By default : _true_
 
 ## Example
 
@@ -77,10 +86,12 @@ The following example deploy an `hello` application on the deployment group `dev
 deploy:
   steps:
     - nhuray/aws-code-deploy:
+       key: aws_access_key_id
+       secret: aws_access_secret_id
        application-name: hello
        application-version: 1.1.0
        deployment-group-name: development
-       s3-bucket: apps.mycompany.com
        service-role-arn: arn:aws:iam::89862646$091:role/CodeDeploy
        ec2-tag-filters: Key=app,Value=hello,Type=KEY_AND_VALUE Key=environment,Value=development,Type=KEY_AND_VALUE
+       s3-bucket: apps.mycompany.com
 ```

run.sh

@@ -42,29 +42,24 @@ bold() { printf "${bold}%s${reset}\n" "$@"
 note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" "$@"
 }
 
-
-type_exists() {
-  if [ $(type -P $1) ]; then
-    return 0
-  fi
-  return 1
-}
-
 jsonValue() {
   key=$1
   num=$2
   awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p
 }
 
-# Check AWS is installed
-if ! type_exists 'aws'; then
-  error 'AWS Cli is not installed on this box.'
-  note 'Please install AWS Cli : https://github.com/EdgecaseInc/wercker-step-install-aws-cli'
+
+# Check variables
+if [ -n "$WERCKER_AWS_CODE_DEPLOY_KEY" ]; then
+  error "Please set the 'key' variable"
   exit 1
 fi
 
+if [ -n "$WERCKER_AWS_CODE_DEPLOY_SECRET" ]; then
+  error "Please set the 'secret' variable"
+  exit 1
+fi
 
-# Check variables
 if [ -z "$WERCKER_AWS_CODE_DEPLOY_APPLICATION_NAME" ]; then
   error "Please set the 'application-name' variable"
   exit 1
@@ -80,6 +75,48 @@ if [ -z "$WERCKER_AWS_CODE_DEPLOY_S3_BUCKET" ]; then
   exit 1
 fi
 
+# ----- Install AWS Cli -----
+# see documentation : http://docs.aws.amazon.com/cli/latest/userguide/installing.html
+# ---------------------------
+set -e
+h1 "Installing AWS CLI"
+
+sudo apt-get install unzip -y 2>&1
+
+h2 'Downloading AWS CLI'
+wget https://s3.amazonaws.com/aws-cli/awscli-bundle.zip 2>&1 > /dev/null
+unzip awscli-bundle.zip 2>&1 > /dev/null
+success "Downloading AWS CLI succeeded"
+
+h2 "Installing AWS CLI"
+sudo ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws 2>&1 > /dev/null
+rm -rf awscli-bundle*
+success "Installing AWS CLI (`aws --version`) ID succeeded"
+
+set +e
+# ----- Configure -----
+# see documentation :
+#    http://docs.aws.amazon.com/cli/latest/reference/configure/index.html
+# ----------------------
+set -e
+
+h1 "Step 1: Configuring AWS"
+
+h2 "Configuring AWS Access Key ID"
+CONFIGURE_KEY_OUTPUT=$(aws configure set aws_access_key_id $WERCKER_AWS_CODE_DEPLOY_KEY 2>&1)
+success "Configuring AWS Access Key ID succeeded"
+
+h2 "Configuring AWS Access Key ID"
+CONFIGURE_SECRET_OUTPUT=$(aws configure set aws_secret_access_key $WERCKER_AWS_CODE_DEPLOY_SECRET 2>&1)
+success "Configuring AWS Secret Access Key succeeded"
+
+if [ -n "$WERCKER_AWS_CODE_DEPLOY_REGION" ]; then
+  h2 "Configuring AWS default region"
+  CONFIGURE_REGION_OUTPUT=$(aws configure set default.region $WERCKER_AWS_CODE_DEPLOY_REGION 2>&1)
+  success "Configuring AWS default region succeeded"
+fi
+
+set +e
 
 # ----- Application -----
 # see documentation :
@@ -91,7 +128,7 @@ APPLICATION_NAME="$WERCKER_AWS_CODE_DEPLOY_APPLICATION_NAME"
 APPLICATION_VERSION=${WERCKER_AWS_CODE_DEPLOY_APPLICATION_VERSION:-${WERCKER_GIT_COMMIT:0:7}}
 
 # Check application exists
-h1 "Step 1: Defining application"
+h1 "Step 2: Defining application"
 h2 "Checking application '$APPLICATION_NAME' exists"
 
 APPLICATION_EXISTS="aws deploy get-application --application-name $APPLICATION_NAME"
@@ -126,7 +163,7 @@ DEPLOYMENT_CONFIG_NAME=${WERCKER_AWS_CODE_DEPLOY_DEPLOYMENT_CONFIG_NAME:-CodeDep
 MINIMUM_HEALTHY_HOSTS=${WERCKER_AWS_CODE_DEPLOY_MINIMUM_HEALTHY_HOSTS:-type=FLEET_PERCENT,value=75}
 
 # Ckeck deployment config exists
-h1 "Step 2: Defining deployment config"
+h1 "Step 3: Defining deployment config"
 h2 "Checking deployment config '$DEPLOYMENT_CONFIG_NAME' exists"
 
 DEPLOYMENT_CONFIG_EXISTS="aws deploy get-deployment-config --deployment-config-name $DEPLOYMENT_CONFIG_NAME"
@@ -163,7 +200,7 @@ EC2_TAG_FILTERS="$WERCKER_AWS_CODE_DEPLOY_EC2_TAG_FILTERS"
 SERVICE_ROLE_ARN="$WERCKER_AWS_CODE_DEPLOY_SERVICE_ROLE_ARN"
 
 # Ckeck deployment group exists
-h1 "Step 3: Defining deployment group"
+h1 "Step 4: Defining deployment group"
 h2 "Checking deployment group '$DEPLOYMENT_GROUP' exists for application '$APPLICATION_NAME'"
 
 DEPLOYMENT_GROUP_EXISTS="aws deploy get-deployment-group --application-name $APPLICATION_NAME --deployment-group-name $DEPLOYMENT_GROUP"
@@ -217,7 +254,7 @@ if [ -n "$S3_KEY" ]; then
 fi
 S3_LOCATION="$S3_LOCATION/$REVISION"
 
-h1 "Step 4: Pushing to S3"
+h1 "Step 5: Pushing to S3"
 PUSH_S3="aws deploy push --application-name $APPLICATION_NAME --s3-location $S3_LOCATION --source $S3_SOURCE"
 if [ -n "$REVISION_DESCRIPTION" ]; then
   PUSH_S3="$PUSH_S3 --description '$REVISION_DESCRIPTION'"
@@ -237,7 +274,7 @@ success "Pushing revision '$REVISION' to S3 succeeded"
 # ----- Register revision -----
 # see documentation : http://docs.aws.amazon.com/cli/latest/reference/deploy/register-application-revision.html
 # ----------------------
-h1 "Step 5: Registering revision"
+h1 "Step 6: Registering revision"
 
 # Build S3 Location
 BUNDLE_TYPE=${REVISION##*.}
@@ -272,7 +309,7 @@ success "Registering revision '$REVISION' succeeded"
 DEPLOYMENT_DESCRIPTION="$WERCKER_AWS_CODE_DEPLOY_DEPLOYMENT_DESCRIPTION"
 DEPLOYMENT_OVERVIEW=${WERCKER_AWS_CODE_DEPLOY_DEPLOYMENT_OVERVIEW:-true}
 
-h1 "Step 6: Creating deployment"
+h1 "Step 7: Creating deployment"
 DEPLOYMENT="aws deploy create-deployment --application-name $APPLICATION_NAME --deployment-config-name $DEPLOYMENT_CONFIG_NAME --deployment-group-name $DEPLOYMENT_GROUP --s3-location $S3_LOCATION"
 
 if [ -n "$DEPLOYMENT_DESCRIPTION" ]; then

wercker-step.yml

@@ -1,3 +1,74 @@
 name: aws-code-deploy
-version: 0.0.14
+version: 0.0.17
 description: Deploy applications with AWS Code Deploy
+keywords:
+  - aws
+  - code-deploy
+properties:
+  # Step 1: Configuring AWS
+  key:
+    type: string
+    required: true
+  secret:
+    type: string
+    required: true
+  region:
+    type: string
+    required: false
+
+  # Step 2: Defining application
+  application-name:
+    type: string
+    required: true
+  application-version:
+    type: string
+    required: false
+
+  # Step 3 : Defining Deployment Config
+  deployment-config-name:
+    type: string
+    required: false
+  minimum-healthy-hosts:
+    type: string
+    required: false
+
+  # Step 4 : Defining Deployment Group
+  deployment-group-name:
+    type: string
+    required: true
+  service-role-arn:
+    type: string
+    required: false
+  ec2-tag-filters:
+    type: string
+    required: false
+  auto-scaling-groups:
+    type: string
+    required: false
+
+  # Step 5 : Pushing to S3
+  s3-bucket:
+    type: string
+    required: true
+  s3-source:
+    type: string
+    required: false
+  s3-key:
+    type: string
+    required: false
+
+  # Step 6 : Registering Revision
+  revision:
+    type: string
+    required: false
+  revision-description:
+    type: string
+    required: false
+
+  # Step 7 : Creating Deployment
+  deployment-description:
+    type: string
+    required: false
+  deployment-overview:
+    type: boolean
+    required: false

wercker.yml

@@ -0,0 +1,4 @@
+box: wercker/default
+build:
+  steps:
+    - validate-wercker-step