Feature/fix linting

.eslintrc.js

@@ -0,0 +1,40 @@
+/*
+  This program and the accompanying materials are
+  made available under the terms of the Eclipse Public License v2.0 which accompanies
+  this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Copyright Contributors to the Zowe Project.
+*/
+
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true
+  },
+  ignorePatterns: ['.github/**/*.yml', '**/.build', '**/build', '**/dist', '**/node_modules', '**/release', '**/lib'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:import/recommended',
+    'plugin:import/typescript'
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: ['header'],
+  rules: {
+    'header/header': [
+      2,
+      'block',
+     [
+        '\n  This program and the accompanying materials are' +
+       '\n  made available under the terms of the Eclipse Public License v2.0 which accompanies' +
+       '\n  this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html' +
+       '\n  \n  SPDX-License-Identifier: EPL-2.0\n  \n  Copyright Contributors to the Zowe Project.\n'
+     ],
+      2,
+    ],
+  },
+}

.github/workflows/build-core.yml

@@ -190,5 +190,4 @@ jobs:
           pax-name: zlux-core
 
       - name: '[Prep 7] deploy'
-        uses: zowe-actions/zlux-builds/core/[email protected]/main
-
+        uses: zowe-actions/zlux-builds/core/[email protected]/main

.github/workflows/test-lint.yml

@@ -0,0 +1,26 @@
+name: Lint TypeScript
+
+on:
+  push:
+    branches:
+      - v2.x/staging
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Lint TypeScript
+        run: npm run lint

bin/init/plugins-init.js

@@ -2,20 +2,20 @@
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
   this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
-
+  
   SPDX-License-Identifier: EPL-2.0
-
+  
   Copyright Contributors to the Zowe Project.
 */
 
 import * as os from 'os';
-import * as zos from 'zos';
+//import * as zos from 'zos';
 import * as std from 'std';
-import * as xplatform from 'xplatform';
-import * as fs from '../../../../../../bin/libs/fs';
-import * as common from '../../../../../../bin/libs/common';
-import * as componentlib from '../../../../../../bin/libs/component';
-import { PathAPI as pathoid } from '../../../../../../bin/libs/pathoid';
+import type { xplatform } from 'xplatform';
+import type { fs } from '../../../../../../bin/libs/fs';
+import type { common } from '../../../../../../bin/libs/common';
+import type { componentlib } from '../../../../../../bin/libs/component';
+import type { PathAPI as pathoid } from '../../../../../../bin/libs/pathoid';
 
 common.printFormattedDebug("ZWED", "plugins-init", `Started plugins-init.js, platform=${os.platform}`);
 

lib/initInstance.js

@@ -8,17 +8,17 @@
  Copyright Contributors to the Zowe Project.
 */
 
-const fs = require('fs');
-const path = require('path');
-const argParser = require('../../zlux-server-framework/utils/argumentParser');
-const mergeUtils = require('../../zlux-server-framework/utils/mergeUtils');
-const yamlConfig = require('../../zlux-server-framework/utils/yamlConfig');
-const initUtils = require('./initUtils');
+import fs from 'fs';
+import path from 'path';
+import type { argParser } from '../../zlux-server-framework/utils/argumentParser';
+import type { mergeUtils } from '../../zlux-server-framework/utils/mergeUtils';
+import type { yamlConfig } from '../../zlux-server-framework/utils/yamlConfig';
+import type { initUtils } from './initUtils';
 //const upgradeInstance = require('./upgradeInstance');
-const os = require('os');
-const ncp = require('ncp').ncp;
-const { execSync } = require('child_process');
-const mkdirp = require('mkdirp');
+import * as os from 'os';
+import ncp from 'ncp';
+import { execSync } from 'child_process';
+import mkdirp from 'mkdirp';
 
 
 const haInstanceId = yamlConfig.getCurrentHaInstanceId();

lib/initUtils.js

@@ -8,9 +8,9 @@
  Copyright Contributors to the Zowe Project.
 */
 
-const fs = require('fs');
-const path = require('path');
-const mkdirp = require('mkdirp');
+import * as fs from 'fs';
+import * as path from 'path';
+import * as mkdirp from 'mkdirp';
 
 const ZLUX_ROOT_DIR = path.join(__dirname, '..');
 const DEFAULT_PLUGINS_DIR = path.join(ZLUX_ROOT_DIR, 'defaults', 'plugins');

lib/upgradeInstance.js

@@ -7,11 +7,11 @@
 
  Copyright Contributors to the Zowe Project.
 */
