From 04f722867b7f416c0b124eb94e1b406efc2a1344 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 23 Aug 2022 10:41:50 +0100
Subject: [PATCH 01/13] fix service re-roll

---
 .github/workflows/deploy-release.yml  | 4 +++-
 .github/workflows/release-develop.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index b3385c2ccd..551b417c58 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -70,7 +70,9 @@ jobs:
           KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
       
       - name: Set the base64 kubeconfig
-        run: echo 'RELEASE_KUBECONFIG=${{ secrets.RELEASE_KUBECONFIG }}' | base64
+        run: |
+          base64_kubeconfig=$(echo ${{ secrets.RELEASE_KUBECONFIG }} | base64)
+          echo "RELEASE_KUBECONFIG=$base64_kubeconfig" >> $GITHUB_ENV
 
       - name: Re roll the services
         uses: actions-hub/kubectl@master
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 8d3e9f4021..69d3b1410a 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -122,7 +122,9 @@ jobs:
           KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
       
       - name: Set the base64 kubeconfig
-        run: echo 'RELEASE_KUBECONFIG=${{ secrets.RELEASE_KUBECONFIG }}' | base64
+        run: |
+          base64_kubeconfig=$(echo ${{ secrets.RELEASE_KUBECONFIG }} | base64)
+          echo "RELEASE_KUBECONFIG=$base64_kubeconfig" >> $GITHUB_ENV
 
       - name: Re roll the services
         uses: actions-hub/kubectl@master

From 739d9af7cb0976a7a928abe94b722f436b6ede6e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 09:57:34 +0000
Subject: [PATCH 02/13] v1.2.44-alpha.3

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9247be8016..d443f66630 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index cc8aa483cf..de7a0a422c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.44-alpha.2",
+    "@budibase/types": "1.2.44-alpha.3",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c9cabd4ae2..46d568f991 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.44-alpha.2",
+    "@budibase/string-templates": "1.2.44-alpha.3",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 5d80723827..23bd79ff5b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.2",
-    "@budibase/client": "1.2.44-alpha.2",
-    "@budibase/frontend-core": "1.2.44-alpha.2",
-    "@budibase/string-templates": "1.2.44-alpha.2",
+    "@budibase/bbui": "1.2.44-alpha.3",
+    "@budibase/client": "1.2.44-alpha.3",
+    "@budibase/frontend-core": "1.2.44-alpha.3",
+    "@budibase/string-templates": "1.2.44-alpha.3",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 57e286ff5e..6575f3c76c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 6b4e8f76a4..441c70506f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.2",
-    "@budibase/frontend-core": "1.2.44-alpha.2",
-    "@budibase/string-templates": "1.2.44-alpha.2",
+    "@budibase/bbui": "1.2.44-alpha.3",
+    "@budibase/frontend-core": "1.2.44-alpha.3",
+    "@budibase/string-templates": "1.2.44-alpha.3",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index aa75268abe..f0a8f42d06 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.2",
+    "@budibase/bbui": "1.2.44-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 072252915a..a9a70a7b7d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.44-alpha.2",
-    "@budibase/client": "1.2.44-alpha.2",
+    "@budibase/backend-core": "1.2.44-alpha.3",
+    "@budibase/client": "1.2.44-alpha.3",
     "@budibase/pro": "1.2.44-alpha.2",
-    "@budibase/string-templates": "1.2.44-alpha.2",
-    "@budibase/types": "1.2.44-alpha.2",
+    "@budibase/string-templates": "1.2.44-alpha.3",
+    "@budibase/types": "1.2.44-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 391323aa2f..c7cf41c25b 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 83e2eab138..fb04ed79ea 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ae674d6847..d0dfad4c92 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.2",
+  "version": "1.2.44-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.44-alpha.2",
+    "@budibase/backend-core": "1.2.44-alpha.3",
     "@budibase/pro": "1.2.44-alpha.2",
-    "@budibase/string-templates": "1.2.44-alpha.2",
-    "@budibase/types": "1.2.44-alpha.2",
+    "@budibase/string-templates": "1.2.44-alpha.3",
+    "@budibase/types": "1.2.44-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 8492f66053163a43d4c127af19fb7f50425d8480 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 10:00:33 +0000
Subject: [PATCH 03/13] Update pro version to 1.2.44-alpha.3

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index a9a70a7b7d..fde1d45e9c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.44-alpha.3",
     "@budibase/client": "1.2.44-alpha.3",
-    "@budibase/pro": "1.2.44-alpha.2",
+    "@budibase/pro": "1.2.44-alpha.3",
     "@budibase/string-templates": "1.2.44-alpha.3",
     "@budibase/types": "1.2.44-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index adf135a3da..115b6fb5ee 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.2":
