Merge pull request #1068 from versity/test/rest_chunk_upload

Test/rest chunk upload
versity · Feb 13, 2025 · 34f60f1 · 34f60f1
2 parents 2d75bae + 2257281
commit 34f60f1
Show file tree

Hide file tree

Showing 42 changed files with 578 additions and 30 deletions.
diff --git a/tests/commands/get_bucket_ownership_controls.sh b/tests/commands/get_bucket_ownership_controls.sh
@@ -26,6 +26,7 @@ get_bucket_ownership_controls() {
     return 1
   fi
 
+  raw_bucket_ownership_controls=""
   if ! raw_bucket_ownership_controls=$(send_command aws --no-verify-ssl s3api get-bucket-ownership-controls --bucket "$1" 2>&1); then
     log 2 "error getting bucket ownership controls: $raw_bucket_ownership_controls"
     return 1

diff --git a/tests/logger.sh b/tests/logger.sh
@@ -16,15 +16,13 @@
 
 # levels:  1 - crit, 2 - err, 3 - warn, 4 - info, 5 - debug, 6 - trace
 
-export LOG_LEVEL_INT=4
-
 log() {
   if [[ $# -ne 2 ]]; then
     echo "log function requires level, message"
     return 1
   fi
   # shellcheck disable=SC2153
-  if [[ $1 -gt $LOG_LEVEL_INT ]]; then
+  if [[ $1 -gt ${LOG_LEVEL_INT:=4} ]]; then
     return 0
   fi
   log_level=""

diff --git a/tests/rest_scripts/abort_multipart_upload.sh b/tests/rest_scripts/abort_multipart_upload.sh
@@ -37,6 +37,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X DELETE "$AWS_ENDPOINT_URL/$bucket_name/$key?uploadId=$upload_id"

diff --git a/tests/rest_scripts/complete_multipart_upload.sh b/tests/rest_scripts/complete_multipart_upload.sh
@@ -41,6 +41,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X POST "$AWS_ENDPOINT_URL/$bucket_name/$key?uploadId=$upload_id"

diff --git a/tests/rest_scripts/copy_object.sh b/tests/rest_scripts/copy_object.sh
@@ -38,6 +38,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-copy-source;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name/$key")

diff --git a/tests/rest_scripts/create_multipart_upload.sh b/tests/rest_scripts/create_multipart_upload.sh
@@ -39,6 +39,7 @@ UNSIGNED-PAYLOAD"
 
 canonical_request_hash="$(echo -n "$canonical_request" | openssl dgst -sha256 | awk '{print $2}')"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X POST "$AWS_ENDPOINT_URL/$bucket_name/$key?uploads="

diff --git a/tests/rest_scripts/delete_object_tagging.sh b/tests/rest_scripts/delete_object_tagging.sh
@@ -35,6 +35,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X DELETE "$AWS_ENDPOINT_URL/$bucket_name/$key?tagging"

diff --git a/tests/rest_scripts/delete_objects.sh b/tests/rest_scripts/delete_objects.sh
@@ -49,6 +49,7 @@ fi
 canonical_request+="host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X POST "$AWS_ENDPOINT_URL/$bucket_name?delete")

diff --git a/tests/rest_scripts/get_bucket_acl.sh b/tests/rest_scripts/get_bucket_acl.sh
@@ -32,6 +32,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name?acl="

diff --git a/tests/rest_scripts/get_bucket_ownership_controls.sh b/tests/rest_scripts/get_bucket_ownership_controls.sh
@@ -32,6 +32,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name?ownershipControls="

diff --git a/tests/rest_scripts/get_bucket_policy.sh b/tests/rest_scripts/get_bucket_policy.sh
@@ -32,6 +32,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name?policy="

diff --git a/tests/rest_scripts/get_bucket_tagging.sh b/tests/rest_scripts/get_bucket_tagging.sh
@@ -32,6 +32,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name?tagging="

diff --git a/tests/rest_scripts/get_bucket_versioning.sh b/tests/rest_scripts/get_bucket_versioning.sh
@@ -32,6 +32,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name?versioning="

diff --git a/tests/rest_scripts/get_object.sh b/tests/rest_scripts/get_object.sh
@@ -36,6 +36,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name/$key"

diff --git a/tests/rest_scripts/get_object_attributes.sh b/tests/rest_scripts/get_object_attributes.sh
@@ -41,6 +41,7 @@ x-amz-object-attributes:$attributes
 host;x-amz-content-sha256;x-amz-date;x-amz-object-attributes
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name/$key?attributes="

diff --git a/tests/rest_scripts/get_object_legal_hold.sh b/tests/rest_scripts/get_object_legal_hold.sh
@@ -35,6 +35,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name/$key?legal-hold="

diff --git a/tests/rest_scripts/get_public_access_block.sh b/tests/rest_scripts/get_public_access_block.sh
@@ -33,6 +33,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name?publicAccessBlock="

diff --git a/tests/rest_scripts/head_object.sh b/tests/rest_scripts/head_object.sh
@@ -36,6 +36,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ksI -w "\"%{http_code}\"" "$AWS_ENDPOINT_URL/$bucket_name/$key"

diff --git a/tests/rest_scripts/list_buckets.sh b/tests/rest_scripts/list_buckets.sh
@@ -28,6 +28,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "https://$host"

diff --git a/tests/rest_scripts/list_multipart_uploads.sh b/tests/rest_scripts/list_multipart_uploads.sh
@@ -36,6 +36,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "https://$host/$bucket_name/$key?uploads="

diff --git a/tests/rest_scripts/list_object_versions.sh b/tests/rest_scripts/list_object_versions.sh
@@ -34,6 +34,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "https://$host/$bucket_name?versions"

diff --git a/tests/rest_scripts/list_objects.sh b/tests/rest_scripts/list_objects.sh
@@ -57,6 +57,8 @@ x-amz-date:$current_date_time
 
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
+
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"")

diff --git a/tests/rest_scripts/list_parts.sh b/tests/rest_scripts/list_parts.sh
@@ -38,6 +38,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 UNSIGNED-PAYLOAD"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" "https://$host/$bucket_name/$key?uploadId=$upload_id"

diff --git a/tests/rest_scripts/put_bucket_acl.sh b/tests/rest_scripts/put_bucket_acl.sh
@@ -54,6 +54,7 @@ fi
 canonical_request+="x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name?acl=")

diff --git a/tests/rest_scripts/put_bucket_ownership_controls.sh b/tests/rest_scripts/put_bucket_ownership_controls.sh
@@ -45,6 +45,7 @@ x-amz-date:$current_date_time
 content-md5;host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name?ownershipControls="

diff --git a/tests/rest_scripts/put_bucket_policy.sh b/tests/rest_scripts/put_bucket_policy.sh
@@ -38,6 +38,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name?policy="

diff --git a/tests/rest_scripts/put_bucket_tagging.sh b/tests/rest_scripts/put_bucket_tagging.sh
@@ -50,6 +50,7 @@ x-amz-date:$current_date_time
 content-md5;host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name?tagging="

diff --git a/tests/rest_scripts/put_bucket_versioning.sh b/tests/rest_scripts/put_bucket_versioning.sh
@@ -41,6 +41,7 @@ x-amz-date:$current_date_time
 host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name?versioning="

diff --git a/tests/rest_scripts/put_object.sh b/tests/rest_scripts/put_object.sh
@@ -54,6 +54,7 @@ host;x-amz-content-sha256;x-amz-date
 $payload_hash"
 fi
 
+# shellcheck disable=SC2119
 create_canonical_hash_sts_and_signature
 
 curl_command+=(curl -ks -w "\"%{http_code}\"" -X PUT "$AWS_ENDPOINT_URL/$bucket_name/$key")