From 6349b0888830b02b9e41224eb0befffdc2b48c1b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 24 Jan 2023 18:56:19 +0000 Subject: [PATCH] Don't check whether or not a datasource uses env vars when the function specifically includes the env vars, always fetch them so that they can be returned and put into context for queries to use. --- packages/server/src/sdk/app/datasources/datasources.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index 302b340600..ed18e43928 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -43,14 +43,7 @@ export async function get( export async function getWithEnvVars(datasourceId: string) { const appDb = context.getAppDB() const datasource = await appDb.get(datasourceId) - const blocks = findHBSBlocks(JSON.stringify(datasource)) - const usesEnvVars = - blocks.find(block => block.includes(ENV_VAR_PREFIX)) != null - if (usesEnvVars) { - return enrichDatasourceWithValues(datasource) - } else { - return datasource - } + return enrichDatasourceWithValues(datasource) } export function isValid(datasource: Datasource) {