updated endpoint get_http_address

Author: naveenpaul1

src/endpoint/s3/s3_utils.js

@@ -668,14 +668,13 @@ function parse_body_logging_xml(req) {
 
 function get_http_response_date(res) {
     const r = get_http_response_from_resp(res);
-    if (!r.httpResponse.headers.date) throw new Error("date not found in response header");
-    return r.httpResponse.headers.date;
+    if (!r.LastModified) throw new Error("date not found in response header");
+    return r.LastModified;
 }
 
 function get_http_response_from_resp(res) {
-    const r = res.$response;
-    if (!r) throw new Error("no $response in s3 returned object");
-    return r;
+    if (res.$metadata.httpStatusCode !== 200) throw new Error("Response return with error");
+    return res;
 }
 
 function get_response_field_encoder(req) {

src/sdk/namespace_s3.js

@@ -352,7 +352,15 @@ class NamespaceS3 {
         }
         dbg.log0('NamespaceS3.upload_object:', this.bucket, inspect(params), 'res', inspect(res));
         const etag = s3_utils.parse_etag(res.ETag);
-        const last_modified_time = await s3_utils.get_http_response_date(res, this.s3, this.bucket, params.key);
+        /** @type {import("@aws-sdk/client-s3").GetObjectAttributesRequest} */
+        const request = {
+            Bucket: this.bucket,
+            Key: params.key,
+            VersionId: params.version_id,
+            ObjectAttributes: params.attributes,
+        };
+        const res_head = await this.s3.headObject(request);
+        const last_modified_time = await s3_utils.get_http_response_date(res_head, this.s3, this.bucket, params.key);
         return { etag, version_id: res.VersionId, last_modified_time };
     }
 

src/test/integration_tests/api/s3/test_namespace_auth.js

@@ -37,7 +37,7 @@ mocha.describe('Namespace Auth', function() {
             forcePathStyle: true,
             region: config.DEFAULT_REGION,
             requestHandler: new NodeHttpHandler({
-            httpAgent: http_utils.get_unsecured_agent(coretest.get_http_address())
+                httpAgent: http_utils.get_unsecured_agent(coretest.get_http_address())
             }),
         });
         coretest.log('S3 CONFIG', s3.config);

src/test/integration_tests/api/s3/test_s3_ops.js

@@ -15,7 +15,6 @@ const mocha = require('mocha');
 const assert = require('assert');
 const P = require('../../../../util/promise');
 const azure_storage = require('@azure/storage-blob');
-const noobaa_s3_client = require('../../../../sdk/noobaa_s3_client/noobaa_s3_client');
 
 // If any of these variables are not defined,
 // use the noobaa endpoint to create buckets
@@ -72,7 +71,6 @@ mocha.describe('s3_ops', function() {
     mocha.before(async function() {
         const self = this;
         self.timeout(60000);
-        const agent = noobaa_s3_client.get_requestHandler_with_suitable_agent(coretest.get_http_address());
         const account_info = await rpc_client.account.read_account({ email: EMAIL, });
         s3_client_params = {
             endpoint: coretest.get_http_address(),
@@ -82,7 +80,9 @@ mocha.describe('s3_ops', function() {
             },
             forcePathStyle: true,
             region: config.DEFAULT_REGION,
-            requestHandler: { agent },
+            requestHandler: new NodeHttpHandler({
+                httpAgent: http_utils.get_unsecured_agent(coretest.get_http_address()),
+            }),
         };
         s3 = new S3(s3_client_params);
         coretest.log('S3 CONFIG', s3.config);
@@ -777,7 +777,7 @@ mocha.describe('s3_ops', function() {
                 source_namespace_bucket = caching ? SOURCE_BUCKET + '-caching' : SOURCE_BUCKET;
                 target_namespace_bucket = caching ? TARGET_BUCKET + '-caching' : TARGET_BUCKET;
 
-                const ENDPOINT = USE_REMOTE_ENDPOINT ? process.env.ENDPOINT : coretest.get_https_address();
+                const ENDPOINT = USE_REMOTE_ENDPOINT ? process.env.ENDPOINT : coretest.get_http_address();
                 const ENDPOINT_TYPE = USE_REMOTE_ENDPOINT ? process.env.ENDPOINT_TYPE : 'S3_COMPATIBLE';
                 const AWS_ACCESS_KEY_ID = USE_REMOTE_ENDPOINT ? process.env.AWS_ACCESS_KEY_ID : s3_client_params.credentials.accessKeyId;
                 const AWS_SECRET_ACCESS_KEY = USE_REMOTE_ENDPOINT ? process.env.AWS_SECRET_ACCESS_KEY :