From e4319ffe2979be71ccff6f2c139aa62c96783c1c Mon Sep 17 00:00:00 2001 From: Jyotsna Date: Mon, 23 Nov 2020 15:58:31 +0530 Subject: [PATCH] JSON structure fixes --- lib/utilities/utility.js | 6 +----- src/utilities/utility.ts | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/utilities/utility.js b/lib/utilities/utility.js index 9f3d3819..fb62602f 100644 --- a/lib/utilities/utility.js +++ b/lib/utilities/utility.js @@ -148,11 +148,7 @@ function getFilePathsConfigs() { const DOCKERFILE_PATH_LABEL_KEY = 'dockerfile-path'; let inputManifestFiles = inputParams.manifests || []; filePathsConfig[MANIFEST_PATHS_KEY] = inputManifestFiles; - let helmChartPaths = []; - if (process.env.HELM_CHART_PATHS) { - helmChartPaths = process.env.HELM_CHART_PATHS.split('\n'); - helmChartPaths.splice(-1); - } + let helmChartPaths = process.env.HELM_CHART_PATHS && process.env.HELM_CHART_PATHS.split('\n').splice(-1) || []; filePathsConfig[HELM_CHART_KEY] = helmChartPaths; //Fetch labels from each image let imageNames = core.getInput('images').split('\n'); diff --git a/src/utilities/utility.ts b/src/utilities/utility.ts index c255af6e..7723251d 100644 --- a/src/utilities/utility.ts +++ b/src/utilities/utility.ts @@ -141,12 +141,7 @@ export async function getFilePathsConfigs(): Promise { let inputManifestFiles = inputParams.manifests || []; filePathsConfig[MANIFEST_PATHS_KEY] = inputManifestFiles; - let helmChartPaths = []; - if(process.env.HELM_CHART_PATHS){ - helmChartPaths = process.env.HELM_CHART_PATHS.split('\n'); - helmChartPaths.splice(-1); - } - + let helmChartPaths = process.env.HELM_CHART_PATHS && process.env.HELM_CHART_PATHS.split('\n').splice(-1) || []; filePathsConfig[HELM_CHART_KEY] = helmChartPaths; //Fetch labels from each image