MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update bucketcreate return

This commit is contained in:
Peter Clement 2024-03-18 12:06:33 +00:00
parent 8534cb8ca9
commit b7cda9bb83
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend-core/src/objectStore/objectStore.ts
View File

@ -129,7 +129,7 @@ export function ObjectStore(
export async function createBucketIfNotExists( export async function createBucketIfNotExists(
client: any, client: any,
bucketName: string bucketName: string
): Promise<boolean> { ): Promise<{ created: boolean; exists: boolean }> {
bucketName = sanitizeBucket(bucketName) bucketName = sanitizeBucket(bucketName)
try { try {
await client await client
@ -137,14 +137,14 @@ export async function createBucketIfNotExists(
Bucket: bucketName, Bucket: bucketName,
}) })
.promise() .promise()
return false return { created: false, exists: true }
} catch (err: any) { } catch (err: any) {
const promises: any = STATE.bucketCreationPromises const promises: any = STATE.bucketCreationPromises
const doesntExist = err.statusCode === 404, const doesntExist = err.statusCode === 404,
noAccess = err.statusCode === 403 noAccess = err.statusCode === 403
if (promises[bucketName]) { if (promises[bucketName]) {
await promises[bucketName] await promises[bucketName]
return false return { created: false, exists: true }
} else if (doesntExist || noAccess) { } else if (doesntExist || noAccess) {
if (doesntExist) { if (doesntExist) {
promises[bucketName] = client promises[bucketName] = client
@ -154,7 +154,7 @@ export async function createBucketIfNotExists(
.promise() .promise()
await promises[bucketName] await promises[bucketName]
delete promises[bucketName] delete promises[bucketName]
return true return { created: true, exists: false }
} else { } else {
throw new Error("Access denied to object store bucket.") throw new Error("Access denied to object store bucket.")
} }
@ -183,7 +183,7 @@ export async function upload({
const objectStore = ObjectStore(bucketName) const objectStore = ObjectStore(bucketName)
const bucketCreated = await createBucketIfNotExists(objectStore, bucketName) const bucketCreated = await createBucketIfNotExists(objectStore, bucketName)
if (addTTL && bucketCreated) { if (addTTL && bucketCreated.created) {
let ttlConfig = bucketTTLConfig(bucketName, 1) let ttlConfig = bucketTTLConfig(bucketName, 1)
await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise() await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise()
} }
@ -229,7 +229,7 @@ export async function streamUpload({
const objectStore = ObjectStore(bucketName) const objectStore = ObjectStore(bucketName)
const bucketCreated = await createBucketIfNotExists(objectStore, bucketName) const bucketCreated = await createBucketIfNotExists(objectStore, bucketName)
if (addTTL && bucketCreated) { if (addTTL && bucketCreated.created) {
let ttlConfig = bucketTTLConfig(bucketName, 1) let ttlConfig = bucketTTLConfig(bucketName, 1)
await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise() await objectStore.putBucketLifecycleConfiguration(ttlConfig).promise()
} }