removed bucket path from non-path style config

This commit is contained in:
Aditya Patadia 2023-10-28 13:08:53 +05:30 committed by Shibo Lyu
parent 8034d08948
commit 60c201178e

View file

@ -63,21 +63,32 @@ class S3Storage extends StorageBase {
if (!this.bucket) throw new Error('S3 bucket not specified') if (!this.bucket) throw new Error('S3 bucket not specified')
// Optional configurations // Optional configurations
this.host = this.forcePathStyle =
process.env.GHOST_STORAGE_ADAPTER_S3_ASSET_HOST || Boolean(process.env.GHOST_STORAGE_ADAPTER_S3_FORCE_PATH_STYLE) ||
assetHost || Boolean(forcePathStyle) ||
`https://s3${ false
let defaultHost;
if(this.forcePathStyle) {
defaultHost = `https://s3${
this.region === 'us-east-1' ? '' : `-${this.region}` this.region === 'us-east-1' ? '' : `-${this.region}`
}.amazonaws.com/${this.bucket}` }.amazonaws.com/${this.bucket}`
} else {
defaultHost = `https://${this.bucket}.s3${
this.region === 'us-east-1' ? '' : `-${this.region}`
}.amazonaws.com`
}
this.host =
process.env.GHOST_STORAGE_ADAPTER_S3_ASSET_HOST ||
assetHost || defaultHost
this.pathPrefix = stripLeadingSlash( this.pathPrefix = stripLeadingSlash(
process.env.GHOST_STORAGE_ADAPTER_S3_PATH_PREFIX || pathPrefix || '' process.env.GHOST_STORAGE_ADAPTER_S3_PATH_PREFIX || pathPrefix || ''
) )
this.endpoint = this.endpoint =
process.env.GHOST_STORAGE_ADAPTER_S3_ENDPOINT || endpoint || '' process.env.GHOST_STORAGE_ADAPTER_S3_ENDPOINT || endpoint || ''
this.forcePathStyle =
Boolean(process.env.GHOST_STORAGE_ADAPTER_S3_FORCE_PATH_STYLE) ||
Boolean(forcePathStyle) ||
false
this.acl = (process.env.GHOST_STORAGE_ADAPTER_S3_ACL || this.acl = (process.env.GHOST_STORAGE_ADAPTER_S3_ACL ||
acl || acl ||
'public-read') as ObjectCannedACL 'public-read') as ObjectCannedACL