Merge pull request #882 from akhilmhdh/feat/integration-var-not-found

fix(integration): instead of throwing error console and return empty string on interpolation
This commit is contained in:
Maidul Islam
2023-08-21 13:51:16 -04:00
committed by GitHub
+6 -5
View File
@@ -11,7 +11,7 @@ import {
IServiceTokenData, IServiceTokenData,
Secret, Secret,
SecretBlindIndexData, SecretBlindIndexData,
ServiceTokenData, ServiceTokenData
} from "../models"; } from "../models";
import { EventType, SecretVersion } from "../ee/models"; import { EventType, SecretVersion } from "../ee/models";
import { import {
@@ -464,7 +464,7 @@ export const createSecretHelper = async ({
const postHogClient = await TelemetryService.getPostHogClient(); const postHogClient = await TelemetryService.getPostHogClient();
if (postHogClient && (metadata?.source !== "signup")) { if (postHogClient && metadata?.source !== "signup") {
postHogClient.capture({ postHogClient.capture({
event: "secrets added", event: "secrets added",
distinctId: await TelemetryService.getDistinctId({ distinctId: await TelemetryService.getDistinctId({
@@ -659,7 +659,7 @@ export const getSecretHelper = async ({
ipAddress: authData.ipAddress ipAddress: authData.ipAddress
})); }));
await EEAuditLogService.createAuditLog( await EEAuditLogService.createAuditLog(
authData, authData,
{ {
type: EventType.GET_SECRET, type: EventType.GET_SECRET,
@@ -825,7 +825,7 @@ export const updateSecretHelper = async ({
ipAddress: authData.ipAddress ipAddress: authData.ipAddress
})); }));
await EEAuditLogService.createAuditLog( await EEAuditLogService.createAuditLog(
authData, authData,
{ {
type: EventType.UPDATE_SECRET, type: EventType.UPDATE_SECRET,
@@ -1088,7 +1088,8 @@ const recursivelyExpandSecret = async (
let interpolatedValue = interpolatedSec[key]; let interpolatedValue = interpolatedSec[key];
if (!interpolatedValue) { if (!interpolatedValue) {
throw new Error(`Couldn't find referenced value - ${key}`); console.error(`Couldn't find referenced value - ${key}`);
return "";
} }
const refs = interpolatedValue.match(INTERPOLATION_SYNTAX_REG); const refs = interpolatedValue.match(INTERPOLATION_SYNTAX_REG);