chore: upgrade tasks to node 20

Signed-off-by: lstocchi <[email protected]>

Author: lstocchi

.eslintrc

@@ -60,6 +60,7 @@
       "guard-for-in": 2,
       "import/no-unresolved": ["error"],
       "import/no-duplicates": ["error"],
+      "import/first": "off",
       "import/prefer-default-export": 0,
       "max-nested-callbacks": [1, 4],
       "max-classes-per-file": [0],

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '16', '14', '10' ]
+        node: [ '20', '16' ]
     name: Node ${{ matrix.node }}
 
     steps:
@@ -39,7 +39,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '10.x'
+          node-version: '20.x'
       - run: npm run setup
       - run: npm install
       - run: npm run build
@@ -53,7 +53,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '10.x'
+          node-version: '20.x'
       - run: npm run setup
       - run: npm install
       - run: npm run build

package-lock.json

@@ -19,15 +19,15 @@
     "docs": "markserv .",
     "pretest": "npm run compile",
     "watch": "tsc -watch -p ./",
-    "lint": "node_modules/.bin/eslint . --ext .ts --quiet",
+    "lint": "npx eslint . --ext .ts --quiet",
     "test": "ts-mocha -p tsconfig.json test/*.test.ts --timeout 5000 ${MOCHA_TAG}",
     "test:report": "npm run test -- --reporter mocha-simple-html-reporter --reporter-options output=out/test-report.html",
     "test:report:ci": "npm run test -- --reporter mocha-junit-reporter --reporter-options mochaFile=out/test-report.xml",
     "prettier:base": "prettier --parser typescript --single-quote",
     "prettier:check": "npm run prettier:base -- --list-different \"src/*.ts\" \"test/*.ts\"",
     "prettier:write": "npm run prettier:base -- --write \"**/**/*.ts\"",
     "copy-node-modules": "for i in `ls tasks` ; do copy-node-modules . tasks/$i; done",
-    "copy-utils-file": "cp src/oc-utils.json out/src/",
+    "copy-utils-file": "npx shx mkdir -p out/src && cp src/oc-utils.json out/src/",
     "copy-task-utils": "for i in `ls tasks` ; do cp -r src/oc-utils.json tasks/$i/lib/; done",
     "copy-task-lib": "for i in `ls tasks` ; do cp -r out/src/. tasks/$i/lib/; done",
     "bump-task-version": "for i in `ls tasks` ; do TASK=$(cat tasks/$i/task.json | json -e 'this.version.Patch++'); echo \"$TASK\" > tasks/$i/task.json; done",
@@ -57,32 +57,32 @@
   },
   "homepage": "https://github.com/redhat-developer/openshift-vsts#readme",
   "dependencies": {
-    "@types/q": "^1.5.1",
-    "@types/valid-url": "^1.0.2",
-    "adm-zip": "^0.4.13",
-    "argv-split": "^2.0.1",
-    "azure-pipelines-task-lib": "^3.1.7",
-    "azure-pipelines-tool-lib": "^1.3.2",
+    "@types/q": "^1.5.8",
+    "@types/valid-url": "^1.0.7",
+    "adm-zip": "^0.5.16",
+    "argv-split": "^3.2.1",
+    "azure-pipelines-task-lib": "^5.0.0",
+    "azure-pipelines-tool-lib": "^2.0.8",
     "decompress": "^4.2.1",
     "decompress-tar": "^4.1.1",
     "decompress-targz": "^4.1.1",
-    "del-cli": "^5.0.0",
-    "node-fetch": "^2.6.7",
+    "del-cli": "^6.0.0",
+    "node-fetch": "^3.3.2",
     "q": "^1.5.1",
-    "semver": "^7.1.3",
+    "semver": "^7.7.1",
     "substituter": "^1.3.0",
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "@types/chai": "^4.1.6",
-    "@types/glob": "^7.1.1",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.12.7",
-    "@types/sinon": "^7.0.13",
-    "@types/uuid": "^8.3.0",
+    "@types/glob": "^8.1.0",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^20.3.1",
+    "@types/sinon": "^17.0.3",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
-    "chai": "^4.2.0",
+    "chai": "4.5.0",
     "chai-fs": "^2.0.0",
     "commit-message-validator": "^0.1.6",
     "copy-node-modules": "^1.0.4",
@@ -91,19 +91,20 @@
     "eslint-config-prettier": "^6.7.0",
     "eslint-import-resolver-typescript": "^2.0.0",
     "eslint-plugin-header": "^3.0.0",
-    "eslint-plugin-import": "2.18.2",
+    "eslint-plugin-import": "2.22.1",
     "eslint-plugin-json": "^2.0.1",
     "eslint-plugin-prettier": "^3.1.1",
     "istanbul": "^0.4.5",
-    "mocha": "^6.0",
+    "mocha": "^7.0",
     "mocha-jenkins-reporter": "^0.4.8",
-    "mocha-junit-reporter": "^1.18.0",
-    "mocha-simple-html-reporter": "^1.1.0",
-    "prettier": "^1.14.3",
+    "mocha-junit-reporter": "^2.2.1",
+    "mocha-simple-html-reporter": "^2.0.0",
+    "prettier": "^3.5.1",
     "remap-istanbul": "^0.13.0",
-    "sinon": "^7.4.2",
-    "ts-mocha": "^6.0",
-    "ts-node": "^7.0.1",
-    "typescript": "^4.0.2"
+    "shx": "^0.3.4",
+    "sinon": "^19.0.2",
+    "ts-mocha": "^10.1.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.3"
   }
 }

package.json

