Final touch-ups

Signed-off-by: Andrew W. Harn <[email protected]>
zowe · Feb 22, 2024 · 347bd79 · 347bd79
1 parent 7cb6aff
commit 347bd79
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 472 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -4,13 +4,13 @@ All notable changes to the Zowe CLI package will be documented in this file.
 
 ## Recent Changes
 
-- BugFix: Updated additional dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated additional dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402211923`
 
 - Enhancement: Added new `zowe zos-jobs search job` command, which allows the user to search spool files for a specified string or regular expresion.
-- BugFix: Updated dependencies for technical currency [#2057](https://github.com/zowe/zowe-cli/pull/2057)
+- BugFix: Updated dependencies for technical currency. [#2057](https://github.com/zowe/zowe-cli/pull/2057)
 
 ## `8.0.0-next.202402132108`
 

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -4,12 +4,12 @@ All notable changes to the Zowe core SDK package will be documented in this file
 
 ## Recent Changes
 
-- BugFix: Updated additional dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated additional dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402211923`
 
-- BugFix: Updated dependencies for technical currency [#2057](https://github.com/zowe/zowe-cli/pull/2057)
+- BugFix: Updated dependencies for technical currency. [#2057](https://github.com/zowe/zowe-cli/pull/2057)
 
 ## `8.0.0-next.202401191954`
 

diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md
@@ -4,16 +4,16 @@ All notable changes to the Imperative package will be documented in this file.
 
 ## Recent Changes
 
-- BugFix: Updated additional dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated additional dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402221834`
 
 - Enhancement: Added multiple APIs to the `ProfileInfo` class to help manage schemas between client applications. [#2012](https://github.com/zowe/zowe-cli/issues/2012)
 
 ## `8.0.0-next.202402211923`
 
-- BugFix: Updated dependencies for technical currency [#2057](https://github.com/zowe/zowe-cli/pull/2057)
+- BugFix: Updated dependencies for technical currency. [#2057](https://github.com/zowe/zowe-cli/pull/2057)
 
 ## `8.0.0-next.202402132108`
 

diff --git a/packages/imperative/src/imperative/src/plugins/utilities/npm-interface/uninstall.ts b/packages/imperative/src/imperative/src/plugins/utilities/npm-interface/uninstall.ts
@@ -62,7 +62,7 @@ export const updateAndGetRemovedTypes = (npmPackage: string): string[] => {
     }
 
     return typesToRemove;
-}
+};
 
 /**
  * @TODO - allow multiple packages to be uninstalled?

diff --git a/packages/imperative/src/utilities/src/CliUtils.ts b/packages/imperative/src/utilities/src/CliUtils.ts
@@ -20,6 +20,7 @@ import { CommandProfiles, ICommandOptionDefinition, ICommandPositionalDefinition
 import { ICommandArguments } from "../../cmd/src/doc/args/ICommandArguments";
 import { IProfile } from "../../profiles";
 import { IPromptOptions } from "../../cmd/src/doc/response/api/handler/IPromptOptions";
+import { read } from "read";
 
 /**
  * Cli Utils contains a set of static methods/helpers that are CLI related (forming options, censoring args, etc.)
@@ -484,24 +485,30 @@ export class CliUtils {
             secToWait = maxSecToWait;
         }
 
-        const { read } = require("read");
-        return read({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: true,
-            prompt: message,
-            silent: opts?.hideText,
-            replace: opts?.maskChar,
-            timeout: secToWait ? (secToWait * 1000) : null  // eslint-disable-line @typescript-eslint/no-magic-numbers
-        }).catch((err: any) => {
+        let response: string;
+        try {
+            response = await read({
+                input: process.stdin,
+                output: process.stdout,
+                terminal: true,
+                prompt: message,
+                silent: opts?.hideText,
+                replace: opts?.maskChar,
+                timeout: secToWait ? (secToWait * 1000) : null  // eslint-disable-line @typescript-eslint/no-magic-numbers
+            });
+            if (opts?.hideText) {
+                process.stdout.write("\r\n");
+            }
+        } catch (err) {
             if (err.message === "canceled") {
                 process.exit(2);
             } else if (err.message === "timed out") {
-                return "";
+                return null;
             } else {
                 throw err;
             }
-        });
+        }
+        return response;
     }
 
     /**

diff --git a/packages/provisioning/CHANGELOG.md b/packages/provisioning/CHANGELOG.md
@@ -4,12 +4,12 @@ All notable changes to the Zowe provisioning SDK package will be documented in t
 
 ## Recent Changes
 
-- BugFix: Updated additional dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated additional dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402211923`
 
-- BugFix: Updated dependencies for technical currency [#2057](https://github.com/zowe/zowe-cli/pull/2057)
+- BugFix: Updated dependencies for technical currency. [#2057](https://github.com/zowe/zowe-cli/pull/2057)
 
 ## `8.0.0-next.202311282012`
 

diff --git a/packages/secrets/CHANGELOG.md b/packages/secrets/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to the Zowe Secrets SDK package will be documented in this f
 
 ## `8.0.0-next.202402211923`
 
-- BugFix: Updated dependencies for technical currency
+- BugFix: Updated dependencies for technical currency. [#2057](https://github.com/zowe/zowe-cli/pull/2057)
 
 ## `8.0.0-next.202311132045`
 

diff --git a/packages/workflows/CHANGELOG.md b/packages/workflows/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OS workflows SDK package will be documented in
 
 ## Recent Changes
 
-- BugFix: Updated dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202311132045`
 

diff --git a/packages/zosconsole/CHANGELOG.md b/packages/zosconsole/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OS console SDK package will be documented in t
 
 ## Recent Changes
 
-- BugFix: Updated dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202311132045`
 

diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md
@@ -4,12 +4,12 @@ All notable changes to the Zowe z/OS files SDK package will be documented in thi
 
 ## Recent Changes
 
-- BugFix: Updated additional dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated additional dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402211923`
 
-- BugFix: Updated dependencies for technical currency [#2057](https://github.com/zowe/zowe-cli/pull/2057)
+- BugFix: Updated dependencies for technical currency. [#2057](https://github.com/zowe/zowe-cli/pull/2057)
 
 ## `8.0.0-next.202402132108`
 

diff --git a/packages/zosjobs/CHANGELOG.md b/packages/zosjobs/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OS jobs SDK package will be documented in this
 
 ## Recent Changes
 
-- BugFix: Updated dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402211923`
 

diff --git a/packages/zoslogs/CHANGELOG.md b/packages/zoslogs/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OS logs SDK package will be documented in this
 
 ## Recent Changes
 
-- BugFix: Updated dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202311132045`
 

diff --git a/packages/zosmf/CHANGELOG.md b/packages/zosmf/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OSMF SDK package will be documented in this fi
 
 ## Recent Changes
 
-- BugFix: Updated dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402021649`
 

diff --git a/packages/zostso/CHANGELOG.md b/packages/zostso/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OS TSO SDK package will be documented in this
 
 ## Recent Changes
 
-- BugFix: Updated dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402021649`
 

diff --git a/packages/zosuss/CHANGELOG.md b/packages/zosuss/CHANGELOG.md
@@ -4,8 +4,8 @@ All notable changes to the Zowe z/OS USS SDK package will be documented in this
 
 ## Recent Changes
 
-- BugFix: Updated additional dependencies for technical currency [#2061](https://github.com/zowe/zowe-cli/pull/2061)
-- BugFix: Updated engine to Node 16.7.0 [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated additional dependencies for technical currency. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
+- BugFix: Updated engine to Node 16.7.0. [#2061](https://github.com/zowe/zowe-cli/pull/2061)
 
 ## `8.0.0-next.202402211923`