AWS CLI EC2 commands require region. (#157)

Author: jmczerk

startupscript/aws/vm-metadata.sh

@@ -25,7 +25,10 @@ function get_metadata_value_unprefixed() {
   imds_token="$(wget --method=PUT --header "X-aws-ec2-metadata-token-ttl-seconds:600" -q -O - http://169.254.169.254/latest/api/token)"
   local instance_id
   instance_id="$(wget --header "X-aws-ec2-metadata-token: ${imds_token}" -q -O - http://169.254.169.254/latest/meta-data/instance-id)"
+  local region
+  region="$(wget --header "X-aws-ec2-metadata-token: ${imds_token}" -q -O - http://169.254.169.254/latest/meta-data/placement/region)"
   aws ec2 describe-tags \
+    --region "${region}" \
     --filters "Name=resource-id,Values=${instance_id}" "Name=key,Values=$1" \
     --query "Tags[0].Value" --output text 2>/dev/null
 }
@@ -56,9 +59,12 @@ function set_metadata() {
   token=$(wget --method=PUT --header "X-aws-ec2-metadata-token-ttl-seconds:600" -q -O - http://169.254.169.254/latest/api/token)
   local id
   id=$(wget --header "X-aws-ec2-metadata-token: ${token}" -q -O - http://169.254.169.254/latest/meta-data/instance-id)
+  local region
+  region="$(wget --header "X-aws-ec2-metadata-token: ${token}" -q -O - http://169.254.169.254/latest/meta-data/placement/region)"
 
   aws ec2 create-tags \
+    --region "${region}" \
     --resources "${id}" \
     --tags Key="\"vwbapp:${key}\",Value=\"${escaped}\""
 }
-readonly -f set_metadata
+readonly -f set_metadata

startupscript/setup-bashrc.sh

@@ -78,7 +78,7 @@ if [[ "${CLOUD}" == "aws" && "${LOG_IN}" == "true" ]]; then
   # Create a symlink to this workspace's AWS config file to use as the target for AWS_CONFIG_FILE.
   readonly AWS_CONFIG_SYMLINK="${USER_WORKBENCH_CONFIG_DIR}/workspace.conf"
   ${RUN_AS_LOGIN_USER} "eval \$(wb workspace configure-aws) && \
-    ln -s \${AWS_CONFIG_FILE} ${AWS_CONFIG_SYMLINK}"
+    ln -sf \${AWS_CONFIG_FILE} ${AWS_CONFIG_SYMLINK}"
 
   emit "Adding Workbench AWS-sepcific environment variables to ~/.bashrc ..."
 
@@ -91,5 +91,3 @@ export AWS_VAULT_FILE_PASSPHRASE=""
 EOF
 
 fi
-
-