@@ -2,13 +2,12 @@
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
-import { RunnerHandler } from './oc-exec';
-import { InstallHandler } from './oc-install';
-import * as auth from './oc-auth';
-import { ConfigMap } from './config-map';
-import { BinaryVersion, convertStringToBinaryVersion, FindBinaryStatus, getAgentOsName, getReason } from './utils/exec_helper';
-
 import task = require('azure-pipelines-task-lib/task');
+import { RunnerHandler } from './oc-exec.ts';
+import { InstallHandler } from './oc-install.ts';
+import * as auth from './oc-auth.ts';
+import { ConfigMap } from './config-map.ts';
+import { BinaryVersion, convertStringToBinaryVersion, FindBinaryStatus, getAgentOsName, getReason } from './utils/exec_helper.ts';
 
 async function run(): Promise<void> {
   const version = task.getInput('version');

src/config-map-task.ts

@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 import * as fs from 'fs';
-import { RunnerHandler } from './oc-exec';
+import path = require('path');
+
+import task = require('azure-pipelines-task-lib/task');
+import tl = require('azure-pipelines-task-lib/task');
 import {
   BASIC_AUTHENTICATION,
   NO_AUTHENTICATION,
   TOKEN_AUTHENTICATION,
   RUNTIME_CONFIGURATION_OPTION,
-} from './constants';
-
-import task = require('azure-pipelines-task-lib/task');
-import tl = require('azure-pipelines-task-lib/task');
-import path = require('path');
+} from './constants.ts';
+import { RunnerHandler } from './oc-exec.ts';
 
 export interface OpenShiftEndpoint {
   /** URL to the OpenShiftServer */

src/oc-auth.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 import { IExecSyncResult } from 'azure-pipelines-task-lib/toolrunner';
-import { ConditionStatus } from './utils/exec_helper';
-import { RunnerHandler } from './oc-exec';
+import { ConditionStatus } from './utils/exec_helper.ts';
+import { RunnerHandler } from './oc-exec.ts';
 
 export class ConditionHandler {
 
@@ -68,10 +68,6 @@ export class ConditionHandler {
         return status;
     }
 
-    static async sleep(ms: number):Promise<NodeJS.Timeout> {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-
     static getConditionCommandListener(resource: string): string {
         return `get ${resource} -o name --watch=true`;
     }

src/oc-condition.ts

@@ -2,13 +2,12 @@
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
-import { RunnerHandler } from './oc-exec';
-import { InstallHandler } from './oc-install';
-import * as auth from './oc-auth';
-import { BinaryVersion, convertStringToBinaryVersion, FindBinaryStatus, getReason, ConditionStatus, isFailed, isTimedOut, getAgentOsName } from './utils/exec_helper';
-import { ConditionHandler } from './oc-condition';
-
 import task = require('azure-pipelines-task-lib/task');
+import { RunnerHandler } from './oc-exec.ts';
+import { InstallHandler } from './oc-install.ts';
+import * as auth from './oc-auth.ts';
+import { BinaryVersion, convertStringToBinaryVersion, FindBinaryStatus, getReason, ConditionStatus, isFailed, isTimedOut, getAgentOsName } from './utils/exec_helper.ts';
+import { ConditionHandler } from './oc-condition.ts';
 
 async function run(): Promise<void> {
   const version = task.getInput('version');

src/oc-conditional-exec-task.ts

@@ -2,12 +2,11 @@
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
-import { RunnerHandler } from './oc-exec';
-import { InstallHandler } from './oc-install';
-import * as auth from './oc-auth';
-import { BinaryVersion, convertStringToBinaryVersion, FindBinaryStatus, getAgentOsName, getReason } from './utils/exec_helper';
-
 import task = require('azure-pipelines-task-lib/task');
+import { RunnerHandler } from './oc-exec.ts';
+import { InstallHandler } from './oc-install.ts';
+import * as auth from './oc-auth.ts';
+import { BinaryVersion, convertStringToBinaryVersion, FindBinaryStatus, getAgentOsName, getReason } from './utils/exec_helper.ts';
 
 async function run(): Promise<void> {
   const version = task.getInput('version');

src/oc-exec-task.ts

@@ -6,14 +6,12 @@ import * as fs from 'fs';
 import { ToolRunner, IExecSyncResult } from 'azure-pipelines-task-lib/toolrunner';
 import * as toolLib from 'azure-pipelines-tool-lib/tool';
 import * as semver from 'semver';
-import { RunnerHandler } from './oc-exec';
-import { LINUXV3, MACOSXV3, WINV3, LINUXV4, MACOSXV4, WINV4, OC_TAR_GZ, OC_ZIP, LATEST, ZIP, TAR_GZ } from './constants';
-import { unzipArchive } from './utils/zip_helper';
-import { BinaryVersion, FindBinaryStatus } from './utils/exec_helper';
-
 import tl = require('azure-pipelines-task-lib/task');
 import path = require('path');
-import fetch = require('node-fetch');
+import { RunnerHandler } from './oc-exec.ts';
+import { LINUXV3, MACOSXV3, WINV3, LINUXV4, MACOSXV4, WINV4, OC_TAR_GZ, OC_ZIP, LATEST, ZIP, TAR_GZ } from './constants.ts';
+import { unzipArchive } from './utils/zip_helper.ts';
+import { BinaryVersion, FindBinaryStatus } from './utils/exec_helper.ts';
 
 export class InstallHandler {
   /**
@@ -268,6 +266,7 @@ export class InstallHandler {
     let url = InstallHandler.ocBundleURL(version.value, osType, false);
     let findURLofLatest = !url;
     if (url) {
+      const { default: fetch } = await import('node-fetch'); // Dynamic import
       // check if url is valid otherwise take the latest stable oc cli for this version
       const response = await fetch(url, { method: 'HEAD' });
       findURLofLatest = !response.ok;