Log the assembled S3 url if constructing a S3 client fails.
I was configuring an instance and didn't notice that I had pasted a space into the `endpoint` field. It was not obvious from the logs why the URL was invalid.
This commit is contained in:
parent
e35b38302d
commit
74179aafdf
@ -11,17 +11,21 @@ export function getS3(meta: Meta) {
|
||||
}`
|
||||
: `${meta.objectStorageUseSSL ? "https://" : "http://"}example.net`;
|
||||
|
||||
return new S3({
|
||||
endpoint: meta.objectStorageEndpoint || undefined,
|
||||
accessKeyId: meta.objectStorageAccessKey!,
|
||||
secretAccessKey: meta.objectStorageSecretKey!,
|
||||
region: meta.objectStorageRegion || undefined,
|
||||
sslEnabled: meta.objectStorageUseSSL,
|
||||
s3ForcePathStyle: !meta.objectStorageEndpoint // AWS with endPoint omitted
|
||||
? false
|
||||
: meta.objectStorageS3ForcePathStyle,
|
||||
httpOptions: {
|
||||
agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy),
|
||||
},
|
||||
});
|
||||
try {
|
||||
return new S3({
|
||||
endpoint: meta.objectStorageEndpoint || undefined,
|
||||
accessKeyId: meta.objectStorageAccessKey!,
|
||||
secretAccessKey: meta.objectStorageSecretKey!,
|
||||
region: meta.objectStorageRegion || undefined,
|
||||
sslEnabled: meta.objectStorageUseSSL,
|
||||
s3ForcePathStyle: !meta.objectStorageEndpoint // AWS with endPoint omitted
|
||||
? false
|
||||
: meta.objectStorageS3ForcePathStyle,
|
||||
httpOptions: {
|
||||
agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy),
|
||||
},
|
||||
});
|
||||
} catch (e) {
|
||||
throw new Error(`Failed to construct S3 client, assembled S3 URL: ${u}\n${e}`);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user