Tests fix

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

Author: achouhan09

src/endpoint/s3/s3_rest.js

@@ -116,10 +116,13 @@ async function handle_request(req, res) {
     }
 
     const op_name = parse_op_name(req);
-    const cors = req.params.bucket && await req.object_sdk.read_bucket_sdk_cors_info(req.params.bucket);
 
+    const cors = req.params.bucket && await req.object_sdk.read_bucket_sdk_cors_info(req.params.bucket);
     http_utils.set_cors_headers_s3(req, res, cors);
 
+    const rules = req.params.bucket && await req.object_sdk.read_bucket_lifecycle_config_info(req.params.bucket);
+    http_utils.set_expiration_header(req, res, rules);
+
     if (req.method === 'OPTIONS') {
         dbg.log1('s3_rest: handle_request : S3 request method is ', req.method);
         const error_code = req.headers.origin && req.headers['access-control-request-method'] ? 403 : 400;
@@ -139,8 +142,6 @@ async function handle_request(req, res) {
     authenticate_request(req);
     await authorize_request(req);
 
-    await http_utils.set_expiration_header(req, res);
-
     dbg.log1('S3 REQUEST', req.method, req.originalUrl, 'op', op_name, 'request_id', req.request_id, req.headers);
     usage_report.s3_usage_info.total_calls += 1;
     usage_report.s3_usage_info[op_name] = (usage_report.s3_usage_info[op_name] || 0) + 1;

src/util/http_utils.js

@@ -672,10 +672,10 @@ const s3_error_options = {
 /**
  * @param {Object} req
  * @param {http.ServerResponse} res
+ * @param {Object} rules
  */
-async function set_expiration_header(req, res) {
+async function set_expiration_header(req, res, rules) {
     if (req.method === 'HEAD' || req.method === 'GET' || req.method === 'PUT') {
-        const rules = req.params.bucket && await req.object_sdk.read_bucket_lifecycle_config_info(req.params.bucket);
         const object_md = {
                 bucket: req.params.bucket,
                 key: req.params.key,