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

Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754

This commit is contained in:
mike12345567 2023-04-12 17:09:29 +01:00
parent 3eb718ea6d 222e772cb7
commit 1129d19412
22 changed files with 100 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release-master.yml vendored
View File

@ -107,7 +107,7 @@ jobs:
git pull
mkdir sync
echo "Packaging chart to sync dir"
helm package charts/budibase --version 0.0.0-master --app-version "$RELEASE_VERSION" --destination sync
helm package charts/budibase --version 0.0.0-master --app-version v"$RELEASE_VERSION" --destination sync
echo "Packaging successful"
git checkout gh-pages
echo "Indexing helm repo"

7
charts/budibase/templates/app-service-deployment.yaml
View File

@ -199,7 +199,12 @@ spec:
value: {{ .Values.services.tlsRejectUnauthorized }}
{{ end }}
image: budibase/apps:{{ .Values.globals.appVersion }}
image: >-
{{- if .Values.globals.appVersion }}
budibase/apps:{{ .Values.globals.appVersion }}
{{- else }}
budibase/apps:{{ .Chart.AppVersion }}
{{- end }}
imagePullPolicy: Always
livenessProbe:
httpGet:

7
charts/budibase/templates/proxy-service-deployment.yaml
View File

@ -37,7 +37,12 @@ spec:
{{ end }}
spec:
containers:
- image: budibase/proxy:{{ .Values.globals.appVersion }}
image: >-
{{- if .Values.globals.appVersion }}
budibase/proxy:{{ .Values.globals.appVersion }}
{{- else }}
budibase/proxy:{{ .Chart.AppVersion }}
{{- end }}
imagePullPolicy: Always
name: proxy-service
ports:

8
charts/budibase/templates/worker-service-deployment.yaml
View File

@ -188,8 +188,12 @@ spec:
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: {{ .Values.services.tlsRejectUnauthorized }}
{{ end }}
image: budibase/worker:{{ .Values.globals.appVersion }}
image: >-
{{- if .Values.globals.appVersion }}
budibase/worker:{{ .Values.globals.appVersion }}
{{- else }}
budibase/worker:{{ .Chart.AppVersion }}
{{- end }}
imagePullPolicy: Always
livenessProbe:
httpGet:

2
charts/budibase/values.yaml
View File