-  version "1.2.44-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.2.tgz#89de0626821308629628d703bc1ee98bc5ae1e8a"
-  integrity sha512-ZV5ZuuPccPN21Z99XjNvNFVPTRuZC061NOuxAXaX4LIE+o5cwRKStU7mVMVEnj+UPrwAQDYEjON2vTQ5CZd1/w==
+"@budibase/backend-core@1.2.44-alpha.3":
+  version "1.2.44-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.3.tgz#3914fd4b9b316a076a1b99f46682802927c6fd7e"
+  integrity sha512-QIPWnuzG++nO+VSdKfOVdNTjqJU3vjwDy1ipv1Ki3Ds6jvIVfdSHJ4rz6Hj6KxtKjXRFlDK4nA/HVZJcWSHvwg==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.2"
+    "@budibase/types" "1.2.44-alpha.3"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.44-alpha.2":
-  version "1.2.44-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.2.tgz#0f6b3bdd0226f0b077f886ac7cb75cd9207e6909"
-  integrity sha512-OVNJWFL82z08O3rpE7sTnYa/nrslNMblLgd+M5mo155Q+Lk6tmXFxg49Azoo51AB/S4VLruebt5fVVMGTdQngA==
+"@budibase/pro@1.2.44-alpha.3":
+  version "1.2.44-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.3.tgz#07ad738c32035f6dd9e570984b961501e8bb7343"
+  integrity sha512-245Gvf5lIgPl84azoPfjqOWgnPqUPuLnFajWQGLiUYi5nel3zbekVZvseYcyeAheoGAE73NvTsZmMoEluIOs0A==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.2"
-    "@budibase/types" "1.2.44-alpha.2"
+    "@budibase/backend-core" "1.2.44-alpha.3"
+    "@budibase/types" "1.2.44-alpha.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.44-alpha.2":
-  version "1.2.44-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.2.tgz#9f266436715806bf42a2ab9c21b0af089ce443f3"
-  integrity sha512-TXZwDsHs6RLA8aIM3MC+MKwpSHZG7hZ9DigKgzpD9UugTPChq+GT+zadKPBe5/bbLuhrhAORqnPea3JLm8P7XQ==
+"@budibase/types@1.2.44-alpha.3":
+  version "1.2.44-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.3.tgz#1b7f9075f43ff6e2d14ef9db2500afd3417f3f56"
+  integrity sha512-8C6cQqEZCc5gaJZcUmQPaLCSkteWl0LIdx8BUoL1bqU88gcm/URS1S6nGsbodm4pAdvaQfg2pEWzx4ZMuVAiqA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d0dfad4c92..9e8ec37d8c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.44-alpha.3",
-    "@budibase/pro": "1.2.44-alpha.2",
+    "@budibase/pro": "1.2.44-alpha.3",
     "@budibase/string-templates": "1.2.44-alpha.3",
     "@budibase/types": "1.2.44-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index f38fda779a..a36ebb5d10 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.2":
-  version "1.2.44-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.2.tgz#89de0626821308629628d703bc1ee98bc5ae1e8a"
-  integrity sha512-ZV5ZuuPccPN21Z99XjNvNFVPTRuZC061NOuxAXaX4LIE+o5cwRKStU7mVMVEnj+UPrwAQDYEjON2vTQ5CZd1/w==
+"@budibase/backend-core@1.2.44-alpha.3":
+  version "1.2.44-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.3.tgz#3914fd4b9b316a076a1b99f46682802927c6fd7e"
+  integrity sha512-QIPWnuzG++nO+VSdKfOVdNTjqJU3vjwDy1ipv1Ki3Ds6jvIVfdSHJ4rz6Hj6KxtKjXRFlDK4nA/HVZJcWSHvwg==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.2"
+    "@budibase/types" "1.2.44-alpha.3"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.44-alpha.2":
-  version "1.2.44-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.2.tgz#0f6b3bdd0226f0b077f886ac7cb75cd9207e6909"
-  integrity sha512-OVNJWFL82z08O3rpE7sTnYa/nrslNMblLgd+M5mo155Q+Lk6tmXFxg49Azoo51AB/S4VLruebt5fVVMGTdQngA==
+"@budibase/pro@1.2.44-alpha.3":
+  version "1.2.44-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.3.tgz#07ad738c32035f6dd9e570984b961501e8bb7343"
+  integrity sha512-245Gvf5lIgPl84azoPfjqOWgnPqUPuLnFajWQGLiUYi5nel3zbekVZvseYcyeAheoGAE73NvTsZmMoEluIOs0A==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.2"
-    "@budibase/types" "1.2.44-alpha.2"
+    "@budibase/backend-core" "1.2.44-alpha.3"
+    "@budibase/types" "1.2.44-alpha.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.44-alpha.2":
-  version "1.2.44-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.2.tgz#9f266436715806bf42a2ab9c21b0af089ce443f3"
-  integrity sha512-TXZwDsHs6RLA8aIM3MC+MKwpSHZG7hZ9DigKgzpD9UugTPChq+GT+zadKPBe5/bbLuhrhAORqnPea3JLm8P7XQ==
+"@budibase/types@1.2.44-alpha.3":
+  version "1.2.44-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.3.tgz#1b7f9075f43ff6e2d14ef9db2500afd3417f3f56"
+  integrity sha512-8C6cQqEZCc5gaJZcUmQPaLCSkteWl0LIdx8BUoL1bqU88gcm/URS1S6nGsbodm4pAdvaQfg2pEWzx4ZMuVAiqA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From f4e3a8432f54e4985e87bd519f8c2fe45695d9bd Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 23 Aug 2022 11:12:38 +0100
Subject: [PATCH 04/13] use pre-encoded kubeconfig secret

---
 .github/workflows/deploy-release.yml  | 7 +------
 .github/workflows/release-develop.yml | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index 551b417c58..9cd9f3363f 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -69,15 +69,10 @@ jobs:
         env:
           KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
       
-      - name: Set the base64 kubeconfig
-        run: |
-          base64_kubeconfig=$(echo ${{ secrets.RELEASE_KUBECONFIG }} | base64)
-          echo "RELEASE_KUBECONFIG=$base64_kubeconfig" >> $GITHUB_ENV
-
       - name: Re roll the services
         uses: actions-hub/kubectl@master
         env:
