test: changes due to policy, tag changes

tests/commands/get_bucket_policy.sh

@@ -5,17 +5,18 @@ get_bucket_policy() {
     echo "get bucket policy command requires command type, bucket"
     return 1
   fi
+  local get_bucket_policy_result=0
   if [[ $1 == 'aws' ]]; then
-    get_bucket_policy_aws "$2" || get_result=$?
+    get_bucket_policy_aws "$2" || get_bucket_policy_result=$?
   elif [[ $1 == 's3cmd' ]]; then
-    get_bucket_policy_s3cmd "$2" || get_result=$?
+    get_bucket_policy_s3cmd "$2" || get_bucket_policy_result=$?
   elif [[ $1 == 'mc' ]]; then
-    get_bucket_policy_mc "$2" || get_result=$?
+    get_bucket_policy_mc "$2" || get_bucket_policy_result=$?
   else
     echo "command 'get bucket policy' not implemented for '$1'"
     return 1
   fi
-  if [[ $get_result -ne 0 ]]; then
+  if [[ $get_bucket_policy_result -ne 0 ]]; then
     echo "error getting policy: $bucket_policy"
     return 1
   fi
@@ -28,12 +29,20 @@ get_bucket_policy_aws() {
     echo "aws 'get bucket policy' command requires bucket"
     return 1
   fi
-  policy_json=$(aws --no-verify-ssl s3api get-bucket-policy --bucket "$1") || get_result=$?
+  policy_json=$(aws --no-verify-ssl s3api get-bucket-policy --bucket "$1" 2>&1) || get_result=$?
+  if [[ $policy_json == *"InsecureRequestWarning"* ]]; then
+    policy_json=$(awk 'NR>2' <<< "$policy_json")
+  fi
   if [[ $get_result -ne 0 ]]; then
-    echo "error getting policy: $policy_json"
-    return 1
+    if [[ "$policy_json" == *"(NoSuchBucketPolicy)"* ]]; then
+      bucket_policy=
+    else
+      echo "error getting policy: $policy_json"
+      return 1
+    fi
+  else
+    bucket_policy=$(echo "{$policy_json}" | jq -r '.Policy')
   fi
-  bucket_policy=$(echo "$policy_json" | jq -r '.Policy')
   export bucket_policy
   return 0
 }

tests/test_common.sh

@@ -239,8 +239,8 @@ test_common_set_get_object_tags() {
   [[ $get_result -eq 0 ]] || fail "Error getting object tags"
   if [[ $1 == 'aws' ]]; then
     tag_set=$(echo "$tags" | jq '.TagSet')
-    [[ $tag_set == "[]" ]] || fail "Error:  tags not empty"
-  elif [[ ! $tags == *"No tags found"* ]]; then
+    [[ $tag_set == "[]" ]] || [[ $tag_set == "" ]] || fail "Error:  tags not empty"
+  elif [[ $tags != *"No tags found"* ]] && [[ $tags != "" ]]; then
     fail "no tags found (tags: $tags)"
   fi
 
@@ -397,7 +397,7 @@ EOF
   put_bucket_policy "$1" "$BUCKET_ONE_NAME" "$test_file_folder"/"$policy_file" || put_result=$?
   [[ $put_result -eq 0 ]] || fail "error putting bucket"
 
-  get_bucket_policy "$1" "$BUCKET_ONE_NAME" || get_result=$?
+  get_bucket_policy "$1" "$BUCKET_ONE_NAME" || local get_result=$?
   [[ $get_result -eq 0 ]] || fail "error getting bucket policy after setting"
 
   returned_effect=$(echo "$bucket_policy" | jq -r '.Statement[0].Effect')

tests/util.sh

@@ -710,11 +710,16 @@ get_object_tags() {
     return 1
   fi
   if [[ $result -ne 0 ]]; then
-    echo "error getting object tags: $tags"
-    return 1
+    if [[ "$tags" == *"NoSuchTagSet"* ]] || [[ "$tags" == *"No tags found"* ]]; then
+      tags=
+    else
+      echo "error getting object tags: $tags"
+      return 1
+    fi
+  else
+    log 5 "$tags"
+    tags=$(echo "$tags" | grep -v "InsecureRequestWarning")
   fi
-  log 5 "$tags"
-  tags=$(echo "$tags" | grep -v "InsecureRequestWarning")
   export tags
 }
 

tests/util_policy.sh

@@ -6,6 +6,7 @@ check_for_empty_policy() {
     return 1
   fi
 
+  local get_result=0
   get_bucket_policy "$1" "$2" || get_result=$?
   if [[ $get_result -ne 0 ]]; then
     echo "error getting bucket policy"
@@ -13,6 +14,10 @@ check_for_empty_policy() {
   fi
 
   # shellcheck disable=SC2154
+  if [[ $bucket_policy == "" ]]; then
+    return 0
+  fi
+
   policy=$(echo "$bucket_policy" | jq -r '.Policy')
   statement=$(echo "$policy" | jq -r '.Statement[0]')
   if [[ "" != "$statement" ]] && [[ "null" != "$statement" ]]; then