From e81f3ce947d4fc06228c146c5241ea12e507ec7d Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Mon, 26 Sep 2022 19:04:03 +0200 Subject: [PATCH] Fix review points, update getLatestVersion() --- dist/index.js | 9 ++++----- src/installer.ts | 10 ++++------ src/utils.ts | 2 -- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dist/index.js b/dist/index.js index fad4fbd..9e6f7b4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -250,14 +250,13 @@ class DotnetVersionResolver { const response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl); const result = response.result || {}; let releasesInfo = result['releases-index']; - releasesInfo = releasesInfo.filter((info) => { - const sdkParts = info['channel-version'].split('.'); - return versionParts[0] == sdkParts[0]; + let releaseInfo = releasesInfo.find(info => { + let sdkParts = info['channel-version'].split('.'); + return sdkParts[0] === versionParts[0]; }); - if (releasesInfo.length === 0) { + if (!releaseInfo) { throw new Error(`Could not find info for version ${versionParts.join('.')} at ${DotnetVersionResolver.DotNetCoreIndexUrl}`); } - const releaseInfo = releasesInfo[0]; return releaseInfo['channel-version']; }); } diff --git a/src/installer.ts b/src/installer.ts index 646b1ca..24bab1b 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -88,12 +88,12 @@ export class DotnetVersionResolver { const result = response.result || {}; let releasesInfo: any[] = result['releases-index']; - releasesInfo = releasesInfo.filter((info: any) => { - const sdkParts: string[] = info['channel-version'].split('.'); - return versionParts[0] == sdkParts[0]; + let releaseInfo = releasesInfo.find(info => { + let sdkParts: string[] = info['channel-version'].split('.'); + return sdkParts[0] === versionParts[0]; }); - if (releasesInfo.length === 0) { + if (!releaseInfo) { throw new Error( `Could not find info for version ${versionParts.join('.')} at ${ DotnetVersionResolver.DotNetCoreIndexUrl @@ -101,8 +101,6 @@ export class DotnetVersionResolver { ); } - const releaseInfo = releasesInfo[0]; - return releaseInfo['channel-version']; } diff --git a/src/utils.ts b/src/utils.ts index ce86a34..77886ce 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,2 @@ -import * as core from '@actions/core'; - export const IS_WINDOWS = process.platform === 'win32'; export const IS_LINUX = process.platform === 'linux';