diff options
| author | YS <47836716+yszkst@users.noreply.github.com> | 2023-03-13 09:45:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-13 09:45:21 +0900 |
| commit | 44213812b87335fd064f86ebfa31f693bc21a950 (patch) | |
| tree | 0042d0271cf071ff9eed7ecd21679735a5007bf7 | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-44213812b87335fd064f86ebfa31f693bc21a950.tar.gz sharkey-44213812b87335fd064f86ebfa31f693bc21a950.tar.bz2 sharkey-44213812b87335fd064f86ebfa31f693bc21a950.zip | |
空文字列のobjectStorageEndtpoinをnullと同様に扱う (#10312)
| -rw-r--r-- | packages/backend/src/core/S3Service.ts | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts index 0ce69aaa74..cc8f950813 100644 --- a/packages/backend/src/core/S3Service.ts +++ b/packages/backend/src/core/S3Service.ts @@ -19,12 +19,14 @@ export class S3Service { @bindThis public getS3(meta: Meta) { - const u = meta.objectStorageEndpoint != null + const u = meta.objectStorageEndpoint ? `${meta.objectStorageUseSSL ? 'https://' : 'http://'}${meta.objectStorageEndpoint}` : `${meta.objectStorageUseSSL ? 'https://' : 'http://'}example.net`; - + return new S3({ - endpoint: meta.objectStorageEndpoint ?? undefined, + endpoint: meta.objectStorageEndpoint && meta.objectStorageEndpoint.length > 0 + ? meta.objectStorageEndpoint + : undefined, accessKeyId: meta.objectStorageAccessKey!, secretAccessKey: meta.objectStorageSecretKey!, region: meta.objectStorageRegion ?? undefined, |