empty resp and stricter checks

scality · Oct 24, 2023 · 9c841bd · 9c841bd
1 parent 325be82
commit 9c841bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/tests/unit/utils/safeList.js b/tests/unit/utils/safeList.js
@@ -5,7 +5,7 @@ const { recoverListing } = require('../../../utils/safeList');
 describe('test safeListObjectVersions', () => {
     const testCases = [
         {
-            description: 'should parse empty response',
+            description: 'should parse valid empty response',
             response: {
                 ListVersionsResult: {
                     Name: 'my-bucket',
@@ -22,6 +22,11 @@ describe('test safeListObjectVersions', () => {
                 CommonPrefixes: [],
             },
         },
+        {
+            description: 'should return error for invalid empty response',
+            response: {},
+            expectedError: new Error('im an original error'),
+        },
         {
             description: 'should parse truncated response',
             response: {

diff --git a/utils/safeList.js b/utils/safeList.js
@@ -47,7 +47,7 @@ function extractKeys(data, keys) {
  * @returns {ExtractResult} - extracted value
  */
 function safeExtract(key, data) {
-    if (data[key] && data[key].length > 0) {
+    if (Array.isArray(data[key]) && data[key].length > 0) {
         return { value: data[key][0] };
     }
     return { value: NO_VALUE };
@@ -62,7 +62,7 @@ function safeExtract(key, data) {
  * @returns {ExtractResult} - extracted value
  */
 function safeExtractInt(key, data) {
-    if (data[key] && data[key].length > 0) {
+    if (Array.isArray(data[key]) && data[key].length > 0) {
         const parsed = parseInt(data[key][0], 10);
         if (!Number.isNaN(parsed)) {
             return { value: parsed };
@@ -82,7 +82,7 @@ function safeExtractInt(key, data) {
  * @returns {ExtractResult} - extracted value
  */
 function safeExtractDate(key, data) {
-    if (data[key] && data[key].length > 0) {
+    if (Array.isArray(data[key]) && data[key].length > 0) {
         const parsed = new Date(data[key][0]);
         if (Number.isNaN(parsed.getTime())) {
             return { value: data[key][0] };
@@ -101,7 +101,7 @@ function safeExtractDate(key, data) {
  * @returns {ExtractResult} - extracted value
  */
 function safeExtractBool(key, data) {
-    if (data[key] && data[key].length > 0) {
+    if (Array.isArray(data[key]) && data[key].length > 0) {
         return { value: data[key][0] === 'true' };
     }
     return { value: NO_VALUE };
@@ -141,7 +141,7 @@ const ownerKeys = {
  * @returns {ExtractResult} - extracted value
  */
 function extractOwner(key, data) {
-    if (!data[key] || data[key].length === 0) {
+    if (!Array.isArray(data[key]) || data[key].length === 0) {
         return { value: NO_VALUE };
     }