-          KUBE_CONFIG: ${{ env.RELEASE_KUBECONFIG }}
+          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
         with:
           args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
 
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 69d3b1410a..4497870086 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -121,15 +121,10 @@ jobs:
         env:
           KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
       
-      - name: Set the base64 kubeconfig
-        run: |
-          base64_kubeconfig=$(echo ${{ secrets.RELEASE_KUBECONFIG }} | base64)
-          echo "RELEASE_KUBECONFIG=$base64_kubeconfig" >> $GITHUB_ENV
-
       - name: Re roll the services
         uses: actions-hub/kubectl@master
         env:
-          KUBE_CONFIG: ${{ env.RELEASE_KUBECONFIG }}
+          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
         with:
           args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
 

From 4e24fac83d9d362b85954cbe23d90aae88ef6fb5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 10:23:46 +0000
Subject: [PATCH 05/13] v1.2.44-alpha.4

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index d443f66630..0851b8ebdf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index de7a0a422c..dbc6c77855 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.44-alpha.3",
+    "@budibase/types": "1.2.44-alpha.4",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 46d568f991..cf48dcea9a 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.44-alpha.3",
+    "@budibase/string-templates": "1.2.44-alpha.4",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 23bd79ff5b..73123146f7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.3",
-    "@budibase/client": "1.2.44-alpha.3",
-    "@budibase/frontend-core": "1.2.44-alpha.3",
-    "@budibase/string-templates": "1.2.44-alpha.3",
+    "@budibase/bbui": "1.2.44-alpha.4",
+    "@budibase/client": "1.2.44-alpha.4",
+    "@budibase/frontend-core": "1.2.44-alpha.4",
+    "@budibase/string-templates": "1.2.44-alpha.4",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6575f3c76c..23b72bf481 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 441c70506f..13dd7c0876 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.3",
-    "@budibase/frontend-core": "1.2.44-alpha.3",
-    "@budibase/string-templates": "1.2.44-alpha.3",
+    "@budibase/bbui": "1.2.44-alpha.4",
+    "@budibase/frontend-core": "1.2.44-alpha.4",
+    "@budibase/string-templates": "1.2.44-alpha.4",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index f0a8f42d06..32c2e747dc 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.3",
+    "@budibase/bbui": "1.2.44-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index fde1d45e9c..b7f57fd897 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.44-alpha.3",
-    "@budibase/client": "1.2.44-alpha.3",
+    "@budibase/backend-core": "1.2.44-alpha.4",
+    "@budibase/client": "1.2.44-alpha.4",
     "@budibase/pro": "1.2.44-alpha.3",
-    "@budibase/string-templates": "1.2.44-alpha.3",
-    "@budibase/types": "1.2.44-alpha.3",
+    "@budibase/string-templates": "1.2.44-alpha.4",
+    "@budibase/types": "1.2.44-alpha.4",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index c7cf41c25b..00366a924c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index fb04ed79ea..3cd2ddf3af 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9e8ec37d8c..e524f41a03 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.3",
+  "version": "1.2.44-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.44-alpha.3",
+    "@budibase/backend-core": "1.2.44-alpha.4",
     "@budibase/pro": "1.2.44-alpha.3",
-    "@budibase/string-templates": "1.2.44-alpha.3",
-    "@budibase/types": "1.2.44-alpha.3",
+    "@budibase/string-templates": "1.2.44-alpha.4",
+    "@budibase/types": "1.2.44-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 928ab3f0d736997d870ac12319f97484cbe1d476 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 10:26:47 +0000
Subject: [PATCH 06/13] Update pro version to 1.2.44-alpha.4

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index b7f57fd897..59309dd77c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.44-alpha.4",
     "@budibase/client": "1.2.44-alpha.4",
-    "@budibase/pro": "1.2.44-alpha.3",
+    "@budibase/pro": "1.2.44-alpha.4",
     "@budibase/string-templates": "1.2.44-alpha.4",
     "@budibase/types": "1.2.44-alpha.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 115b6fb5ee..bca02626f1 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.3":
