Browse Source
Merge pull request #1684 from Budibase/fix/attachments
Quick attachments fix discovered when investigating the MinIO issue
pull/1692/head
Michael Drury
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
4 deletions
-
hosting/docker-compose.dev.yaml
-
packages/server/src/api/controllers/static/index.js
-
packages/server/src/api/routes/tests/row.spec.js
|
|
|
@ -14,7 +14,6 @@ services: |
|
|
|
environment: |
|
|
|
MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY} |
|
|
|
MINIO_SECRET_KEY: ${MINIO_SECRET_KEY} |
|
|
|
MINIO_BROWSER: "off" |
|
|
|
command: server /data |
|
|
|
healthcheck: |
|
|
|
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] |
|
|
|
|
|
|
|
@ -71,7 +71,7 @@ exports.uploadFile = async function (ctx) { |
|
|
|
|
|
|
|
return prepareUpload({ |
|
|
|
file, |
|
|
|
s3Key: `assets/${ctx.appId}/attachments/${processedFileName}`, |
|
|
|
s3Key: `${ctx.appId}/attachments/${processedFileName}`, |
|
|
|
bucket: ObjectStoreBuckets.APPS, |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
@ -385,7 +385,7 @@ describe("/rows", () => { |
|
|
|
name: "test", |
|
|
|
description: "test", |
|
|
|
attachment: [{ |
|
|
|
key: `${config.getAppId()}/attachment/test/thing.csv`, |
|
|
|
key: `${config.getAppId()}/attachments/test/thing.csv`, |
|
|
|
}], |
|
|
|
tableId: table._id, |
|
|
|
}) |
|
|
|
@ -393,7 +393,7 @@ describe("/rows", () => { |
|
|
|
await setup.switchToSelfHosted(async () => { |
|
|
|
const enriched = await outputProcessing(config.getAppId(), table, [row]) |
|
|
|
expect(enriched[0].attachment[0].url).toBe( |
|
|
|
`/prod-budi-app-assets/${config.getAppId()}/attachment/test/thing.csv` |
|
|
|
`/prod-budi-app-assets/${config.getAppId()}/attachments/test/thing.csv` |
|
|
|
) |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
