From 4cbc68892ef53d4c280de2a9af2952ac701cc388 Mon Sep 17 00:00:00 2001 From: Ben Morrow Date: Mon, 15 Jul 2024 10:24:15 +0100 Subject: [PATCH] Fix a variable conflict I can't have both the global and deployment configs called `config`. Call the deployment config `spec`. --- acs-edge-sync/lib/deployments.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/acs-edge-sync/lib/deployments.js b/acs-edge-sync/lib/deployments.js index 294ff27b..28327a66 100644 --- a/acs-edge-sync/lib/deployments.js +++ b/acs-edge-sync/lib/deployments.js @@ -154,8 +154,8 @@ export class Deployments { * deployed. */ const lookup = list => rx.from(list).pipe( rx.mergeMap(agent => cdb.get_config(Deployments, agent) - .then(config => ({ uuid: agent, config }))), - rx.mergeMap(deployment => rx.from(deployment.config.charts).pipe( + .then(spec => ({ uuid: agent, spec }))), + rx.mergeMap(deployment => rx.from(deployment.spec.charts).pipe( rx.mergeMap(ch => cdb.get_config(HelmChart, ch)), /* XXX We could cache (against an etag) to avoid * recompiling every time... */ @@ -186,13 +186,13 @@ export class Deployments { create_manifests ({ config, deployments }) { return imm.List(deployments) .map(deployment => { - const { uuid, config } = deployment; + const { uuid, spec } = deployment; const chart = deployment.chart({ uuid, - name: config.name, - hostname: config.hostname, + name: spec.name, + hostname: spec.hostname, }); - const values = [this.values, chart.values, config.values] + const values = [this.values, chart.values, spec.values] .map(v => v ?? {}).reduce(jmp.merge); return config.template({ uuid, values,