mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-01-07 20:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: logging, convert more setup commands to REST

Browse Source
This commit is contained in:
Luke McCrone
2025-05-09 18:13:18 -03:00
parent f912778617
commit 282e875d9f
13 changed files with 164 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/util/util_bucket.sh
View File

@@ -186,7 +186,7 @@ bucket_cleanup_if_bucket_exists() {
return 0
fi
if bucket_exists "$1"; then
if [ "$2" == "true" ] || bucket_exists "$1"; then
if ! bucket_cleanup "$1"; then
log 2 "error deleting bucket and/or contents"
return 1

2
tests/util/util_legal_hold.sh
View File

@@ -78,7 +78,7 @@ check_remove_legal_hold_versions() {
# return 1
#fi
if [ "$status" == "ON" ]; then
if ! put_object_legal_hold_version_id "$1" "$2" "$3" "OFF"; then
if ! put_object_legal_hold_rest_version_id "$1" "$2" "$3" "OFF"; then
log 2 "error removing legal hold of version ID"
return 1
fi

4
tests/util/util_lock_config.sh
View File

@@ -112,10 +112,6 @@ check_object_lock_config_enabled_rest() {
if ! check_param_count "check_object_lock_config_enabled_rest" "bucket" 1 $#; then
return 1
fi
if [ $# -ne 1 ]; then
log 2 "'get_check_object_lock_config_rest' requires bucket name"
return 1
fi
if ! get_object_lock_configuration_rest "$1"; then
log 2 "error getting object lock config"
return 1

8
tests/util/util_versioning.sh
View File

@@ -2,6 +2,7 @@
source ./tests/commands/get_bucket_versioning.sh
source ./tests/commands/list_object_versions.sh
source ./tests/drivers/drivers.sh
check_if_versioning_enabled() {
if ! check_param_count "check_if_versioning_enabled" "bucket" 1 $#; then
@@ -61,15 +62,12 @@ delete_object_version_with_or_without_retention() {
if ! check_remove_legal_hold_versions "$1" "${version_keys[$idx]}" "${version_ids[$idx]}"; then
log 2 "error checking, removing legal hold versions"
fi
if ! put_object_legal_hold_version_id "$1" "${version_keys[$idx]}" "${version_ids[$idx]}" "OFF"; then
log 2 "error turning off object legal hold"
fi
if ! delete_object_version_bypass_retention "$1" "${version_keys[$idx]}" "${version_ids[$idx]}"; then
if ! delete_object_version_rest_bypass_retention "$1" "${version_keys[$idx]}" "${version_ids[$idx]}"; then
log 2 "error deleting object version, bypassing retention"
return 1
fi
else
if ! delete_object_version "$1" "${version_keys[$idx]}" "${version_ids[$idx]}"; then
if ! delete_object_version_rest "$1" "${version_keys[$idx]}" "${version_ids[$idx]}"; then
log 2 "error deleting object version"
return 1
fi