From 5d5ccc84ce93b210c99e3e92b0692fab193a72e4 Mon Sep 17 00:00:00 2001 From: andz-bb Date: Thu, 8 Aug 2024 11:11:21 +0100 Subject: [PATCH 1/5] fix AWS datasource when endpoint is unspecified --- packages/server/src/api/controllers/static/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 8db7816a9c..b4b4fdea5d 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -304,7 +304,7 @@ export const getSignedUploadURL = async function (ctx: Ctx) { try { const s3 = new AWS.S3({ region: awsRegion, - endpoint: datasource?.config?.endpoint as string, + endpoint: datasource?.config?.endpoint || undefined, accessKeyId: datasource?.config?.accessKeyId as string, secretAccessKey: datasource?.config?.secretAccessKey as string, apiVersion: "2006-03-01", From f2c61d616f0babc2f55fc2e4d26ecb6ff6853611 Mon Sep 17 00:00:00 2001 From: Christos Alexiou Date: Thu, 8 Aug 2024 15:54:34 +0300 Subject: [PATCH 2/5] feat: only use requirepass if password's set --- hosting/single/runner.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index fc8d4d8b2d..5029128ff2 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -80,7 +80,11 @@ ln -s ${DATA_DIR}/.env /worker/.env # make these directories in runner, incase of mount mkdir -p ${DATA_DIR}/minio chown -R couchdb:couchdb ${DATA_DIR}/couch -redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & +if [[ -z "${REDIS_PASSWORD}" ]]; then + redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & +else + redis-server > /dev/stdout 2>&1 & +fi /bbcouch-runner.sh & # only start minio if use s3 isn't passed From 691803e90ab3ffced6c22f87bcd367d93d15ec9d Mon Sep 17 00:00:00 2001 From: Christos Alexiou Date: Thu, 8 Aug 2024 15:56:28 +0300 Subject: [PATCH 3/5] Check empty --- hosting/single/runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index 5029128ff2..190e303ee7 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -80,7 +80,7 @@ ln -s ${DATA_DIR}/.env /worker/.env # make these directories in runner, incase of mount mkdir -p ${DATA_DIR}/minio chown -R couchdb:couchdb ${DATA_DIR}/couch -if [[ -z "${REDIS_PASSWORD}" ]]; then +if [[ -z "${REDIS_PASSWORD}" || "${REDIS_PASSWORD}" = "" ]]; then redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & else redis-server > /dev/stdout 2>&1 & From 200dc4027d4f196400a6d6b77ddb868bbcf2ee32 Mon Sep 17 00:00:00 2001 From: Christos Alexiou Date: Thu, 8 Aug 2024 16:10:55 +0300 Subject: [PATCH 4/5] Use -n for non-empty --- hosting/single/runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index 190e303ee7..b89bf8ffd4 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -80,7 +80,7 @@ ln -s ${DATA_DIR}/.env /worker/.env # make these directories in runner, incase of mount mkdir -p ${DATA_DIR}/minio chown -R couchdb:couchdb ${DATA_DIR}/couch -if [[ -z "${REDIS_PASSWORD}" || "${REDIS_PASSWORD}" = "" ]]; then +if [[ -n "${REDIS_PASSWORD}" ]]; then redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & else redis-server > /dev/stdout 2>&1 & From 7322dda032ca94391aeeccf69e3ea40c691b9b6a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 8 Aug 2024 13:21:32 +0000 Subject: [PATCH 5/5] Bump version to 2.30.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index caa665a0f2..c9b38f1031 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "2.30.1", + "version": "2.30.2", "npmClient": "yarn", "packages": [ "packages/*",