mirror of
https://github.com/Azure/setup-helm.git
synced 2025-07-16 10:50:38 +00:00
Updating files as per latest changes in master after resolving merge conflicts
This commit is contained in:
19
lib/run.js
19
lib/run.js
@ -31,7 +31,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
Object.defineProperty(exports, "__esModule", { value: true });
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
exports.getStableHelmVersion = void 0;
|
exports.run = exports.findHelm = exports.downloadHelm = exports.walkSync = exports.getStableHelmVersion = exports.getHelmDownloadURL = exports.getExecutableExtension = void 0;
|
||||||
const os = __importStar(require("os"));
|
const os = __importStar(require("os"));
|
||||||
const path = __importStar(require("path"));
|
const path = __importStar(require("path"));
|
||||||
const util = __importStar(require("util"));
|
const util = __importStar(require("util"));
|
||||||
@ -53,6 +53,7 @@ function getExecutableExtension() {
|
|||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
exports.getExecutableExtension = getExecutableExtension;
|
||||||
function getHelmDownloadURL(version) {
|
function getHelmDownloadURL(version) {
|
||||||
switch (os.type()) {
|
switch (os.type()) {
|
||||||
case 'Linux':
|
case 'Linux':
|
||||||
@ -64,6 +65,7 @@ function getHelmDownloadURL(version) {
|
|||||||
return util.format('https://get.helm.sh/helm-%s-windows-amd64.zip', version);
|
return util.format('https://get.helm.sh/helm-%s-windows-amd64.zip', version);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
exports.getHelmDownloadURL = getHelmDownloadURL;
|
||||||
function getStableHelmVersion() {
|
function getStableHelmVersion() {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
@ -91,12 +93,12 @@ function getStableHelmVersion() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
exports.getStableHelmVersion = getStableHelmVersion;
|
exports.getStableHelmVersion = getStableHelmVersion;
|
||||||
var walkSync = function (dir, filelist, fileToFind) {
|
exports.walkSync = function (dir, filelist, fileToFind) {
|
||||||
var files = fs.readdirSync(dir);
|
var files = fs.readdirSync(dir);
|
||||||
filelist = filelist || [];
|
filelist = filelist || [];
|
||||||
files.forEach(function (file) {
|
files.forEach(function (file) {
|
||||||
if (fs.statSync(path.join(dir, file)).isDirectory()) {
|
if (fs.statSync(path.join(dir, file)).isDirectory()) {
|
||||||
filelist = walkSync(path.join(dir, file), filelist, fileToFind);
|
filelist = exports.walkSync(path.join(dir, file), filelist, fileToFind);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
core.debug(file);
|
core.debug(file);
|
||||||
@ -110,7 +112,7 @@ var walkSync = function (dir, filelist, fileToFind) {
|
|||||||
function downloadHelm(version) {
|
function downloadHelm(version) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
if (!version) {
|
if (!version) {
|
||||||
version = yield getLatestHelmVersionFor("v3");
|
version = yield getStableHelmVersion();
|
||||||
}
|
}
|
||||||
let cachedToolpath = toolCache.find(helmToolName, version);
|
let cachedToolpath = toolCache.find(helmToolName, version);
|
||||||
if (!cachedToolpath) {
|
if (!cachedToolpath) {
|
||||||
@ -133,6 +135,7 @@ function downloadHelm(version) {
|
|||||||
return helmpath;
|
return helmpath;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
exports.downloadHelm = downloadHelm;
|
||||||
function getLatestHelmVersionFor(type) {
|
function getLatestHelmVersionFor(type) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const token = core.getInput('token', { 'required': true });
|
const token = core.getInput('token', { 'required': true });
|
||||||
@ -175,14 +178,15 @@ function isValidVersion(version, type) {
|
|||||||
function findHelm(rootFolder) {
|
function findHelm(rootFolder) {
|
||||||
fs.chmodSync(rootFolder, '777');
|
fs.chmodSync(rootFolder, '777');
|
||||||
var filelist = [];
|
var filelist = [];
|
||||||
walkSync(rootFolder, filelist, helmToolName + getExecutableExtension());
|
exports.walkSync(rootFolder, filelist, helmToolName + getExecutableExtension());
|
||||||
if (!filelist) {
|
if (!filelist || filelist.length == 0) {
|
||||||
throw new Error(util.format("Helm executable not found in path ", rootFolder));
|
throw new Error(util.format("Helm executable not found in path", rootFolder));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return filelist[0];
|
return filelist[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
exports.findHelm = findHelm;
|
||||||
function run() {
|
function run() {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
let version = core.getInput('version', { 'required': true });
|
let version = core.getInput('version', { 'required': true });
|
||||||
@ -219,4 +223,5 @@ function run() {
|
|||||||
core.setOutput('helm-path', cachedPath);
|
core.setOutput('helm-path', cachedPath);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
exports.run = run;
|
||||||
run().catch(core.setFailed);
|
run().catch(core.setFailed);
|
||||||
|
6108
package-lock.json
generated
6108
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
18
src/run.ts
18
src/run.ts
@ -20,14 +20,14 @@ const LATEST_HELM2_VERSION = '2.*';
|
|||||||
const LATEST_HELM3_VERSION = '3.*';
|
const LATEST_HELM3_VERSION = '3.*';
|
||||||
const helmAllReleasesUrl = 'https://api.github.com/repos/helm/helm/releases';
|
const helmAllReleasesUrl = 'https://api.github.com/repos/helm/helm/releases';
|
||||||
|
|
||||||
function getExecutableExtension(): string {
|
export function getExecutableExtension(): string {
|
||||||
if (os.type().match(/^Win/)) {
|
if (os.type().match(/^Win/)) {
|
||||||
return '.exe';
|
return '.exe';
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
function getHelmDownloadURL(version: string): string {
|
export function getHelmDownloadURL(version: string): string {
|
||||||
switch (os.type()) {
|
switch (os.type()) {
|
||||||
case 'Linux':
|
case 'Linux':
|
||||||
return util.format('https://get.helm.sh/helm-%s-linux-amd64.zip', version);
|
return util.format('https://get.helm.sh/helm-%s-linux-amd64.zip', version);
|
||||||
@ -66,7 +66,7 @@ export async function getStableHelmVersion(): Promise<string> {
|
|||||||
return stableHelmVersion;
|
return stableHelmVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
var walkSync = function (dir, filelist, fileToFind) {
|
export var walkSync = function (dir, filelist, fileToFind) {
|
||||||
var files = fs.readdirSync(dir);
|
var files = fs.readdirSync(dir);
|
||||||
filelist = filelist || [];
|
filelist = filelist || [];
|
||||||
files.forEach(function (file) {
|
files.forEach(function (file) {
|
||||||
@ -83,8 +83,8 @@ var walkSync = function (dir, filelist, fileToFind) {
|
|||||||
return filelist;
|
return filelist;
|
||||||
};
|
};
|
||||||
|
|
||||||
async function downloadHelm(version: string): Promise<string> {
|
export async function downloadHelm(version: string): Promise<string> {
|
||||||
if (!version) { version = await getLatestHelmVersionFor("v3"); }
|
if (!version) { version = await getStableHelmVersion(); }
|
||||||
let cachedToolpath = toolCache.find(helmToolName, version);
|
let cachedToolpath = toolCache.find(helmToolName, version);
|
||||||
if (!cachedToolpath) {
|
if (!cachedToolpath) {
|
||||||
let helmDownloadPath;
|
let helmDownloadPath;
|
||||||
@ -151,19 +151,19 @@ function isValidVersion(version: string, type: string): boolean {
|
|||||||
return version.indexOf('rc') == -1;
|
return version.indexOf('rc') == -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
function findHelm(rootFolder: string): string {
|
export function findHelm(rootFolder: string): string {
|
||||||
fs.chmodSync(rootFolder, '777');
|
fs.chmodSync(rootFolder, '777');
|
||||||
var filelist: string[] = [];
|
var filelist: string[] = [];
|
||||||
walkSync(rootFolder, filelist, helmToolName + getExecutableExtension());
|
walkSync(rootFolder, filelist, helmToolName + getExecutableExtension());
|
||||||
if (!filelist) {
|
if (!filelist || filelist.length == 0) {
|
||||||
throw new Error(util.format("Helm executable not found in path ", rootFolder));
|
throw new Error(util.format("Helm executable not found in path", rootFolder));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return filelist[0];
|
return filelist[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function run() {
|
export async function run() {
|
||||||
let version = core.getInput('version', { 'required': true });
|
let version = core.getInput('version', { 'required': true });
|
||||||
|
|
||||||
if (process.env['HELM_INSTALLER_LEGACY_VERSIONING'] == 'true') {
|
if (process.env['HELM_INSTALLER_LEGACY_VERSIONING'] == 'true') {
|
||||||
|
Reference in New Issue
Block a user