HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 's3-logging' into 'develop'

Browse source 
Log the concatenated S3 url if constructing the S3 client fails.

See merge request firefish/firefish!10531
This commit is contained in:
Kainoa Kanter 2023-07-28 18:30:53 +00:00
commit 19762bd955
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/backend/src/services/drive/s3.ts
View file

@ -11,17 +11,21 @@ export function getS3(meta: Meta) {
}` }`
: `${meta.objectStorageUseSSL ? "https://" : "http://"}example.net`; : `${meta.objectStorageUseSSL ? "https://" : "http://"}example.net`;
return new S3({ try {
endpoint: meta.objectStorageEndpoint || undefined, return new S3({
accessKeyId: meta.objectStorageAccessKey!, endpoint: meta.objectStorageEndpoint || undefined,
secretAccessKey: meta.objectStorageSecretKey!, accessKeyId: meta.objectStorageAccessKey!,
region: meta.objectStorageRegion || undefined, secretAccessKey: meta.objectStorageSecretKey!,
sslEnabled: meta.objectStorageUseSSL, region: meta.objectStorageRegion || undefined,
s3ForcePathStyle: !meta.objectStorageEndpoint // AWS with endPoint omitted sslEnabled: meta.objectStorageUseSSL,
? false s3ForcePathStyle: !meta.objectStorageEndpoint // AWS with endPoint omitted
: meta.objectStorageS3ForcePathStyle, ? false
httpOptions: { : meta.objectStorageS3ForcePathStyle,
agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy), httpOptions: {
}, agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy),
}); },
});
} catch (e) {
throw new Error(`Failed to construct S3 client, assembled S3 URL: ${u}\n${e}`);
}
} }