-const fs = require('fs');
-const path = require('path');
-const semver = require('semver');
-const argParser = require('zlux-server-framework/utils/argumentParser');
-const initUtils = require('./initUtils');
+import * as fs from 'fs';
+import * as path from 'path';
+import * as semver from 'semver';
+import type { argParser } from '../../zlux-server-framework/utils/argumentParser';
+import type { initUtils } from './initUtils';
 
 function logPluginFailure(pluginId) {
   console.warn('ZWED0157E - Could not register default plugin %s into app-server', pluginId);
@@ -142,10 +142,13 @@ const versions = [
             const pluginPath = path.join(toLocation, 'plugins', file);
             const pluginJson = JSON.parse(fs.readFileSync(pluginPath, 'utf8'));
             let index, componentIndex, componentsIndex, relativeIndex;
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             index = componentsIndex = pluginJson.pluginLocation.indexOf('components/app-server');
             if (index == -1) {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
               index = relativeIndex = pluginJson.pluginLocation.startsWith('../../') ? 6 : -1;
               if (index == -1 && isContainer) {
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 index = componentIndex = pluginJson.pluginLocation.startsWith('/component/share/') ? 17 : -1;
               }
             }
@@ -177,6 +180,7 @@ const versions = [
   },
   {
     v: '1.21.0',
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     upgrade: function(toLocation, serverConfig, envConfig, instanceItems) {
       if (serverConfig.agent && !serverConfig.agent.mediationLayer) {
         serverConfig.agent.mediationLayer = {
@@ -235,8 +239,10 @@ module.exports.doUpgrade = function doUpgrade(fromVersion, toLocation, serverCon
       console.log('app-server config upgraded to version='+upgradedTo);
     }
     if (configNeedsUpdate) {
+    // eslint-disable-next-line no-unsafe-finally
       return {upgradedTo, serverConfig};
     } else {
+    // eslint-disable-next-line no-unsafe-finally
       return {upgradedTo};
     }
   }

lib/zluxArgs.js

@@ -11,13 +11,13 @@
 */
 
 'use strict';
-const ProxyServer = require('zlux-server-framework');
-const argParser = require('zlux-server-framework/utils/argumentParser');
-const jsonUtils = require('zlux-server-framework/lib/jsonUtils');
-const mergeUtils = require('zlux-server-framework/utils/mergeUtils');
-const yamlConfig = require('zlux-server-framework/utils/yamlConfig');
-const mkdirp = require('mkdirp');
-const cluster = require('cluster');
+//const ProxyServer = require('zlux-server-framework');
+import type { argParser } from '../../zlux-server-framework/utils/argumentParser';
+//const jsonUtils = require('zlux-server-framework/lib/jsonUtils');
+import type { mergeUtils } from '../../zlux-server-framework/utils/mergeUtils';
+import type { yamlConfig } from '../../zlux-server-framework/utils/yamlConfig';
+//const mkdirp = require('mkdirp');
+import cluster from 'cluster';
 
 const MVD_ARGS = [
   new argParser.CLIArgument(null, 'D', argParser.constants.ARG_TYPE_JSON),
@@ -54,7 +54,8 @@ function getSafeToPrintEnvironment(env) {
 //Env overrides config JSON, -D args override env
 if(process.env.overrideFileConfig !== "false"){
   if (cluster.isMaster) {
-    const safeEnvironment = getSafeToPrintEnvironment(process.env);
+//    const safeEnvironment =
+    getSafeToPrintEnvironment(process.env);
     console.log('\nZWED5014I - Processing CLI arguments:\n'+commandArgs);
   }
   const envConfig = argParser.environmentVarsToObject("ZWED_");

lib/zluxCluster.js

@@ -10,8 +10,8 @@
 */
 'use strict';
 
-const clusterManager = require('zlux-server-framework/lib/clusterManager').clusterManager;
-const {configJSON, configLocation} = require('./zluxArgs')();
+import type { clusterManager } from '../../zlux-server-framework/lib/clusterManager';
+import { configJSON, configLocation } from './zluxArgs';
 
 clusterManager.start(configJSON, configLocation);
 

lib/zluxServer.js

@@ -1,5 +1,3 @@
-
-
 /*
   This program and the accompanying materials are
   made available under the terms of the Eclipse Public License v2.0 which accompanies
@@ -11,9 +9,9 @@
 */
 
 'use strict';
-const ProxyServer = require('zlux-server-framework');
+import type { ProxyServer } from 'zlux-server-framework';
 
-const {configJSON, configLocation} = require('./zluxArgs')();
+import { configJSON, configLocation } from './zluxArgs';
 const proxyServer = new ProxyServer(configJSON, configLocation);
 proxyServer.start().then(() => {
   console.log("ZWED5019I - Started")