-  version "1.2.44-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.3.tgz#3914fd4b9b316a076a1b99f46682802927c6fd7e"
-  integrity sha512-QIPWnuzG++nO+VSdKfOVdNTjqJU3vjwDy1ipv1Ki3Ds6jvIVfdSHJ4rz6Hj6KxtKjXRFlDK4nA/HVZJcWSHvwg==
+"@budibase/backend-core@1.2.44-alpha.4":
+  version "1.2.44-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.4.tgz#aac2e3ed75b932f265de89cd6e96a6a98524ff0a"
+  integrity sha512-xPN5ge87rg0hIcCpxmmj3/9FxMf0IBvqvA69e64knrcCpDSFaWJeXfd9O9SH5GNzwjBy4FA1NxaQz40DCXjBCw==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.3"
+    "@budibase/types" "1.2.44-alpha.4"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.44-alpha.3":
-  version "1.2.44-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.3.tgz#07ad738c32035f6dd9e570984b961501e8bb7343"
-  integrity sha512-245Gvf5lIgPl84azoPfjqOWgnPqUPuLnFajWQGLiUYi5nel3zbekVZvseYcyeAheoGAE73NvTsZmMoEluIOs0A==
+"@budibase/pro@1.2.44-alpha.4":
+  version "1.2.44-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.4.tgz#b0aee3d235be2bbccfdd6c70ed63e31e9da32c94"
+  integrity sha512-ITrhf3PDNlcCxCiDcOCAxUpQZr3oiYobyr9Vyk92JVxKdsrT6GBOpRSii+zZdhoz3ZEjRP9ZhfYMDpTuGnCKLg==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.3"
-    "@budibase/types" "1.2.44-alpha.3"
+    "@budibase/backend-core" "1.2.44-alpha.4"
+    "@budibase/types" "1.2.44-alpha.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.44-alpha.3":
-  version "1.2.44-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.3.tgz#1b7f9075f43ff6e2d14ef9db2500afd3417f3f56"
-  integrity sha512-8C6cQqEZCc5gaJZcUmQPaLCSkteWl0LIdx8BUoL1bqU88gcm/URS1S6nGsbodm4pAdvaQfg2pEWzx4ZMuVAiqA==
+"@budibase/types@1.2.44-alpha.4":
+  version "1.2.44-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.4.tgz#299092f6179c02a2eebf2c88fc35a50fba779cf4"
+  integrity sha512-yK0NKUX+ggKYQ8hrjcyaFhdQq8x7QgXAbI6suns/xC8BodHox3ISAyc8HtZ4U0BtS8ONHg5t71xNXl0nueJYmA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e524f41a03..d006ab0f7f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.44-alpha.4",
-    "@budibase/pro": "1.2.44-alpha.3",
+    "@budibase/pro": "1.2.44-alpha.4",
     "@budibase/string-templates": "1.2.44-alpha.4",
     "@budibase/types": "1.2.44-alpha.4",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index a36ebb5d10..eb32a496be 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.3":
-  version "1.2.44-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.3.tgz#3914fd4b9b316a076a1b99f46682802927c6fd7e"
-  integrity sha512-QIPWnuzG++nO+VSdKfOVdNTjqJU3vjwDy1ipv1Ki3Ds6jvIVfdSHJ4rz6Hj6KxtKjXRFlDK4nA/HVZJcWSHvwg==
+"@budibase/backend-core@1.2.44-alpha.4":
+  version "1.2.44-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.4.tgz#aac2e3ed75b932f265de89cd6e96a6a98524ff0a"
+  integrity sha512-xPN5ge87rg0hIcCpxmmj3/9FxMf0IBvqvA69e64knrcCpDSFaWJeXfd9O9SH5GNzwjBy4FA1NxaQz40DCXjBCw==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.3"
+    "@budibase/types" "1.2.44-alpha.4"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.44-alpha.3":
-  version "1.2.44-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.3.tgz#07ad738c32035f6dd9e570984b961501e8bb7343"
-  integrity sha512-245Gvf5lIgPl84azoPfjqOWgnPqUPuLnFajWQGLiUYi5nel3zbekVZvseYcyeAheoGAE73NvTsZmMoEluIOs0A==
+"@budibase/pro@1.2.44-alpha.4":
+  version "1.2.44-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.4.tgz#b0aee3d235be2bbccfdd6c70ed63e31e9da32c94"
+  integrity sha512-ITrhf3PDNlcCxCiDcOCAxUpQZr3oiYobyr9Vyk92JVxKdsrT6GBOpRSii+zZdhoz3ZEjRP9ZhfYMDpTuGnCKLg==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.3"
-    "@budibase/types" "1.2.44-alpha.3"
+    "@budibase/backend-core" "1.2.44-alpha.4"
+    "@budibase/types" "1.2.44-alpha.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.44-alpha.3":
-  version "1.2.44-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.3.tgz#1b7f9075f43ff6e2d14ef9db2500afd3417f3f56"
-  integrity sha512-8C6cQqEZCc5gaJZcUmQPaLCSkteWl0LIdx8BUoL1bqU88gcm/URS1S6nGsbodm4pAdvaQfg2pEWzx4ZMuVAiqA==
+"@budibase/types@1.2.44-alpha.4":
+  version "1.2.44-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.4.tgz#299092f6179c02a2eebf2c88fc35a50fba779cf4"
+  integrity sha512-yK0NKUX+ggKYQ8hrjcyaFhdQq8x7QgXAbI6suns/xC8BodHox3ISAyc8HtZ4U0BtS8ONHg5t71xNXl0nueJYmA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From cdce6ef80819de08ec87274ab17184c759672def Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 23 Aug 2022 12:07:57 +0100
Subject: [PATCH 07/13] separate rollouts into separate steps

---
 .github/workflows/deploy-release.yml  | 21 ++++++++++++++++++---
 .github/workflows/release-develop.yml | 18 ++++++++++++++++--
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index 9cd9f3363f..b37ff9cee8 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -68,13 +68,28 @@ jobs:
             ]
         env:
           KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
-      
-      - name: Re roll the services
+
+      - name: Re roll app-service
         uses: actions-hub/kubectl@master
         env:
           KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
         with:
-          args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
+          args: rollout restart deployment app-service -n budibase
+
+      - name: Re roll proxy-service
+        uses: actions-hub/kubectl@master
+        env:
+          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
+        with:
+          args: rollout restart deployment proxy-service -n budibase
+
+      - name: Re roll worker-service
+        uses: actions-hub/kubectl@master
+        env:
+          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
+        with:
+          args: rollout restart deployment worker-service -n budibase
+
 
       - name: Discord Webhook Action
         uses: tsickert/discord-webhook@v4.0.0
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 4497870086..57e65c734e 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -121,12 +121,26 @@ jobs:
         env:
           KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
       