@ -74,7 +74,7 @@ tolerations: []
affinity: {}
globals:
appVersion: "latest"
appVersion: "" # Use as an override to .Chart.AppVersion
budibaseEnv: PRODUCTION
tenantFeatureFlags: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR"
enableAnalytics: "1"

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"npmClient": "yarn",
"packages": ["packages/*"],
"command": {

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -24,7 +24,7 @@
"dependencies": {
"@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "2.4.44-alpha.15",
"@budibase/types": "2.4.44-alpha.17",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0",

6
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,8 +38,8 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "2.4.44-alpha.15",
"@budibase/string-templates": "2.4.44-alpha.15",
"@budibase/shared-core": "2.4.44-alpha.17",
"@budibase/string-templates": "2.4.44-alpha.17",
"@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1",

12
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -58,11 +58,11 @@
}
},
"dependencies": {
"@budibase/bbui": "2.4.44-alpha.15",
"@budibase/client": "2.4.44-alpha.15",
"@budibase/frontend-core": "2.4.44-alpha.15",
"@budibase/shared-core": "2.4.44-alpha.15",
"@budibase/string-templates": "2.4.44-alpha.15",
"@budibase/bbui": "2.4.44-alpha.17",
"@budibase/client": "2.4.44-alpha.17",
"@budibase/frontend-core": "2.4.44-alpha.17",
"@budibase/shared-core": "2.4.44-alpha.17",
"@budibase/string-templates": "2.4.44-alpha.17",
"@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1",

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "dist/index.js",
"bin": {
@ -29,9 +29,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "2.4.44-alpha.15",
"@budibase/string-templates": "2.4.44-alpha.15",
"@budibase/types": "2.4.44-alpha.15",
"@budibase/backend-core": "2.4.44-alpha.17",
"@budibase/string-templates": "2.4.44-alpha.17",
"@budibase/types": "2.4.44-alpha.17",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

12
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,11 +19,11 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "2.4.44-alpha.15",
"@budibase/frontend-core": "2.4.44-alpha.15",
"@budibase/shared-core": "2.4.44-alpha.15",
"@budibase/string-templates": "2.4.44-alpha.15",
"@budibase/types": "2.4.44-alpha.15",
"@budibase/bbui": "2.4.44-alpha.17",
"@budibase/frontend-core": "2.4.44-alpha.17",
"@budibase/shared-core": "2.4.44-alpha.17",
"@budibase/string-templates": "2.4.44-alpha.17",
"@budibase/types": "2.4.44-alpha.17",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

6
packages/frontend-core/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@budibase/frontend-core",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "2.4.44-alpha.15",
"@budibase/shared-core": "2.4.44-alpha.15",
"@budibase/bbui": "2.4.44-alpha.17",
"@budibase/shared-core": "2.4.44-alpha.17",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

14
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -45,12 +45,12 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.4.44-alpha.15",
"@budibase/client": "2.4.44-alpha.15",
"@budibase/pro": "2.4.44-alpha.14",
"@budibase/shared-core": "2.4.44-alpha.15",
"@budibase/string-templates": "2.4.44-alpha.15",
"@budibase/types": "2.4.44-alpha.15",
"@budibase/backend-core": "2.4.44-alpha.17",
"@budibase/client": "2.4.44-alpha.17",
"@budibase/pro": "2.4.44-alpha.17",
"@budibase/shared-core": "2.4.44-alpha.17",
"@budibase/string-templates": "2.4.44-alpha.17",
"@budibase/types": "2.4.44-alpha.17",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

8
packages/server/src/integrations/redis.ts
View File

@ -6,6 +6,7 @@ interface RedisConfig {
port: number
username: string
password?: string
db?: number
}
const SCHEMA: Integration = {
@ -32,6 +33,12 @@ const SCHEMA: Integration = {
type: "password",
required: false,
},
db: {
type: "number",
required: false,
display: "DB",
default: 0,
},
},
query: {
create: {
@ -88,6 +95,7 @@ class RedisIntegration {
port: this.config.port,
username: this.config.username,
password: this.config.password,
db: this.config.db,
})
}

30
packages/server/yarn.lock
View File

@ -1290,14 +1290,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.44-alpha.14":
version "2.4.44-alpha.14"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.14.tgz#bac1fc304381c71f47705c963195619a1455ed41"
integrity sha512-ckwy6x9O++jip2c2QkH196Ti14wIfBiRBt8nKWBCMjm+mLGNtk9GZ8lK1GYwk2d56TNHXqOWa4trjTpfdHNPrA==
"@budibase/backend-core@2.4.44-alpha.17":
version "2.4.44-alpha.17"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.17.tgz#fbf8d7b7755385c3afe1a7673b84c6027952579c"
integrity sha512-uDD87F/T5lhgxkFzhfjO93pfUjutJHqjcWUQyiQFFV/IhGyn5TIPDf5L1a37uRT2cBfyeqatX0ZRCgS9TFhqtA==
dependencies:
"@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.44-alpha.14"
"@budibase/types" "2.4.44-alpha.17"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -1430,15 +1430,15 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
"@budibase/pro@2.4.44-alpha.14":
version "2.4.44-alpha.14"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.14.tgz#e7c613d4a0709bd3103d7518686a6763a9a13227"
integrity sha512-WF2QExW8JmHy7zoIExA//pxMaOXztbA7tIsy+ojZcIRKDO8im8CwdtIFTq6vneGjQmH198sA2g3eR/PBnvt2zw==
"@budibase/pro@2.4.44-alpha.17":
version "2.4.44-alpha.17"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.17.tgz#ab1142586d7c2c046f2846b3519bcc1ca39e0beb"
integrity sha512-k3TVbkkaDltq4Y3VQPxVLBFdAMsr7Qck+nXuqdSIA35lu9xFnYvUcEJF848y6jaYlUz9spO/NjdLJYqHED8Rhg==
dependencies:
"@budibase/backend-core" "2.4.44-alpha.14"
"@budibase/backend-core" "2.4.44-alpha.17"
"@budibase/shared-core" "2.4.44-alpha.1"
"@budibase/string-templates" "2.4.44-alpha.1"
"@budibase/types" "2.4.44-alpha.14"
"@budibase/types" "2.4.44-alpha.17"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1491,10 +1491,10 @@
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933"
integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg==
"@budibase/types@2.4.44-alpha.14":
version "2.4.44-alpha.14"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.14.tgz#3d925b621861dca38b1254a4b3a78f6b88fa78a6"
integrity sha512-mq/jYY9TN0/bFJu0nj4xVF+D6wmFlTbWpMtwQKAPE7y7dly3XZpxagcEWvBdSyIfuqi/Lbsf5q0xroI1GEgC+Q==
"@budibase/types@2.4.44-alpha.17":
version "2.4.44-alpha.17"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.17.tgz#e4e0804600220740486793d704f9bd554aca9e1c"
integrity sha512-l/M+OYsFknXurWbQYPY8hhJxkltdxZTAc0GG8+lbr8ZfzthFSHvrjugnXDprKNooKbokyX5ll/zt3V3ea9qGgg==
dependencies:
scim-patch "^0.7.0"

4
packages/shared-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/shared-core",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Shared data utils",
"main": "dist/cjs/src/index.js",
"types": "dist/mjs/src/index.d.ts",
@ -20,7 +20,7 @@
"dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
},
"dependencies": {
"@budibase/types": "2.4.44-alpha.15"
"@budibase/types": "2.4.44-alpha.17"
},
"devDependencies": {
"concurrently": "^7.6.0",

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase types",
"main": "dist/cjs/index.js",
"types": "dist/mjs/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "2.4.44-alpha.15",
"version": "2.4.44-alpha.17",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -37,10 +37,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "2.4.44-alpha.15",
"@budibase/pro": "2.4.44-alpha.14",
"@budibase/string-templates": "2.4.44-alpha.15",
"@budibase/types": "2.4.44-alpha.15",
"@budibase/backend-core": "2.4.44-alpha.17",
"@budibase/pro": "2.4.44-alpha.17",
"@budibase/string-templates": "2.4.44-alpha.17",
"@budibase/types": "2.4.44-alpha.17",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -475,14 +475,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.44-alpha.14":
version "2.4.44-alpha.14"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.14.tgz#bac1fc304381c71f47705c963195619a1455ed41"
integrity sha512-ckwy6x9O++jip2c2QkH196Ti14wIfBiRBt8nKWBCMjm+mLGNtk9GZ8lK1GYwk2d56TNHXqOWa4trjTpfdHNPrA==
"@budibase/backend-core@2.4.44-alpha.17":
version "2.4.44-alpha.17"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.17.tgz#fbf8d7b7755385c3afe1a7673b84c6027952579c"
integrity sha512-uDD87F/T5lhgxkFzhfjO93pfUjutJHqjcWUQyiQFFV/IhGyn5TIPDf5L1a37uRT2cBfyeqatX0ZRCgS9TFhqtA==
dependencies:
"@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.44-alpha.14"
"@budibase/types" "2.4.44-alpha.17"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -565,15 +565,15 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
"@budibase/pro@2.4.44-alpha.14":
version "2.4.44-alpha.14"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.14.tgz#e7c613d4a0709bd3103d7518686a6763a9a13227"
integrity sha512-WF2QExW8JmHy7zoIExA//pxMaOXztbA7tIsy+ojZcIRKDO8im8CwdtIFTq6vneGjQmH198sA2g3eR/PBnvt2zw==
"@budibase/pro@2.4.44-alpha.17":
version "2.4.44-alpha.17"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.17.tgz#ab1142586d7c2c046f2846b3519bcc1ca39e0beb"
integrity sha512-k3TVbkkaDltq4Y3VQPxVLBFdAMsr7Qck+nXuqdSIA35lu9xFnYvUcEJF848y6jaYlUz9spO/NjdLJYqHED8Rhg==
dependencies:
"@budibase/backend-core" "2.4.44-alpha.14"
"@budibase/backend-core" "2.4.44-alpha.17"
"@budibase/shared-core" "2.4.44-alpha.1"
"@budibase/string-templates" "2.4.44-alpha.1"
"@budibase/types" "2.4.44-alpha.14"
"@budibase/types" "2.4.44-alpha.17"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -608,10 +608,10 @@
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933"
integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg==
"@budibase/types@2.4.44-alpha.14":
version "2.4.44-alpha.14"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.14.tgz#3d925b621861dca38b1254a4b3a78f6b88fa78a6"
integrity sha512-mq/jYY9TN0/bFJu0nj4xVF+D6wmFlTbWpMtwQKAPE7y7dly3XZpxagcEWvBdSyIfuqi/Lbsf5q0xroI1GEgC+Q==
"@budibase/types@2.4.44-alpha.17":
version "2.4.44-alpha.17"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.17.tgz#e4e0804600220740486793d704f9bd554aca9e1c"
integrity sha512-l/M+OYsFknXurWbQYPY8hhJxkltdxZTAc0GG8+lbr8ZfzthFSHvrjugnXDprKNooKbokyX5ll/zt3V3ea9qGgg==
dependencies:
scim-patch "^0.7.0"

7
scripts/releaseHelmChart.js
View File

@ -2,15 +2,8 @@ const yaml = require("js-yaml")
const fs = require("fs")
const path = require("path")
const UpgradeTypes = {
MAJOR: "major",
MINOR: "minor",
PATCH: "patch"
}
const CHART_PATH = path.join(__dirname, "../", "charts", "budibase", "Chart.yaml")
const UPGRADE_VERSION = process.env.BUDIBASE_RELEASE_VERSION
const UPGRADE_TYPE = process.env.HELM_CHART_UPGRADE_TYPE || UpgradeTypes.PATCH
if (!UPGRADE_VERSION) {
throw new Error("BUDIBASE_RELEASE_VERSION env var must be set.")