From 79597ea0e56c844f1787ca3dcea86c2f4cdea081 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 10 Jan 2023 09:57:01 +0100 Subject: [PATCH] fix: parsing secrets --- apps/api/src/routes/api/v1/services/handlers.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts index 32333afc5..f090689b1 100644 --- a/apps/api/src/routes/api/v1/services/handlers.ts +++ b/apps/api/src/routes/api/v1/services/handlers.ts @@ -263,14 +263,15 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin for (const secret of service.serviceSecret) { let { name, value } = secret name = name.toLowerCase() - const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}\"`, 'gi') - const regex = new RegExp(`\\$\\$secret_${name}\"`, 'gi') + const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}`, 'gi') + const regex = new RegExp(`\\$\\$secret_${name}`, 'gi') + console.log({value, name, regex, regexHashed}) if (value) { - strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10) + '"') - strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\"") + '"') + strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10)) + strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\"")) } else { - strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, '' + '"') - strParsedTemplate = strParsedTemplate.replaceAll(regex, '' + '"') + strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, '') + strParsedTemplate = strParsedTemplate.replaceAll(regex, '') } } }