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

Merge branch 'master' into ops/redis-server-runner-requirepass

This commit is contained in:
Christos Alexiou 2024-08-08 17:11:59 +03:00 committed by GitHub
parent 200dc4027d 7322dda032
commit 4b033735f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "node_modules/lerna/schemas/lerna-schema.json", "$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "2.30.0", "version": "2.30.2",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

2
packages/server/src/api/controllers/static/index.ts
View File

@ -304,7 +304,7 @@ export const getSignedUploadURL = async function (ctx: Ctx) {
try { try {
const s3 = new AWS.S3({ const s3 = new AWS.S3({
region: awsRegion, region: awsRegion,
endpoint: datasource?.config?.endpoint as string, endpoint: datasource?.config?.endpoint || undefined,
accessKeyId: datasource?.config?.accessKeyId as string, accessKeyId: datasource?.config?.accessKeyId as string,
secretAccessKey: datasource?.config?.secretAccessKey as string, secretAccessKey: datasource?.config?.secretAccessKey as string,
apiVersion: "2006-03-01", apiVersion: "2006-03-01",

1
packages/shared-core/src/constants/index.ts
View File

@ -182,6 +182,7 @@ export enum BpmStatusValue {
COMPLETING_ACCOUNT_INFO = "completing_account_info", COMPLETING_ACCOUNT_INFO = "completing_account_info",
VERIFYING_EMAIL = "verifying_email", VERIFYING_EMAIL = "verifying_email",
COMPLETED = "completed", COMPLETED = "completed",
FAILED = "failed",
} }
export const DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default" export const DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default"