Skip to content

Commit 078d4e5

Browse files
authored
Merge pull request #9218 from naveenpaul1/s3_sdk_v3
SDK | Update aws sts cred method
2 parents 29d20c7 + 64ffae8 commit 078d4e5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/agent/block_store_services/block_store_client.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ class BlockStoreClient {
298298
agent: http_utils.get_unsecured_agent(s3_params.endpoint)
299299
};
300300
if (bs_info.connection_params.aws_sts_arn) {
301-
const creds = await cloud_utils.generate_aws_sts_creds(s3_params, "_delegate_write_block_s3_session");
301+
const creds = await cloud_utils.generate_aws_sdkv3_sts_creds(s3_params, "_delegate_write_block_s3_session");
302302
s3_params.accessKeyId = creds.accessKeyId;
303303
s3_params.secretAccessKey = creds.secretAccessKey;
304304
s3_params.sessionToken = creds.sessionToken;
@@ -351,7 +351,7 @@ class BlockStoreClient {
351351
agent: http_utils.get_unsecured_agent(s3_params.endpoint)
352352
};
353353
if (bs_info.connection_params.aws_sts_arn) {
354-
const creds = await cloud_utils.generate_aws_sts_creds(s3_params, "_delegate_read_block_s3_session");
354+
const creds = await cloud_utils.generate_aws_sdkv3_sts_creds(s3_params, "_delegate_read_block_s3_session");
355355
s3_params.accessKeyId = creds.accessKeyId;
356356
s3_params.secretAccessKey = creds.secretAccessKey;
357357
s3_params.sessionToken = creds.sessionToken;

src/sdk/namespace_s3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class NamespaceS3 {
7171
const additionalParams = {
7272
RoleSessionName: 'block_store_operations',
7373
};
74-
this.s3 = await cloud_utils.createSTSS3Client(this.s3_params, additionalParams);
74+
this.s3 = await cloud_utils.createSTSS3SDKv3Client(this.s3_params, additionalParams);
7575
}
7676
}
7777

src/server/system_services/account_server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ async function check_google_connection(params) {
10511051
}
10521052

10531053
async function check_aws_sts_connection(params) {
1054-
const creds = await cloud_utils.generate_aws_sts_creds(params, "check_aws_sts_sessions");
1054+
const creds = await cloud_utils.generate_aws_sdkv3_sts_creds(params, "check_aws_sts_sessions");
10551055
params.identity = new SensitiveString(creds.accessKeyId);
10561056
params.secret = new SensitiveString(creds.secretAccessKey);
10571057
params.sessionToken = creds.sessionToken;

src/server/system_services/bucket_server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2037,7 +2037,7 @@ async function _get_s3_client(connection) {
20372037
let access_key;
20382038
let secret_key;
20392039
if (connection.aws_sts_arn) {
2040-
const creds = await cloud_utils.generate_aws_sts_creds(connection, "get_cloud_buckets_session");
2040+
const creds = await cloud_utils.generate_aws_sdkv3_sts_creds(connection, "get_cloud_buckets_session");
20412041
access_key = creds.accessKeyId;
20422042
secret_key = creds.secretAccessKey;
20432043
connection.sessionToken = creds.sessionToken;

0 commit comments

Comments
 (0)