improve code for verify tools

Author: sudhirverma

build/verify-tools.ts

@@ -1,22 +1,22 @@
+/* eslint-disable no-console */
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable guard-for-in */
+/* eslint-disable no-restricted-syntax */
 /*-----------------------------------------------------------------------------------------------
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
-/* eslint-disable no-console */
 
-// import { CancellationToken } from 'vscode';
 import { exec } from 'child_process';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
 import { existsSync } from 'fs-extra';
 import { fromFile } from 'hasha';
 import { sync } from 'mkdirp';
+import { exit } from 'shelljs';
 import configData = require('../src/cli/cli-config.json');
 import { DownloadUtil } from '../src/util/download';
-// import { Config } from '../src/cli/cli-config';
-// import loadJSON from '../src/util/parse';
-
-// const configData = '../src/cli/cli-config.json';
 
 async function downloadFileAndCreateSha256(
   targetFolder: string,
@@ -29,7 +29,6 @@ async function downloadFileAndCreateSha256(
   }
   const currentFile = join(targetFolder, fileName);
   console.log(`${currentFile} download started from ${reqURL}`);
-  // const token: CancellationToken = null;
   await DownloadUtil.downloadFile(reqURL, currentFile, (current) => console.log(`${current}%`));
   const currentSHA256 = await fromFile(currentFile, { algorithm: 'sha256' });
   if (currentSHA256 === sha256sum) {
@@ -39,13 +38,12 @@ async function downloadFileAndCreateSha256(
   }
 }
 
-function verifyTools(): void {
-  Object.keys(configData).forEach((key) => {
+async function verifyTools(): Promise<void> {
+  for (const key in configData) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    Object.keys(configData[key].platform).forEach((OS) => {
+    for (const OS in configData[key].platform) {
       const targetFolder = resolve(tmpdir(), OS);
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      downloadFileAndCreateSha256(
+      await downloadFileAndCreateSha256(
         targetFolder,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         configData[key].platform[OS].dlFileName,
@@ -54,37 +52,27 @@ function verifyTools(): void {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         configData[key].platform[OS].sha256sum,
       );
-    });
-  });
+    }
+  }
 }
-// function verifyTools(): void {
-//   loadJSON<KnConfig>(configData).then((data: KnConfig): void => {
-//     Object.keys(data).forEach((key) => {
-//       Object.keys(data[key].platform).forEach((OS) => {
-//         const targetFolder = resolve(tmpdir(), OS);
-//         downloadFileAndCreateSha256(
-//           targetFolder,
-//           data[key].platform[OS].dlFileName,
-//           data[key].platform[OS].url,
-//           data[key].platform[OS].sha256sum,
-//         );
-//       });
-//     });
-//   });
-// }
 
 const fileCheckRegex = /\w*cli-config.json/;
 
-exec('git diff --name-only origin/main -- .', (error, stdout) => {
+exec('git diff --name-only origin/main -- .', async (error, stdout) => {
   if (error) {
     throw error;
   }
   console.log('The changed files:');
   console.log(stdout);
   if (fileCheckRegex.test(stdout)) {
-    console.log('cli-config.json is changed, starting download verification');
-    verifyTools();
+    console.log('tools.json is changed, starting download verification');
+    try {
+      await verifyTools();
+    } catch (err) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      exit(1);
+    }
   } else {
-    console.log('cli-config.json is not changed, skipping download verification');
+    console.log('tools.json is not changed, skipping download verification');
   }
 });

test/ui-test/extensionUITest.ts

@@ -24,7 +24,7 @@ import { cleanUpNotifications, findNotification, safeNotificationExists } from '
 function execShellCommand(cmd) {
   // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require
   const { exec } = require('child_process');
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     exec(cmd, (error, stdout, stderr) => {
       resolve(stdout || stderr);
     });