-      - name: Re roll the services
+      - name: Re roll app-service
         uses: actions-hub/kubectl@master
         env:
           KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
         with:
-          args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
+          args: rollout restart deployment app-service -n budibase
+
+      - name: Re roll proxy-service
+        uses: actions-hub/kubectl@master
+        env:
+          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
+        with:
+          args: rollout restart deployment proxy-service -n budibase
+
+      - name: Re roll worker-service
+        uses: actions-hub/kubectl@master
+        env:
+          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
+        with:
+          args: rollout restart deployment worker-service -n budibase
 
       - name: Discord Webhook Action
         uses: tsickert/discord-webhook@v4.0.0

From aaa7ecd2ddfedc8ad18fea967c4dfe8f61db87c0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 11:19:20 +0000
Subject: [PATCH 08/13] v1.2.44-alpha.5

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index 0851b8ebdf..5bd0ea4f60 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index dbc6c77855..0eb4a6b432 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.44-alpha.4",
+    "@budibase/types": "1.2.44-alpha.5",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index cf48dcea9a..d22cd14a6e 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.44-alpha.4",
+    "@budibase/string-templates": "1.2.44-alpha.5",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 73123146f7..03846ca99c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.4",
-    "@budibase/client": "1.2.44-alpha.4",
-    "@budibase/frontend-core": "1.2.44-alpha.4",
-    "@budibase/string-templates": "1.2.44-alpha.4",
+    "@budibase/bbui": "1.2.44-alpha.5",
+    "@budibase/client": "1.2.44-alpha.5",
+    "@budibase/frontend-core": "1.2.44-alpha.5",
+    "@budibase/string-templates": "1.2.44-alpha.5",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 23b72bf481..5be1e8655a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 13dd7c0876..e326167425 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.4",
-    "@budibase/frontend-core": "1.2.44-alpha.4",
-    "@budibase/string-templates": "1.2.44-alpha.4",
+    "@budibase/bbui": "1.2.44-alpha.5",
+    "@budibase/frontend-core": "1.2.44-alpha.5",
+    "@budibase/string-templates": "1.2.44-alpha.5",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 32c2e747dc..79da9910a3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.4",
+    "@budibase/bbui": "1.2.44-alpha.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 59309dd77c..286bc6b6f8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.44-alpha.4",
-    "@budibase/client": "1.2.44-alpha.4",
+    "@budibase/backend-core": "1.2.44-alpha.5",
+    "@budibase/client": "1.2.44-alpha.5",
     "@budibase/pro": "1.2.44-alpha.4",
-    "@budibase/string-templates": "1.2.44-alpha.4",
-    "@budibase/types": "1.2.44-alpha.4",
+    "@budibase/string-templates": "1.2.44-alpha.5",
+    "@budibase/types": "1.2.44-alpha.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 00366a924c..0b7395e2b1 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 3cd2ddf3af..6b6c737ea1 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d006ab0f7f..6c467769fb 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.4",
+  "version": "1.2.44-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.44-alpha.4",
+    "@budibase/backend-core": "1.2.44-alpha.5",
     "@budibase/pro": "1.2.44-alpha.4",
-    "@budibase/string-templates": "1.2.44-alpha.4",
-    "@budibase/types": "1.2.44-alpha.4",
+    "@budibase/string-templates": "1.2.44-alpha.5",
+    "@budibase/types": "1.2.44-alpha.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 7d16917f8d9018a6989908622a0fa1865854bcf2 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 11:22:15 +0000
Subject: [PATCH 09/13] Update pro version to 1.2.44-alpha.5

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 286bc6b6f8..6666754548 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.44-alpha.5",
     "@budibase/client": "1.2.44-alpha.5",
-    "@budibase/pro": "1.2.44-alpha.4",
+    "@budibase/pro": "1.2.44-alpha.5",
     "@budibase/string-templates": "1.2.44-alpha.5",
     "@budibase/types": "1.2.44-alpha.5",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index bca02626f1..2940bdb7da 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.4":
-  version "1.2.44-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.4.tgz#aac2e3ed75b932f265de89cd6e96a6a98524ff0a"
-  integrity sha512-xPN5ge87rg0hIcCpxmmj3/9FxMf0IBvqvA69e64knrcCpDSFaWJeXfd9O9SH5GNzwjBy4FA1NxaQz40DCXjBCw==
+"@budibase/backend-core@1.2.44-alpha.5":
+  version "1.2.44-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.5.tgz#f564ad4cc9b5e2cf080d1f5988fc6ffec44d6621"
+  integrity sha512-RPO4h+kB6c0ivVRGSoZAOrFQFLwv8qkkS7WNjToX1AZKD1umrMQrnEwi/sldjNW6ZAKFiktZAHDyWO/Mb7AP/g==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.4"
+    "@budibase/types" "1.2.44-alpha.5"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.44-alpha.4":
-  version "1.2.44-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.4.tgz#b0aee3d235be2bbccfdd6c70ed63e31e9da32c94"
-  integrity sha512-ITrhf3PDNlcCxCiDcOCAxUpQZr3oiYobyr9Vyk92JVxKdsrT6GBOpRSii+zZdhoz3ZEjRP9ZhfYMDpTuGnCKLg==
+"@budibase/pro@1.2.44-alpha.5":
+  version "1.2.44-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.5.tgz#7ae5e593eccddb749da17df0354929eaaadc4e60"
+  integrity sha512-lfHDUsD0dRHg/NE71i1zCzVal89ceWilnTHdJ0om3TdZ7qkqtsRUIE8/pz+NoqNAjZ13qG0p75Ue+NEjI24lAQ==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.4"
-    "@budibase/types" "1.2.44-alpha.4"
+    "@budibase/backend-core" "1.2.44-alpha.5"
+    "@budibase/types" "1.2.44-alpha.5"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.44-alpha.4":
-  version "1.2.44-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.4.tgz#299092f6179c02a2eebf2c88fc35a50fba779cf4"
-  integrity sha512-yK0NKUX+ggKYQ8hrjcyaFhdQq8x7QgXAbI6suns/xC8BodHox3ISAyc8HtZ4U0BtS8ONHg5t71xNXl0nueJYmA==
+"@budibase/types@1.2.44-alpha.5":
+  version "1.2.44-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.5.tgz#3de49c35291e37102b018cef4dd2f553e7121c23"
+  integrity sha512-ipOGpfUKvVnDtscujSKemTYgUMgFbmF+Sb/D5JUb58+A4vJz/F29hb5GjANv2x3Wm8BJtuG8NjhVm36rWV9kAg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6c467769fb..ebc9dd7a37 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.44-alpha.5",
-    "@budibase/pro": "1.2.44-alpha.4",
+    "@budibase/pro": "1.2.44-alpha.5",
     "@budibase/string-templates": "1.2.44-alpha.5",
     "@budibase/types": "1.2.44-alpha.5",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index eb32a496be..5e1954241d 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.4":
