ben.carrasco/jambonz-api-server
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-api-server.git synced 2025-12-19 05:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

support S3 compatible region (#453)

Browse Source 
* support S3 compatible region

* wip
This commit is contained in:
Hoan Luu Huu
2025-05-28 19:04:15 +07:00
committed by GitHub
parent 6700ff35be
commit c7e279d0ee
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/record/utils.js
View File

@@ -26,7 +26,7 @@ const getUploader = (key, metadata, bucket_credential, logger) => {
accessKeyId: bucket_credential.access_key_id, accessKeyId: bucket_credential.access_key_id,
secretAccessKey: bucket_credential.secret_access_key, secretAccessKey: bucket_credential.secret_access_key,
}, },
region: 'us-east-1', region: bucket_credential.region || 'us-east-1',
forcePathStyle: true forcePathStyle: true
}; };
return new S3MultipartUploadStream(logger, uploaderOpts); return new S3MultipartUploadStream(logger, uploaderOpts);

8
lib/routes/api/accounts.js
View File

@@ -677,12 +677,12 @@ function encryptBucketCredential(obj, storedCredentials = {}) {
name, name,
access_key_id, access_key_id,
tags, tags,
endpoint endpoint,
} = obj.bucket_credential; } = obj.bucket_credential;
let { let {
secret_access_key, secret_access_key,
service_key, service_key,
connection_string connection_string,
} = obj.bucket_credential; } = obj.bucket_credential;
switch (vendor) { switch (vendor) {
@@ -707,7 +707,9 @@ function encryptBucketCredential(obj, storedCredentials = {}) {
secret_access_key = storedCredentials.secret_access_key; secret_access_key = storedCredentials.secret_access_key;
} }
const s3Data = JSON.stringify({vendor, endpoint, name, access_key_id, const s3Data = JSON.stringify({vendor, endpoint, name, access_key_id,
secret_access_key, tags}); secret_access_key, tags,
...(region && {region})
});
obj.bucket_credential = encrypt(s3Data); obj.bucket_credential = encrypt(s3Data);
break; break;
case 'google': case 'google':