Merge branch 'master' of https://github.com/zowe/zowe-cli into error-…

…msg-help-version

Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com>

.eslintrc.js

@@ -25,6 +25,7 @@ module.exports = {
             ],
             "rules": {
                 "@typescript-eslint/no-magic-numbers": "off",
+                "@typescript-eslint/no-restricted-imports": "off",
                 "jest/expect-expect": ["warn", {
                     "assertFunctionNames": ["expect*", "**.*expect*"]
                 }],
@@ -64,6 +65,11 @@ module.exports = {
             "ignoreEnums": true,
             "ignoreReadonlyClassProperties": true
         }],
+        "@typescript-eslint/no-restricted-imports": ["error", {
+            "patterns": [{
+                "group": ["**/../lib", "**/../src"]
+            }]
+        }],
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-var-requires": "off",
         "@typescript-eslint/semi": "warn",

.github/workflows/sonar.yml

@@ -21,7 +21,8 @@ jobs:
     - name: Configure Sonar Scan
       uses: zowe-actions/octorelease/script@v1
       env:
-        COVERAGE_ARTIFACT: "ubuntu-latest-18.x-results:__tests__/__results__"
+        COVERAGE_ARTIFACT: "ubuntu-22.04-20.x-results:__tests__/__results__"
+        # COVERAGE_ARTIFACT: "ubuntu-latest-20.x-results:__tests__/__results__"
       with:
         script: sonarConfig
 

__tests__/__packages__/cli-test-utils/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI test utils package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Improved the error message shown on MacOS when `runCliScript` method fails to run script that is missing shebang line. [#2314](https://github.com/zowe/zowe-cli/pull/2314)
+
 ## `8.1.1`
 
 - BugFix: Updated peer dependencies to `^8.0.0`, dropping support for versions tagged `next`. [#2287](https://github.com/zowe/zowe-cli/pull/2287)

__tests__/__packages__/cli-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.2.0",
+  "version": "8.7.0",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^10.0.0",
-    "@zowe/imperative": "8.2.0"
+    "@zowe/imperative": "8.7.0"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0"

__tests__/__packages__/cli-test-utils/src/TestUtils.ts

@@ -10,6 +10,7 @@
 */
 
 import * as fs from "fs";
+import * as path from "path";
 import { spawnSync, SpawnSyncReturns, ExecFileException } from "child_process";
 import { ITestEnvironment } from "./environment/doc/response/ITestEnvironment";
 import { ICommandDefinition, IHandlerParameters } from "@zowe/imperative";
@@ -55,12 +56,16 @@ export function runCliScript(scriptPath: string, testEnvironment: ITestEnvironme
         } catch {
             fs.chmodSync(scriptPath, "755");
         }
-        return spawnSync(scriptPath, args, {
+        const response = spawnSync(scriptPath, args, {
             cwd: testEnvironment.workingDir,
             env: childEnv,
             encoding: "buffer"
         });
+        if (process.platform === "darwin" && (response.error as ExecFileException)?.errno === -8) {
+            throw new Error(`The script file ${path.basename(scriptPath)} failed to execute. Check that it starts with a shebang line.`);
+        }
 
+        return response;
     } else {
         throw new Error(`The script file ${scriptPath} doesn't exist`);
 
@@ -121,7 +126,9 @@ export function mockHandlerParameters(params: PartialHandlerParameters): IHandle
             },
             progress: {
                 startBar: jest.fn((parms) => undefined),
-                endBar: jest.fn(() => undefined)
+                endBar: jest.fn(() => undefined),
+                startSpinner: jest.fn(() => undefined),
+                endSpinner: jest.fn(() => undefined)
             },
             format: {
                 output: jest.fn((parms) => {

__tests__/__resources__/properties/default_properties.yaml

@@ -104,6 +104,8 @@ zosjobs:
   modifiedJobclass: B
   # System affinity
   sysaff: zosjobs-sysaff
+  # CIM Support
+  skipCIM: false
 #-----------------------------------------------------------------------------#
 #  Set of properties for testing provisioning                                 #
 #-----------------------------------------------------------------------------#

__tests__/__src__/properties/ITestZosJobsSchema.ts

@@ -16,4 +16,5 @@ export interface ITestZosJobsSchema {
     jobclass: string;
     modifiedJobclass: string;
     sysaff: string;
+    skipCIM?: boolean;
 }

jest.config.js

@@ -133,14 +133,11 @@ module.exports = {
     ...projectConfig,
     "reporters": [
         "default",
+        "jest-stare",
         ["jest-junit", {
             "outputDirectory": "__tests__/__results__",
             "reportTestSuiteErrors": true
         }],
-        ["jest-stare", {
-            "coverageLink": "../unit/coverage/lcov-report/index.html",
-            "resultDir": "__tests__/__results__/jest-stare"
-        }],
         ["github-actions", { "silent": false } ]
     ],
     "testResultsProcessor": "jest-sonar-reporter",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.3.0",
+  "version": "8.7.0",
   "command": {
     "publish": {
       "ignoreChanges": [