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

Merge branch 'feature/environment-variables' of github.com:Budibase/budibase into feature/environment-variables

This commit is contained in:
Peter Clement 2023-01-19 15:54:40 +00:00
parent 6adee798c1 eae7b529a7
commit 5ed038406a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/server/src/sdk/app/datasources/datasources.ts
View File

@ -7,6 +7,7 @@ import {
PASSWORD_REPLACEMENT,
} from "@budibase/types"
import { cloneDeep } from "lodash/fp"
import { env } from "process"
import { getEnvironmentVariables } from "../../utils"
async function enrichDatasourceWithValues(datasource: Datasource) {
@ -40,7 +41,13 @@ export async function get(
export async function getWithEnvVars(datasourceId: string) {
const appDb = context.getAppDB()
const datasource = await appDb.get(datasourceId)
return enrichDatasourceWithValues(datasource)
const blocks = findHBSBlocks(JSON.stringify(datasource))
const usesEnvVars = blocks.find(block => block.includes("env.")) != null
if (usesEnvVars) {
return enrichDatasourceWithValues(datasource)
} else {
throw new Error("Environment variables binding format incorrect")
}
}
export function removeSecrets(