From f844763124b1f5dd92a729b2a939cdce016052ef Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 8 May 2024 21:52:11 +0200 Subject: [PATCH] Revert "Rework error flow" This reverts commit 3cfa021bcc0d6eb80e06f97fa436f64b0eddf99f. Signed-off-by: Ben --- src/endpoint/s3/ops/s3_get_bucket_versions.js | 2 +- src/endpoint/s3/s3_utils.js | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/endpoint/s3/ops/s3_get_bucket_versions.js b/src/endpoint/s3/ops/s3_get_bucket_versions.js index e986dc0bf0..1414248321 100644 --- a/src/endpoint/s3/ops/s3_get_bucket_versions.js +++ b/src/endpoint/s3/ops/s3_get_bucket_versions.js @@ -21,7 +21,7 @@ async function get_bucket_versions(req) { dbg.warn('A version-id marker cannot be specified without a key marker'); throw new S3Error(S3Error.InvalidArgument); } - const version_id_marker = s3_utils.parse_version_id(req.query['version-id-marker'], S3Error.InvalidArgumentEmptyVersionIdMarker); + const version_id_marker = s3_utils.parse_version_id_marker(req.query['version-id-marker']); const reply = await req.object_sdk.list_object_versions({ bucket: req.params.bucket, prefix: req.query.prefix, diff --git a/src/endpoint/s3/s3_utils.js b/src/endpoint/s3/s3_utils.js index a2860390ec..bf844f6f7c 100644 --- a/src/endpoint/s3/s3_utils.js +++ b/src/endpoint/s3/s3_utils.js @@ -625,15 +625,25 @@ function encode_uri_unless_already_encoded(uri = '') { /** * parse_version_id throws an error if version_id is an empty string, and returns it otherwise * @param {string|undefined} version_id - * @param {import('./s3_errors').S3ErrorSpec} [empty_err] */ -function parse_version_id(version_id, empty_err = S3Error.InvalidArgumentEmptyVersionId) { +function parse_version_id(version_id) { if (version_id === '') { - throw new S3Error(empty_err); + throw new S3Error(S3Error.InvalidArgumentEmptyVersionId); } return version_id; } +/** + * parse_version_id_marker throws an error if version_id_marker is an empty string, and returns it otherwise + * @param {string|undefined} version_id_marker + */ +function parse_version_id_marker(version_id_marker) { + if (version_id_marker === '') { + throw new S3Error(S3Error.InvalidArgumentEmptyVersionIdMarker); + } + return version_id_marker; +} + /** * is_uri_already_encoded returns true if string uri is URIEncoded * @param {string} uri