re-adding parameters

Author: Luke McCrone

tests/s3_bucket_tests.sh

@@ -9,7 +9,7 @@ create_bucket() {
   fi
   local exit_code=0
   local error
-  error=$(aws s3 mb s3://"$1" 2>&1) || exit_code=$?
+  error=$(aws s3 mb s3://"$1" 2>&1 --region "$AWS_REGION" --profile "$AWS_PROFILE") || exit_code=$?
   if [ $exit_code -ne 0 ]; then
     echo "error creating bucket: $error"
     return 1
@@ -24,7 +24,7 @@ delete_bucket() {
   fi
   local exit_code=0
   local error
-  error=$(aws s3 rb s3://"$1" 2>&1) || exit_code="$?"
+  error=$(aws s3 rb s3://"$1" --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code="$?"
   if [ $exit_code -ne 0 ]; then
     if [[ "$error" == *"The specified bucket does not exist"* ]]; then
       return 0
@@ -44,7 +44,7 @@ bucket_exists() {
   fi
   local exit_code=0
   local error
-  error=$(aws s3 ls s3://"$1" 2>&1) || exit_code="$?"
+  error=$(aws s3 ls s3://"$1" --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code="$?"
   if [ $exit_code -ne 0 ]; then
     if [[ "$error" == *"The specified bucket does not exist"* ]] || [[ "$error" == *"Access Denied"* ]]; then
       return 1
@@ -86,7 +86,7 @@ object_exists() {
   fi
   local exit_code=0
   local error
-  error=$(aws s3 ls s3://"$1" 2>&1) || exit_code="$?"
+  error=$(aws s3 ls s3://"$1" --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code="$?"
   if [ $exit_code -ne 0 ]; then
     if [[ "$error" == "" ]]; then
       return 1
@@ -105,7 +105,7 @@ put_object() {
   fi
   local exit_code=0
   local error
-  error=$(aws s3 cp "$1" s3://"$2" 2>&1) || exit_code=$?
+  error=$(aws s3 cp "$1" s3://"$2" --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code=$?
   if [ $exit_code -ne 0 ]; then
     echo "error copying object to bucket: $error"
     return 1
@@ -140,7 +140,7 @@ delete_object() {
   fi
   local exit_code=0
   local error
-  error=$(aws s3 rm s3://"$1" 2>&1) || exit_code=$?
+  error=$(aws s3 rm s3://"$1" --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code=$?
   if [ $exit_code -ne 0 ]; then
     echo "error deleting object: $error"
     return 1
@@ -151,7 +151,7 @@ delete_object() {
 list_buckets() {
   local exit_code=0
   local output
-  output=$(aws s3 ls 2>&1) || exit_code=$?
+  output=$(aws s3 ls --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code=$?
   if [ $exit_code -ne 0 ]; then
     echo "error listing buckets: $output"
     return 1
@@ -173,7 +173,7 @@ list_objects() {
   fi
   local exit_code=0
   local output
-  output=$(aws s3 ls s3://"$1" 2>&1) || exit_code=$?
+  output=$(aws s3 ls s3://"$1" --region "$AWS_REGION" --profile "$AWS_PROFILE" 2>&1) || exit_code=$?
   if [ $exit_code -ne 0 ]; then
     echo "error listing objects: $output"
     return 1
@@ -209,7 +209,7 @@ bucket_exists_remote_and_local() {
 
 @test "create_delete_bucket_test" {
 
-  local bucket_name="versity-gwtest-create-delete-bucket-two"
+  local bucket_name="versity-gwtest-create-delete-bucket-test"
 
   bucket_exists $bucket_name || local exist_result=$?
   if [[ $exist_result -eq 2 ]]; then
@@ -231,7 +231,7 @@ bucket_exists_remote_and_local() {
 
 @test "put_object_test" {
 
-  local bucket_name="versity-gwtest-put-object-two"
+  local bucket_name="versity-gwtest-put-object-test"
   local object_name="test-object"
 
   bucket_exists $bucket_name || local bucket_exists=$?
@@ -267,8 +267,8 @@ bucket_exists_remote_and_local() {
 
 @test "test_list_buckets" {
 
-  bucket_name_one="versity-gwtest-test-list-1"
-  bucket_name_two="versity-gwtest-test-list-2"
+  bucket_name_one="versity-gwtest-list-one"
+  bucket_name_two="versity-gwtest-list-two"
 
   bucket_exists $bucket_name_one || local bucket_exists_one=$?
   if [[ $bucket_exists_one -eq 2 ]]; then
@@ -304,7 +304,7 @@ bucket_exists_remote_and_local() {
 
 @test test_list_objects {
 
-  bucket_name="versity-gwtest-list-objs"
+  bucket_name="versity-gwtest-list-object"
   object_one="test-file-one"
   object_two="test-file-two"