-  version "1.2.44-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.4.tgz#aac2e3ed75b932f265de89cd6e96a6a98524ff0a"
-  integrity sha512-xPN5ge87rg0hIcCpxmmj3/9FxMf0IBvqvA69e64knrcCpDSFaWJeXfd9O9SH5GNzwjBy4FA1NxaQz40DCXjBCw==
+"@budibase/backend-core@1.2.44-alpha.5":
+  version "1.2.44-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.5.tgz#f564ad4cc9b5e2cf080d1f5988fc6ffec44d6621"
+  integrity sha512-RPO4h+kB6c0ivVRGSoZAOrFQFLwv8qkkS7WNjToX1AZKD1umrMQrnEwi/sldjNW6ZAKFiktZAHDyWO/Mb7AP/g==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.4"
+    "@budibase/types" "1.2.44-alpha.5"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.44-alpha.4":
-  version "1.2.44-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.4.tgz#b0aee3d235be2bbccfdd6c70ed63e31e9da32c94"
-  integrity sha512-ITrhf3PDNlcCxCiDcOCAxUpQZr3oiYobyr9Vyk92JVxKdsrT6GBOpRSii+zZdhoz3ZEjRP9ZhfYMDpTuGnCKLg==
+"@budibase/pro@1.2.44-alpha.5":
+  version "1.2.44-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.5.tgz#7ae5e593eccddb749da17df0354929eaaadc4e60"
+  integrity sha512-lfHDUsD0dRHg/NE71i1zCzVal89ceWilnTHdJ0om3TdZ7qkqtsRUIE8/pz+NoqNAjZ13qG0p75Ue+NEjI24lAQ==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.4"
-    "@budibase/types" "1.2.44-alpha.4"
+    "@budibase/backend-core" "1.2.44-alpha.5"
+    "@budibase/types" "1.2.44-alpha.5"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.44-alpha.4":
-  version "1.2.44-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.4.tgz#299092f6179c02a2eebf2c88fc35a50fba779cf4"
-  integrity sha512-yK0NKUX+ggKYQ8hrjcyaFhdQq8x7QgXAbI6suns/xC8BodHox3ISAyc8HtZ4U0BtS8ONHg5t71xNXl0nueJYmA==
+"@budibase/types@1.2.44-alpha.5":
+  version "1.2.44-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.5.tgz#3de49c35291e37102b018cef4dd2f553e7121c23"
+  integrity sha512-ipOGpfUKvVnDtscujSKemTYgUMgFbmF+Sb/D5JUb58+A4vJz/F29hb5GjANv2x3Wm8BJtuG8NjhVm36rWV9kAg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From da4107b26cb9b5ed341d0ff50dd31c70870471a6 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 23 Aug 2022 15:33:04 +0100
Subject: [PATCH 10/13] Generic handle objectid

---
 packages/server/src/integrations/mongodb.ts          |  6 ++----
 packages/server/src/integrations/tests/mongo.spec.js | 10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts
