Add option to deploy to public buckets. Add clobber option to configure-deploy

Author: crabba

.travis.yml

@@ -24,18 +24,18 @@ script:
 before_deploy:
 
   - pip install awscli --upgrade
-  - bash _scripts/configure-deploy.sh
+  - bash _scripts/configure-deploy.sh --clobber
 
 deploy:
   - provider: script
-    script: bash _scripts/deploy.sh --verbose production
+    script: bash _scripts/deploy.sh --public --verbose production
     skip_cleanup: true
     on:
       repo: aws-samples/aws-genomics-workflows
       branch: release
       tags: true
   - provider: script
-    script: bash _scripts/deploy.sh --verbose test
+    script: bash _scripts/deploy.sh --public --verbose test
     skip_cleanup: true
     on:
       repo: aws-samples/aws-genomics-workflows

_scripts/configure-deploy.sh

@@ -1,10 +1,60 @@
 #!/bin/bash
 
+# Create a default ~/.aws/configure file for Travis testing
+
 set -e
 
 # This script expects the following environment variable(s)
 # ASSET_ROLE_ARN: the AWS role ARN that is used to publish assets
 
+usage() {
+    cat <<EOM
+    Usage:
+    $(basename $0) [--clobber]
+
+    --clobber  Overwrite ~/.aws/configure file without asking
+EOM
+}
+
+CLOBBER=''
+PARAMS=""
+while (( "$#" )); do
+    case "$1" in
+        --clobber)
+            CLOBBER=1
+            shift
+            ;;
+        --help)
+            usage
+            exit 0
+            ;;
+        --) # end optional argument parsing
+            shift
+            break
+            ;;
+        -*|--*=)
+            echo "Error: unsupported argument $1" >&2
+            exit 1
+            ;;
+        *) # positional agruments
+            PARAMS="$PARAMS $1"
+            shift
+            ;;
+    esac
+done
+eval set -- "$PARAMS"
+
+if [ -z $CLOBBER ]; then
+    while true; do
+        read -p "Overwrite ~/.aws/config file [y/n]? " yn
+        case $yn in
+            [Yy]* ) CLOBBER=1; break;;
+            [Nn]* ) echo "Exiting"; exit;;
+            * ) echo "Please answer yes or no.";;
+        esac
+    done
+fi
+
 mkdir -p $HOME/.aws
 cat << EOF > $HOME/.aws/config
 [default]

_scripts/deploy.sh

@@ -10,6 +10,21 @@ ASSET_STAGE=test
 ASSET_PROFILE=asset-publisher
 DEPLOY_REGION=us-east-1
 
+usage() {
+    cat <<EOM
+    Usage:
+    $(basename $0) [--site-bucket BUCKET] [--asset-bucket BUCKET] [--asset-profile PROFILE] [--deploy-region REGION] [--public] [--verbose]
+
+    --site-bucket BUCKET        Deploy documentation site to BUCKET
+    --asset-bucket BUCKET       Deploy assets to BUCKET
+    --asset-profile PROFILE     Use PROFILE for AWS CLI commands
+    --deploy-region REGION      Deploy in region REGION
+    --public                    Deploy to public bucket with '--acl public-read' (Default false)
+    --verbose                   Display more output
+EOM
+}
+
+ACL_PUBLIC_READ=''
 VERBOSE=''
 PARAMS=""
 while (( "$#" )); do
@@ -30,6 +45,14 @@ while (( "$#" )); do
             DEPLOY_REGION=$2
             shift 2
             ;;
+        --help)
+            usage
+            exit 0
+            ;;
+        --public)
+            ACL_PUBLIC_READ='--acl public-read'
+            shift
+            ;;
         --verbose)
             VERBOSE='--verbose'
             shift
@@ -77,7 +100,7 @@ function s3_sync() {
     cmd="aws s3 sync \
         --profile $ASSET_PROFILE \
         --region $DEPLOY_REGION \
-        --acl public-read \
+        $ACL_PUBLIC_READ \
         --delete \
         --metadata commit=$(git rev-parse HEAD) \
         $source \
@@ -164,12 +187,14 @@ function site() {
         echo "requirement mkdocs not found. aborting"
         exit 1
     fi
-    mkdocs build
+    [ -z $VERBOSE ] && QUIET='-q' || QUIET=''
+    mkdocs build $QUIET
 
     echo "publishing site"
     aws s3 sync \
+        --profile $ASSET_PROFILE \
         --region $DEPLOY_REGION \
-        --acl public-read \
+        $ACL_PUBLIC_READ \
         --delete \
         --metadata commit=$(git rev-parse HEAD) \
         ./site \

_scripts/make-dist.sh

@@ -92,7 +92,12 @@ done
 echo "packaging amazon-ebs-autoscale"
 cd $TEMP_PATH
 
-EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name)
+RESPONSE=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest")
+EBS_AUTOSCALE_VERSION=$(echo $RESPONSE | jq -r .tag_name)
+if [[ $EBS_AUTOSCALE_VERSION = 'null' ]]; then
+    echo "ERROR: $RESPONSE"
+    exit 1
+fi
 curl --silent -L \
     "https://github.com/awslabs/amazon-ebs-autoscale/archive/${EBS_AUTOSCALE_VERSION}.tar.gz" \
     -o ./amazon-ebs-autoscale.tar.gz