Test and some fixes

Signed-off-by: Aayush Chouhan <achouhan@redhat.com>

Author: aayushchouhan09

src/endpoint/s3/ops/s3_get_object.js

@@ -49,7 +49,7 @@ async function get_object(req, res) {
         }
     }
     http_utils.set_response_headers_from_request(req, res);
-    await http_utils.set_expiration_header(req, res, object_md); // setting expiration header for bucket lifecycle
+    if (!version_id) await http_utils.set_expiration_header(req, res, object_md); // setting expiration header for bucket lifecycle
     const obj_size = object_md.size;
     const params = {
         object_md,

src/endpoint/s3/ops/s3_head_object.js

@@ -29,7 +29,7 @@ async function head_object(req, res) {
     s3_utils.set_response_object_md(res, object_md);
     s3_utils.set_encryption_response_headers(req, res, object_md.encryption);
     http_utils.set_response_headers_from_request(req, res);
-    await http_utils.set_expiration_header(req, res, object_md); // setting expiration header for bucket lifecycle
+    if (!params.version_id) await http_utils.set_expiration_header(req, res, object_md); // setting expiration header for bucket lifecycle
 }
 
 module.exports = {

src/test/unit_tests/test_lifecycle.js

@@ -829,11 +829,13 @@ mocha.describe('lifecycle', () => {
         };
 
         function generate_rule(id, prefix, tags, size_gt, size_lt, expiration_days) {
-            const filter = {};
-            if (prefix) filter.Prefix = prefix;
-            if (tags.length) filter.Tags = tags;
-            if (size_gt !== undefined) filter.ObjectSizeGreaterThan = size_gt;
-            if (size_lt !== undefined) filter.ObjectSizeLessThan = size_lt;
+            const filters = {};
+            if (prefix) filters.Prefix = prefix;
+            if (Array.isArray(tags) && tags.length) filters.Tags = tags;
+            if (size_gt !== undefined) filters.ObjectSizeGreaterThan = size_gt;
+            if (size_lt !== undefined) filters.ObjectSizeLessThan = size_lt;
+
+            const filter = Object.keys(filters).length > 1 ? { And: filters } : filters;
 
             return {
                 ID: id,
@@ -849,11 +851,11 @@ mocha.describe('lifecycle', () => {
             console.log("match: ", match);
 
             const [, expiry_str, rule_id] = match;
-            const expiration_date = new Date(expiry_str);
+            const expiration = new Date(expiry_str);
             const start = new Date(start_time);
-            start_time.setUTCHours(0, 0, 0, 0); // adjusting to midnight UTC otherwise the tests will fail - similar to ceph-s3 tests
+            start.setUTCHours(0, 0, 0, 0); // adjusting to midnight UTC otherwise the tests will fail - fix for ceph-s3 tests
 
-            const days_diff = Math.floor((expiration_date.getTime() - start.getTime()) / (24 * 60 * 60 * 1000));
+            const days_diff = Math.floor((expiration.getTime() - start.getTime()) / (24 * 60 * 60 * 1000));
 
             return days_diff === delta_days && rule_id === expected_rule_id;
         }

src/util/lifecycle_utils.js

@@ -89,20 +89,16 @@ function get_lifecycle_rule_for_object(rules, object_info) {
     for (const rule of rules) {
         if (rule?.status !== 'Enabled') continue;
 
-        const filter = rule?.filter || {};
+        const filter_func = build_lifecycle_filter(rule);
+        if (!filter_func(object_info)) continue;
 
-        const filter_func = build_lifecycle_filter(filter);
-
-        if (!filter_func(object_info)) { continue; }
-
-        const new_priority = get_rule_priority(filter);
+        const new_priority = get_rule_priority(rule.filter);
 
         if (compare_rule_priority(curr_priority, new_priority)) {
             matched_rule = rule;
             curr_priority = new_priority;
         }
     }
-
     return matched_rule;
 }