summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYS <47836716+yszkst@users.noreply.github.com>2023-03-25 18:45:14 +0900
committerGitHub <noreply@github.com>2023-03-25 18:45:14 +0900
commit31cc188bbdebb60606919d2c8373fc6c2cb89f98 (patch)
treecfc1c76da435e563595d2b20029d477a4505b273
parentRevert "Subtree merged in packages/misskey-js" (diff)
downloadsharkey-31cc188bbdebb60606919d2c8373fc6c2cb89f98.tar.gz
sharkey-31cc188bbdebb60606919d2c8373fc6c2cb89f98.tar.bz2
sharkey-31cc188bbdebb60606919d2c8373fc6c2cb89f98.zip
regionが空文字列のときはundefinedとする (#10410)
-rw-r--r--packages/backend/src/core/S3Service.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index 629278d915..01ce12ffdd 100644
--- a/packages/backend/src/core/S3Service.ts
+++ b/packages/backend/src/core/S3Service.ts
@@ -42,7 +42,7 @@ export class S3Service {
accessKeyId: meta.objectStorageAccessKey,
secretAccessKey: meta.objectStorageSecretKey,
} : undefined,
- region: meta.objectStorageRegion ?? undefined,
+ region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined, // 空文字列もundefinedにするため ?? は使わない
tls: meta.objectStorageUseSSL,
forcePathStyle: meta.objectStorageEndpoint ? meta.objectStorageS3ForcePathStyle : false, // AWS with endPoint omitted
requestHandler: new NodeHttpHandler(handlerOption),