index 4f2a901259..f026f36ad4 100644
--- a/packages/server/src/integrations/mongodb.ts
+++ b/packages/server/src/integrations/mongodb.ts
@@ -92,10 +92,8 @@ module MongoDBModule {
           if (json[field] instanceof Object) {
             json[field] = self.createObjectIds(json[field])
           }
-          if (
-            (field === "_id" || field?.startsWith("$")) &&
-            typeof json[field] === "string"
-          ) {
+          if (typeof json[field] === "string" && json[field].toLowerCase().startsWith("objectid"))
+          {
             const id = json[field].match(
               /(?<=objectid\(['"]).*(?=['"]\))/gi
             )?.[0]
diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js
index 9687723528..40aa6dbb58 100644
--- a/packages/server/src/integrations/tests/mongo.spec.js
+++ b/packages/server/src/integrations/tests/mongo.spec.js
@@ -103,16 +103,16 @@ describe("MongoDB Integration", () => {
     restore()
   })
 
-  it("creates ObjectIds if the _id fields contains a match on ObjectId", async () => {
+  it("creates ObjectIds if the field contains a match on ObjectId", async () => {
     const query = {
       json: {
         filter: {
           _id: "ObjectId('ACBD12345678ABCD12345678')",
-          name: "ObjectId('name')"
+          name: "ObjectId('BBBB12345678ABCD12345678')"
         },
         update: {
           _id: "ObjectId('FFFF12345678ABCD12345678')",
-          name: "ObjectId('updatedName')",
+          name: "ObjectId('CCCC12345678ABCD12345678')",
         },
         options: {
           upsert: false,
@@ -126,11 +126,11 @@ describe("MongoDB Integration", () => {
     const args = config.integration.client.updateOne.mock.calls[0]
     expect(args[0]).toEqual({
       _id: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
-      name: "ObjectId('name')",
+      name: mongo.ObjectID.createFromHexString("BBBB12345678ABCD12345678"),
     })
     expect(args[1]).toEqual({
       _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
-      name: "ObjectId('updatedName')",
+      name: mongo.ObjectID.createFromHexString("CCCC12345678ABCD12345678"),
     })
     expect(args[2]).toEqual({
       upsert: false

From e0744000a44d24c167ab4e4ab1b4dbd28f700f71 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 23 Aug 2022 15:33:30 +0100
Subject: [PATCH 11/13] lint

---
 packages/server/src/integrations/mongodb.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts
index f026f36ad4..9f1d41d2ec 100644
--- a/packages/server/src/integrations/mongodb.ts
+++ b/packages/server/src/integrations/mongodb.ts
@@ -92,8 +92,10 @@ module MongoDBModule {
           if (json[field] instanceof Object) {
             json[field] = self.createObjectIds(json[field])
           }
-          if (typeof json[field] === "string" && json[field].toLowerCase().startsWith("objectid"))
-          {
+          if (
+            typeof json[field] === "string" &&
+            json[field].toLowerCase().startsWith("objectid")
+          ) {
             const id = json[field].match(
               /(?<=objectid\(['"]).*(?=['"]\))/gi
             )?.[0]

From be481f88e0e1272e403b6f40be7df4af3aaac39f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 15:22:15 +0000
Subject: [PATCH 12/13] v1.2.44-alpha.6

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index 5bd0ea4f60..701a020419 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 0eb4a6b432..35fe29567c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.44-alpha.5",
+    "@budibase/types": "1.2.44-alpha.6",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d22cd14a6e..16a22ccb21 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.44-alpha.5",
+    "@budibase/string-templates": "1.2.44-alpha.6",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 03846ca99c..3d4a7f8417 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.5",
-    "@budibase/client": "1.2.44-alpha.5",
-    "@budibase/frontend-core": "1.2.44-alpha.5",
-    "@budibase/string-templates": "1.2.44-alpha.5",
+    "@budibase/bbui": "1.2.44-alpha.6",
+    "@budibase/client": "1.2.44-alpha.6",
+    "@budibase/frontend-core": "1.2.44-alpha.6",
+    "@budibase/string-templates": "1.2.44-alpha.6",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5be1e8655a..853c099f1e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index e326167425..3904b3e688 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.5",
-    "@budibase/frontend-core": "1.2.44-alpha.5",
-    "@budibase/string-templates": "1.2.44-alpha.5",
+    "@budibase/bbui": "1.2.44-alpha.6",
+    "@budibase/frontend-core": "1.2.44-alpha.6",
+    "@budibase/string-templates": "1.2.44-alpha.6",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 79da9910a3..864c956cd9 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.44-alpha.5",
+    "@budibase/bbui": "1.2.44-alpha.6",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 6666754548..4569182853 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.44-alpha.5",
-    "@budibase/client": "1.2.44-alpha.5",
+    "@budibase/backend-core": "1.2.44-alpha.6",
+    "@budibase/client": "1.2.44-alpha.6",
     "@budibase/pro": "1.2.44-alpha.5",
-    "@budibase/string-templates": "1.2.44-alpha.5",
-    "@budibase/types": "1.2.44-alpha.5",
+    "@budibase/string-templates": "1.2.44-alpha.6",
+    "@budibase/types": "1.2.44-alpha.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 0b7395e2b1..3cea7ff657 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 6b6c737ea1..76d04d8dff 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ebc9dd7a37..b385798b94 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.5",
+  "version": "1.2.44-alpha.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.44-alpha.5",
+    "@budibase/backend-core": "1.2.44-alpha.6",
     "@budibase/pro": "1.2.44-alpha.5",
-    "@budibase/string-templates": "1.2.44-alpha.5",
-    "@budibase/types": "1.2.44-alpha.5",
+    "@budibase/string-templates": "1.2.44-alpha.6",
+    "@budibase/types": "1.2.44-alpha.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 030f032319f27f834e607f45938e6d11947a632f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Aug 2022 15:25:52 +0000
Subject: [PATCH 13/13] Update pro version to 1.2.44-alpha.6

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 4569182853..62c39098de 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.44-alpha.6",
     "@budibase/client": "1.2.44-alpha.6",
-    "@budibase/pro": "1.2.44-alpha.5",
+    "@budibase/pro": "1.2.44-alpha.6",
     "@budibase/string-templates": "1.2.44-alpha.6",
     "@budibase/types": "1.2.44-alpha.6",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 2940bdb7da..8d66fa8e55 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.5":
-  version "1.2.44-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.5.tgz#f564ad4cc9b5e2cf080d1f5988fc6ffec44d6621"
-  integrity sha512-RPO4h+kB6c0ivVRGSoZAOrFQFLwv8qkkS7WNjToX1AZKD1umrMQrnEwi/sldjNW6ZAKFiktZAHDyWO/Mb7AP/g==
+"@budibase/backend-core@1.2.44-alpha.6":
+  version "1.2.44-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.6.tgz#902a8a0857be675f1a8aaa10538794038b168cd0"
+  integrity sha512-vZ34uO/IoIbx+dgHTT9TVoVhGjldVyJyUl8RxlfLiDee5fzpghVuotlSu6FpeOkW5ZpPOpENRriN0fvwxUkI7g==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.5"
+    "@budibase/types" "1.2.44-alpha.6"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.44-alpha.5":
-  version "1.2.44-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.5.tgz#7ae5e593eccddb749da17df0354929eaaadc4e60"
-  integrity sha512-lfHDUsD0dRHg/NE71i1zCzVal89ceWilnTHdJ0om3TdZ7qkqtsRUIE8/pz+NoqNAjZ13qG0p75Ue+NEjI24lAQ==
+"@budibase/pro@1.2.44-alpha.6":
+  version "1.2.44-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.6.tgz#40e4f61ed3510f883c8acc8681b8df8da8d20e0f"
+  integrity sha512-VatMDBQ41nnd30knd3D+4sUHQaZAEcvljPp8SWD6JV5IRrKbcSevIrmulsyq7guuy0IWgSBJbjQf2mKksnvAMw==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.5"
-    "@budibase/types" "1.2.44-alpha.5"
+    "@budibase/backend-core" "1.2.44-alpha.6"
+    "@budibase/types" "1.2.44-alpha.6"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.44-alpha.5":
-  version "1.2.44-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.5.tgz#3de49c35291e37102b018cef4dd2f553e7121c23"
-  integrity sha512-ipOGpfUKvVnDtscujSKemTYgUMgFbmF+Sb/D5JUb58+A4vJz/F29hb5GjANv2x3Wm8BJtuG8NjhVm36rWV9kAg==
+"@budibase/types@1.2.44-alpha.6":
+  version "1.2.44-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.6.tgz#c595b7c3416d8f81d0052f8c5137346375148132"
+  integrity sha512-lMDfimVOmRnDhJzExrqCEFnGpri1kmriKrw86ijI+1zIPrO4un3kAfCZBBJ0BeH12jCsi8ySJErQ1alshe92kg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b385798b94..b7026cd999 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.44-alpha.6",
-    "@budibase/pro": "1.2.44-alpha.5",
+    "@budibase/pro": "1.2.44-alpha.6",
     "@budibase/string-templates": "1.2.44-alpha.6",
     "@budibase/types": "1.2.44-alpha.6",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5e1954241d..540a41b5ed 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.44-alpha.5":
-  version "1.2.44-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.5.tgz#f564ad4cc9b5e2cf080d1f5988fc6ffec44d6621"
-  integrity sha512-RPO4h+kB6c0ivVRGSoZAOrFQFLwv8qkkS7WNjToX1AZKD1umrMQrnEwi/sldjNW6ZAKFiktZAHDyWO/Mb7AP/g==
+"@budibase/backend-core@1.2.44-alpha.6":
+  version "1.2.44-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.6.tgz#902a8a0857be675f1a8aaa10538794038b168cd0"
+  integrity sha512-vZ34uO/IoIbx+dgHTT9TVoVhGjldVyJyUl8RxlfLiDee5fzpghVuotlSu6FpeOkW5ZpPOpENRriN0fvwxUkI7g==
   dependencies:
-    "@budibase/types" "1.2.44-alpha.5"
+    "@budibase/types" "1.2.44-alpha.6"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.44-alpha.5":
-  version "1.2.44-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.5.tgz#7ae5e593eccddb749da17df0354929eaaadc4e60"
-  integrity sha512-lfHDUsD0dRHg/NE71i1zCzVal89ceWilnTHdJ0om3TdZ7qkqtsRUIE8/pz+NoqNAjZ13qG0p75Ue+NEjI24lAQ==
+"@budibase/pro@1.2.44-alpha.6":
+  version "1.2.44-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.6.tgz#40e4f61ed3510f883c8acc8681b8df8da8d20e0f"
+  integrity sha512-VatMDBQ41nnd30knd3D+4sUHQaZAEcvljPp8SWD6JV5IRrKbcSevIrmulsyq7guuy0IWgSBJbjQf2mKksnvAMw==
   dependencies:
-    "@budibase/backend-core" "1.2.44-alpha.5"
-    "@budibase/types" "1.2.44-alpha.5"
+    "@budibase/backend-core" "1.2.44-alpha.6"
+    "@budibase/types" "1.2.44-alpha.6"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.44-alpha.5":
-  version "1.2.44-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.5.tgz#3de49c35291e37102b018cef4dd2f553e7121c23"
-  integrity sha512-ipOGpfUKvVnDtscujSKemTYgUMgFbmF+Sb/D5JUb58+A4vJz/F29hb5GjANv2x3Wm8BJtuG8NjhVm36rWV9kAg==
+"@budibase/types@1.2.44-alpha.6":
+  version "1.2.44-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.6.tgz#c595b7c3416d8f81d0052f8c5137346375148132"
+  integrity sha512-lMDfimVOmRnDhJzExrqCEFnGpri1kmriKrw86ijI+1zIPrO4un3kAfCZBBJ0BeH12jCsi8ySJErQ1alshe92kg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"