Finish up lab3

utilities/setup_aws/use-s3.sh

@@ -1,14 +1,11 @@
 #!/bin/bash
 
 MFA_TOKEN=$1
-<<<<<<< HEAD
-=======
 # Capture everything from second argument onward as a command
 shift
 COMMAND=("$@")
->>>>>>> 1437cee (Add resume pdf & html)
 
-if [ -z "$1" ]; then
+if [ -z "MFA_TOKEN" ]; then
   echo "Error: Run with MFA token!"
   exit 1
 fi
@@ -31,13 +28,9 @@ export AWS_SECRET_ACCESS_KEY=$(echo "$SESSION_OUTPUT" | jq '.Credentials.SecretA
 #echo $AWS_SESSION_TOKEN
 #echo $AWS_ACCESS_KEY_ID
 #echo $AWS_SECRET_ACCESS_KEY
-<<<<<<< HEAD
-aws s3 ls s3://witch-lab-3
-echo "finished!"
-=======
-# aws s3 ls s3://witch-lab-3
 
 if command -v "$COMMAND" >/dev/null 2>&1; then
   "${COMMAND[@]}"
+else
+  aws s3 ls s3://witch-lab-3
 fi
->>>>>>> 1437cee (Add resume pdf & html)

utilities/setup_aws/use-terraform.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -z $BW_AWS_ACCOUNT_SECRET_ID ]; then
+  echo "env var BW_AWS_ACCOUNT_SECRET_ID must be set!"
+  exit 1
+fi
+
+AWS_SECRETS=$(bw get item $BW_AWS_ACCOUNT_SECRET_ID)
+
+export AWS_ACCESS_KEY_ID=$(echo "$AWS_SECRETS" | jq -r '.fields[0].value')
+export AWS_SECRET_ACCESS_KEY=$(echo "$AWS_SECRETS" | jq '.fields[1].value' | tr -d '"')