test: bug fixes

tests/commands/get_object_tagging.sh

@@ -21,7 +21,7 @@ get_object_tagging() {
     return 1
   fi
   local result
-  if [[ $1 == 'aws' ]]; then
+  if [[ $1 == 'aws' ]] || [[ $1 == 's3api' ]]; then
     tags=$(aws --no-verify-ssl s3api get-object-tagging --bucket "$2" --key "$3" 2>&1) || result=$?
   elif [[ $1 == 'mc' ]]; then
     tags=$(mc --insecure tag list "$MC_ALIAS"/"$2"/"$3" 2>&1) || result=$?

tests/test_aws_root_inner.sh

@@ -101,14 +101,14 @@ test_create_multipart_upload_properties_aws_root() {
     "$expected_hold_status" \
     "$expected_retention_mode" \
     "$later" \
-    "$expected_tag_key=$expected_tag_val" || fail "error performing multipart upload"
+    "$expected_tag_key=$expected_tag_val"
   assert_success
 
   run get_and_verify_metadata "$bucket_file" "$expected_content_type" "$expected_meta_key" "$expected_meta_val" \
     "$expected_hold_status" "$expected_retention_mode" "$later"
   assert_success
 
-  run get_and_check_bucket_tags "$BUCKET_ONE_NAME" "$expected_tag_key" "$expected_tag_val"
+  run check_verify_object_tags "s3api" "$BUCKET_ONE_NAME" "$bucket_file" "$expected_tag_key" "$expected_tag_val"
   assert_success
 
   run put_object_legal_hold "$BUCKET_ONE_NAME" "$bucket_file" "OFF"

tests/test_common.sh

@@ -16,8 +16,12 @@
 
 source ./tests/setup.sh
 source ./tests/util.sh
+source ./tests/util_acl.sh
+source ./tests/util_bucket_location.sh
 source ./tests/util_file.sh
+source ./tests/util_list_buckets.sh
 source ./tests/util_policy.sh
+source ./tests/util_presigned_url.sh
 source ./tests/commands/copy_object.sh
 source ./tests/commands/delete_bucket_tagging.sh
 source ./tests/commands/delete_object_tagging.sh
@@ -238,9 +242,7 @@ test_common_list_objects() {
 }
 
 test_common_set_get_delete_bucket_tags() {
-  if [[ $# -ne 1 ]]; then
-    fail "set/get bucket tags test requires command type"
-  fi
+  assert [ $# -eq 1 ]
 
   local key="test_key"
   local value="test_value"
@@ -254,7 +256,7 @@ test_common_set_get_delete_bucket_tags() {
   run put_bucket_tagging "$1" "$BUCKET_ONE_NAME" $key $value
   assert_success
 
-  run get_and_check_bucket_tags "$1" "$BUCKET_ONE_NAME" "$key" "$value"
+  run get_and_check_bucket_tags "$BUCKET_ONE_NAME" "$key" "$value"
   assert_success
 
   run delete_bucket_tagging "$1" "$BUCKET_ONE_NAME"

tests/util_presigned_url.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+source ./tests/commands/create_presigned_url.sh
+
 create_check_presigned_url() {
   if [ $# -ne 4 ]; then
     log 2 "'create_check_presigned_url' requires client, bucket, key, save location"

tests/util_tags.sh

@@ -66,11 +66,11 @@ get_and_check_bucket_tags() {
 }
 
 verify_no_bucket_tags() {
-  if [ $# -ne 1 ]; then
+  if [ $# -ne 2 ]; then
     log 2 "'verify_no_bucket_tags' requires bucket name"
     return 1
   fi
-  if ! get_bucket_tagging "$1"; then
+  if ! get_bucket_tagging "$1" "$2"; then
     log 2 "error retrieving bucket tagging"
     return 1
   fi
@@ -116,7 +116,7 @@ check_verify_object_tags() {
     log 2 "error getting object tags"
     return 1
   fi
-  if [[ $1 == 'aws' ]]; then
+  if [[ $1 == 'aws' ]] || [[ $1 == 's3api' ]]; then
     if ! tag_set_key=$(echo "$tags" | jq -r '.TagSet[0].Key' 2>&1); then
       log 2 "error retrieving tag key: $tag_set_key"
       return 1
@@ -125,22 +125,22 @@ check_verify_object_tags() {
       log 2 "error retrieving tag value: $tag_set_value"
       return 1
     fi
-    if [[ $tag_set_key != "$key" ]]; then
-      log 2 "key mismatch ($tag_set_key, $key)"
+    if [[ $tag_set_key != "$4" ]]; then
+      log 2 "key mismatch ($tag_set_key, $4)"
       return 1
     fi
-    if [[ $tag_set_value != "$value" ]]; then
-      log 2 "value mismatch ($tag_set_value, $value)"
+    if [[ $tag_set_value != "$5" ]]; then
+      log 2 "value mismatch ($tag_set_value, $5)"
       return 1
     fi
   else
     read -r tag_set_key tag_set_value <<< "$(echo "$tags" | awk 'NR==2 {print $1, $3}')"
-    if [[ $tag_set_key != "$key" ]]; then
-      log 2 "Key mismatch ($tag_set_key, $key)"
+    if [[ $tag_set_key != "$4" ]]; then
+      log 2 "Key mismatch ($tag_set_key, $4)"
       return 1
     fi
-    if [[ $tag_set_value != "$value" ]]; then
-      log 2 "Value mismatch ($tag_set_value, $value)"
+    if [[ $tag_set_value != "$5" ]]; then
+      log 2 "Value mismatch ($tag_set_value, $5)"
       return 1
     fi
   fi