Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: variable replacements

Browse Source
This commit is contained in:
Andras Bacsai 2022-11-09 13:50:11 +01:00
parent 4955157e13
commit 68895ba4a5
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/api/src/routes/api/v1/services/handlers.ts
View File

@ -149,9 +149,11 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
} }
} }
parsedTemplate[realKey] = { parsedTemplate[realKey] = {
value,
name, name,
documentation: value.documentation || foundTemplate.documentation || 'https://docs.coollabs.io', documentation: value.documentation || foundTemplate.documentation || 'https://docs.coollabs.io',
image: value.image, image: value.image,
files: value?.files,
environment: [], environment: [],
fqdns: [], fqdns: [],
proxy: {} proxy: {}
@ -208,7 +210,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
strParsedTemplate = strParsedTemplate.replaceAll('$$id', service.id) strParsedTemplate = strParsedTemplate.replaceAll('$$id', service.id)
strParsedTemplate = strParsedTemplate.replaceAll('$$core_version', service.version || foundTemplate.defaultVersion) strParsedTemplate = strParsedTemplate.replaceAll('$$core_version', service.version || foundTemplate.defaultVersion)
// replace $$fqdn // replace $$workdir
if (workdir) { if (workdir) {
strParsedTemplate = strParsedTemplate.replaceAll('$$workdir', workdir) strParsedTemplate = strParsedTemplate.replaceAll('$$workdir', workdir)
} }
@ -217,15 +219,15 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
if (service.serviceSetting.length > 0) { if (service.serviceSetting.length > 0) {
for (const setting of service.serviceSetting) { for (const setting of service.serviceSetting) {
const { value, variableName } = setting const { value, variableName } = setting
const regex = new RegExp(`\\$\\$config_${variableName.replace('$$config_', '')}\\"`, 'gi') const regex = new RegExp(`\\$\\$config_${variableName.replace('$$config_', '')}`, 'gi')
if (value === '$$generate_fqdn') { if (value === '$$generate_fqdn') {
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn + "\"" || '' + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn || '')
} else if (value === '$$generate_domain') { } else if (value === '$$generate_domain') {
strParsedTemplate = strParsedTemplate.replaceAll(regex, getDomain(service.fqdn) + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, getDomain(service.fqdn))
} else if (service.destinationDocker?.network && value === '$$generate_network') { } else if (service.destinationDocker?.network && value === '$$generate_network') {
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.destinationDocker.network + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, service.destinationDocker.network)
} else { } else {
strParsedTemplate = strParsedTemplate.replaceAll(regex, value + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, value)
} }
} }
} }
@ -233,15 +235,13 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
// replace $$secret // replace $$secret
if (service.serviceSecret.length > 0) { if (service.serviceSecret.length > 0) {
for (const secret of service.serviceSecret) { for (const secret of service.serviceSecret) {
const { name, value } = secret let { name, value } = secret
const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}\\"`, 'gi') name = name.toLowerCase()
const regex = new RegExp(`\\$\\$secret_${name}\\"`, 'gi') const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}`, 'gi')
const regex = new RegExp(`\\$\\$secret_${name}`, 'gi')
if (value) { if (value) {
strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10) + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10))
strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\"") + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\""))
} else {
strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, "\"")
strParsedTemplate = strParsedTemplate.replaceAll(regex, "\"")
} }
} }
} }