less annoying output

Author: andrew

aliases

@@ -97,10 +97,10 @@ alias deployments-group='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma deployments-gro
 alias distributions='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma distributions'
 alias ecr-repositories='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecr-repositories'
 alias ecr-repository-images='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecr-repository-images'
-alias ecs-clusters2='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-clusters2'
+alias ecs-clusters='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-clusters'
 alias ecs-scaling-actions='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-scaling-actions'
 alias ecs-scaling-activities='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-scaling-activities'
-alias ecs-services2='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-services2'
+alias ecs-services='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-services'
 alias ecs-tasks='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecs-tasks'
 alias elasticache-replication-groups='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elasticache-replication-groups'
 alias elasticaches='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elasticaches'

functions

@@ -97,10 +97,10 @@ deployments-group
 distributions
 ecr-repositories
 ecr-repository-images
-ecs-clusters2
+ecs-clusters
 ecs-scaling-actions
 ecs-scaling-activities
-ecs-services2
+ecs-services
 ecs-tasks
 elasticache-replication-groups
 elasticaches

lib/stack-functions

@@ -140,7 +140,7 @@ stack-create() {
   # to take advantage of shorter commands*
   #
   #     USAGE: stack-create stack [template-file] [parameters-file]             \
-  #                 [--capabilities=OPTIONAL_VALUE] [--role-arn=OPTIONAL_VALUE]
+  #                 [CAPABILITY_1 CAPABILITY_2] [--role-arn=OPTIONAL_VALUE]
   #
   #     $ stack-create params/asg-params-prod.json
   #     Resolved arguments: asg-prod ./asg.yml params/asg-params-prod.json
@@ -177,29 +177,44 @@ stack-create() {
   local inputs_array=($@)
   local IFS='=' # override default field separator in the scope of this function only
   local regex_role_arn="^\-\-role\-arn=.*"
-  local regex_capabilities="^\-\-capabilities=.*"
+  local list_capabilities=("CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND")
+
   for index in "${inputs_array[@]}" ; do
     if [[ "$index" =~ $regex_role_arn ]] ; then
       read arn_opt arn_arg <<< "$index" # ignore anything after option + arg
       arn="--role-arn $arn_arg"
-    elif [[ "$index" =~ $regex_capabilities ]] ; then
-      read caps_opt caps_arg <<< "$index" # ignore anything after option + arg
-      capabilities="--capabilities $caps_arg"
+    fi
+    # search for anything in the capabilities list, with or without "--capabilities"
+    test_capability=${index##* }
+    if [[ " $list_capabilities " =~  "$test_capability" ]] ; then
+      capabilities="${capabilities} ${test_capability}"
     fi
   done
+  if [ ! -z "${capabilities}" ] ; then
+    capabilities="--capabilities ${capabilities}"
+  fi
+  ## TODO: add capabilities shell completion
+
   unset IFS # to prevent it from breaking things later
 
-  if aws cloudformation create-stack \
+  if output=$(
+    aws cloudformation create-stack \
     --stack-name $stack              \
     --template-body file://$template \
     $parameters                      \
     $capabilities                    \
     $arn                             \
     --disable-rollback               \
-    --output text; then
+    --output text                    \
+     2>&1
+  ); then
     stack-tail $stack
   else
+<<<<<<< HEAD
     echo "$output"
+=======
+    echo "stack creation failed because $output"
+>>>>>>> features/stack-capabilities
     if [[ $output == *"InsufficientCapabilitiesException"* ]] ; then
       for capability in ${list_capabilities} ; do
         if [[ $output ==  *"$capability"* ]] ; then
@@ -215,6 +230,8 @@ stack-create() {
       fi
     fi
   fi
+
+
 }
 
 stack-update() {