update agent

Author: naveenpaul1

src/sdk/namespace_s3.js

@@ -331,7 +331,7 @@ class NamespaceS3 {
             const request = {
                 Bucket: this.bucket,
                 Key: params.key,
-                Body: await params.source_stream.pipe(count_stream),
+                Body: params.source_stream.pipe(count_stream),
                 ContentLength: params.size,
                 ContentType: params.content_type,
                 ContentMD5: params.md5_b64,

src/sdk/object_sdk.js

@@ -466,7 +466,7 @@ class ObjectSDK {
                     endpoint: r.endpoint,
                     aws_sts_arn: r.aws_sts_arn,
                     credentials: {
-                         accessKeyId: r.access_key.unwrap(),
+                        accessKeyId: r.access_key.unwrap(),
                         secretAccessKey: r.secret_key.unwrap(),
                     },
                     region: config.DEFAULT_REGION, // SDKv3 needs region

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,6 +15,7 @@ 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
@@ -71,7 +72,7 @@ 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(),
@@ -81,9 +82,7 @@ mocha.describe('s3_ops', function() {
             },
             forcePathStyle: true,
             region: config.DEFAULT_REGION,
-            requestHandler: new NodeHttpHandler({
-                httpAgent: http_utils.get_unsecured_agent(coretest.get_http_address()),
-            }),
+            requestHandler: { agent },
         };
         s3 = new S3(s3_client_params);
         coretest.log('S3 CONFIG', s3.config);

src/test/unit_tests/util_functions_tests/test_cloud_utils.js

@@ -4,7 +4,6 @@
 const mocha = require('mocha');
 const assert = require('assert');
 const sinon = require('sinon');
-const AWS = require('aws-sdk');
 const cloud_utils = require('../../../util/cloud_utils');
 const dbg = require('../../../util/debug_module')(__filename);
 const { STSClient } = require('@aws-sdk/client-sts');
@@ -15,71 +14,7 @@ const fakeAccessKeyId = "fakeAccessKeyId";
 const fakeSecretAccessKey = "fakeSecretAccessKey";
 const fakeSessionToken = "fakeSessionToken";
 const roleArn = "arn:aws:iam::261532230807:role/noobaa_s3_sts";
-const defaultSTSCredsValidity = 3600;
 const REGION = "us-east-1";
-const expectedParams = [{
-    RoleArn: roleArn,
-    RoleSessionName: 'testSession',
-    WebIdentityToken: 'web-identity-token',
-    DurationSeconds: defaultSTSCredsValidity,
-}];
-
-mocha.describe('AWS STS tests', function() {
-    let STSStub;
-    let stsFake;
-    mocha.before('Creating STS stub', function() {
-
-        sinon.stub(fs.promises, "readFile")
-            .withArgs(projectedServiceAccountToken)
-            .returns("web-identity-token");
-
-        stsFake = {
-            assumeRoleWithWebIdentity: sinon.stub().returnsThis(),
-            promise: sinon.stub()
-            .resolves({
-                Credentials: {
-                    AccessKeyId: fakeAccessKeyId,
-                    SecretAccessKey: fakeSecretAccessKey,
-                    SessionToken: fakeSessionToken
-                }
-            }),
-        };
-        STSStub = sinon.stub(AWS, 'STS')
-            .callsFake(() => stsFake);
-    });
-    mocha.after('Restoring STS stub', function() {
-        STSStub.restore();
-        fs.promises.readFile.restore?.();
-    });
-    mocha.it('should generate aws sts creds', async function() {
-        const params = {
-            aws_sts_arn: roleArn
-        };
-        const roleSessionName = "testSession";
-        const json = await cloud_utils.generate_aws_sts_creds(params, roleSessionName);
-        sinon.assert.calledOnce(STSStub);
-        sinon.assert.calledWith(stsFake.assumeRoleWithWebIdentity, ...expectedParams);
-        assert.equal(json.accessKeyId, fakeAccessKeyId);
-        assert.equal(json.secretAccessKey, fakeSecretAccessKey);
-        assert.equal(json.sessionToken, fakeSessionToken);
-        dbg.log0('test.aws.sts.assumeRoleWithWebIdentity: ', json);
-    });
-    mocha.it('should generate an STS S3 client', async function() {
-        const params = {
-            aws_sts_arn: roleArn,
-            region: 'us-east-1'
-        };
-        const additionalParams = {
-            RoleSessionName: 'testSession'
-        };
-        const s3 = await cloud_utils.createSTSS3Client(params, additionalParams);
-        dbg.log0('test.aws.sts.createSTSS3Client: ', s3);
-        assert.equal(s3.config.credentials.accessKeyId, fakeAccessKeyId);
-        assert.equal(s3.config.credentials.secretAccessKey, fakeSecretAccessKey);
-        assert.equal(s3.config.credentials.sessionToken, fakeSessionToken);
-        assert.equal(s3.config.region, 'us-east-1');
-    });
-});
 
 mocha.describe('AWS STS SDK V3 tests', function() {
     let sts_v3_stub;