diff --git a/lib/run.js b/lib/run.js index bf4f17f..9953953 100644 --- a/lib/run.js +++ b/lib/run.js @@ -1,5 +1,6 @@ "use strict"; // Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -137,14 +138,14 @@ function getLatestHelmVersionFor(type) { const token = core.getInput('token', { 'required': true }); try { const { repository } = yield graphql_1.graphql(`{ - repository(name:"helm", owner:"helm") { - releases(last: 100) { - nodes { - tagName - } - } - } - }`, { + repository(name: "helm", owner: "helm") { + releases(last: 100) { + nodes { + tagName + } + } + } + }`, { headers: { authorization: `token ${token}` } @@ -185,20 +186,20 @@ function findHelm(rootFolder) { function run() { return __awaiter(this, void 0, void 0, function* () { let version = core.getInput('version', { 'required': true }); - if (process.env['NEW_VERSION_LOGIC'] == 'true') { - if (version.toLocaleLowerCase() === 'latest' || version === LATEST_HELM3_VERSION) { - version = yield getLatestHelmVersionFor("v3"); - } - else if (version === LATEST_HELM2_VERSION) { - version = yield getLatestHelmVersionFor("v2"); + if (process.env['HELM_INSTALLER_LEGACY_VERSIONING'] == 'true') { + if (version.toLocaleLowerCase() === 'latest') { + version = yield getStableHelmVersion(); } else if (!version.toLocaleLowerCase().startsWith('v')) { version = 'v' + version; } } else { - if (version.toLocaleLowerCase() === 'latest') { - version = yield getStableHelmVersion(); + if (version.toLocaleLowerCase() === 'latest' || version === LATEST_HELM3_VERSION) { + version = yield getLatestHelmVersionFor("v3"); + } + else if (version === LATEST_HELM2_VERSION) { + version = yield getLatestHelmVersionFor("v2"); } else if (!version.toLocaleLowerCase().startsWith('v')) { version = 'v' + version; diff --git a/src/run.ts b/src/run.ts index 8626295..c689085 100644 --- a/src/run.ts +++ b/src/run.ts @@ -113,14 +113,14 @@ async function getLatestHelmVersionFor(type: string): Promise { try { const { repository } = await graphql( `{ - repository(name:"helm", owner:"helm") { - releases(last: 100) { - nodes { - tagName - } - } - } - }`, + repository(name: "helm", owner: "helm") { + releases(last: 100) { + nodes { + tagName + } + } + } + }`, { headers: { authorization: `token ${token}` @@ -166,17 +166,17 @@ function findHelm(rootFolder: string): string { async function run() { let version = core.getInput('version', { 'required': true }); - if (process.env['NEW_VERSION_LOGIC'] == 'true') { - if (version.toLocaleLowerCase() === 'latest' || version === LATEST_HELM3_VERSION) { - version = await getLatestHelmVersionFor("v3"); - } else if (version === LATEST_HELM2_VERSION) { - version = await getLatestHelmVersionFor("v2"); + if (process.env['HELM_INSTALLER_LEGACY_VERSIONING'] == 'true') { + if (version.toLocaleLowerCase() === 'latest') { + version = await getStableHelmVersion(); } else if (!version.toLocaleLowerCase().startsWith('v')) { version = 'v' + version; } } else { - if (version.toLocaleLowerCase() === 'latest') { - version = await getStableHelmVersion(); + if (version.toLocaleLowerCase() === 'latest' || version === LATEST_HELM3_VERSION) { + version = await getLatestHelmVersionFor("v3"); + } else if (version === LATEST_HELM2_VERSION) { + version = await getLatestHelmVersionFor("v2"); } else if (!version.toLocaleLowerCase().startsWith('v')) { version = 'v' + version; }