Update next with master

README.md

@@ -52,6 +52,16 @@ Versioning conventions for Zowe CLI and Plug-ins| [Versioning Guidelines](./docs
 ## **Building Zowe CLI From Source**
 Zowe CLI requires NPM version 8 and Cargo version 1.72.0 (or newer) to build from source. Before proceeding, check your NPM version with `npm --version` and if it's older than 8.x, update with `npm install -g npm`. To check your version of Cargo, run `cargo --version`. Cargo can be installed using rustup: [https://rustup.rs/](https://rustup.rs/). To update Cargo, run the `rustup update` command.
 
+For developers using Linux, the following packages are required to build Zowe CLI from source:
+
+- Debian/Ubuntu: 
+  - `sudo apt install build-essential libsecret-1-dev`
+- Red Hat-based:
+  - `sudo dnf group install "Development Tools"`
+  - `sudo dnf install libsecret-devel`
+- Arch Linux: 
+  - `sudo pacman -S base-devel libsecret`
+
 The first time that you download Zowe CLI from the GitHub repository, issue the following command to install the required Zowe CLI dependencies and several development tools:
 
 ```

packages/cli/CHANGELOG.md

@@ -2,18 +2,10 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
-## `8.0.0-next.202401081937`
-
-- BugFix: Fixed typo in command help for `zowe zos-workflows create` commands.
-
 ## `8.0.0-next.202401031939`
 
 - Enhancement: Revised help text for consistency [#1756](https://github.com/zowe/zowe-cli/issues/1756)
 
-## `8.0.0-next.202401022112`
-
-- BugFix: Add missing npm-shrinkwrap
-
 ## `8.0.0-next.202311291643`
 
 - LTS Breaking: Replaced the `ZOWE_EDITOR` environment variable with `ZOWE_OPT_EDITOR` and `--editor` option on commands [#1867](https://github.com/zowe/zowe-cli/issues/1867)
@@ -31,6 +23,24 @@ All notable changes to the Zowe CLI package will be documented in this file.
 
 - Major: First major version bump for V3
 
+## `7.22.0`
+
+- Enhancement: Hid the progress bar if `CI` environment variable is set, or if `FORCE_COLOR` environment variable is set to `0`. [#1845](https://github.com/zowe/zowe-cli/issues/1845)
+
+## `7.21.2`
+
+- BugFix: Correct extra character being displayed at the end of lines when issuing `zowe files compare` on Windows. [#1992](https://github.com/zowe/zowe-cli/issues/1992)
+- BugFix: Correct the online help description for `zowe files compare uss`. [#1754](https://github.com/zowe/zowe-cli/issues/1754)
+- BugFix: Fixed typo in command help for `zowe zos-workflows create` commands.
+
+## `7.20.1`
+
+- BugFix: Add missing npm-shrinkwrap
+
+## `7.20.0`
+
+- Deprecated: `getDataSet` in the `zosfiles` command group utility functions, use `zosfiles` SDK's `ZosFilesUtils.getDataSetFromName` instead. [#1696](https://github.com/zowe/zowe-cli/issues/1696)
+
 ## `7.18.10`
 
 - BugFix: Added missing z/OSMF connection options to the z/OS Logs command group.

packages/cli/__tests__/auth/__integration__/__snapshots__/cli.auth.apiml.integration.test.ts.snap

@@ -61,7 +61,10 @@ exports[`auth login/logout apiml help should display the login help 1`] = `
 
    --cert-file (local file path)
 
-      The file path to a certificate file to use for authentication
+      The file path to a certificate file to use for authentication.
+
+      Note: The CLI does not support certificate files that require a password. For
+      more information, search Troubleshooting PEM Certificates in Zowe Docs.
 
    --cert-key-file (local file path)
 
@@ -110,9 +113,9 @@ exports[`auth login/logout apiml help should display the login help 1`] = `
   \\"success\\": true,
   \\"exitCode\\": 0,
   \\"message\\": \\"The help was constructed for command: apiml.\\",
-  \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n   apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n   Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n   token.\\\\n\\\\n   The token provides authentication to services that support the API ML SSO\\\\n   (Single Sign-On) capability. When you log in, the token is stored in your\\\\n   default base profile until it expires. Base profiles store connection\\\\n   information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n   not supply connection information in a service profile. To take advantage of the\\\\n   API ML SSO capability, you should omit username and password in service profiles\\\\n   so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n   zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n   --show-token | --st (boolean)\\\\n\\\\n      Show the token when login is successful. If specified, does not save the token\\\\n      to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n   --host | -H (string)\\\\n\\\\n      Host name of service on the mainframe.\\\\n\\\\n   --port | -P (number)\\\\n\\\\n      Port number of service on the mainframe.\\\\n\\\\n   --user | -u (string)\\\\n\\\\n      User name to authenticate to service on the mainframe.\\\\n\\\\n   --password | --pass | --pw (string)\\\\n\\\\n      Password to authenticate to service on the mainframe.\\\\n\\\\n   --reject-unauthorized | --ru (boolean)\\\\n\\\\n      Reject self-signed certificates.\\\\n\\\\n      Default value: true\\\\n\\\\n   --cert-file (local file path)\\\\n\\\\n      The file path to a certificate file to use for authentication\\\\n\\\\n   --cert-key-file (local file path)\\\\n\\\\n      The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n   --base-profile | --base-p (string)\\\\n\\\\n      The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n   --show-inputs-only (boolean)\\\\n\\\\n      Show command inputs and do not run the command\\\\n\\\\n   --response-format-json | --rfj (boolean)\\\\n\\\\n      Produce JSON formatted data from a command\\\\n\\\\n   --help | -h (boolean)\\\\n\\\\n      Display help text\\\\n\\\\n   --help-web | --hw (boolean)\\\\n\\\\n      Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n   - Log in to an API ML instance to obtain or update the token\\\\n   stored in your base profile:\\\\n\\\\n      $ zowe auth login apiml\\\\n\\\\n   - Log in to an API ML instance to obtain a token without\\\\n   storing it in a profile:\\\\n\\\\n      $ zowe auth login apiml --show-token\\\\n\\\\n\\",
+  \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n   apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n   Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n   token.\\\\n\\\\n   The token provides authentication to services that support the API ML SSO\\\\n   (Single Sign-On) capability. When you log in, the token is stored in your\\\\n   default base profile until it expires. Base profiles store connection\\\\n   information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n   not supply connection information in a service profile. To take advantage of the\\\\n   API ML SSO capability, you should omit username and password in service profiles\\\\n   so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n   zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n   --show-token | --st (boolean)\\\\n\\\\n      Show the token when login is successful. If specified, does not save the token\\\\n      to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n   --host | -H (string)\\\\n\\\\n      Host name of service on the mainframe.\\\\n\\\\n   --port | -P (number)\\\\n\\\\n      Port number of service on the mainframe.\\\\n\\\\n   --user | -u (string)\\\\n\\\\n      User name to authenticate to service on the mainframe.\\\\n\\\\n   --password | --pass | --pw (string)\\\\n\\\\n      Password to authenticate to service on the mainframe.\\\\n\\\\n   --reject-unauthorized | --ru (boolean)\\\\n\\\\n      Reject self-signed certificates.\\\\n\\\\n      Default value: true\\\\n\\\\n   --cert-file (local file path)\\\\n\\\\n      The file path to a certificate file to use for authentication.\\\\n\\\\n      Note: The CLI does not support certificate files that require a password. For\\\\n      more information, search Troubleshooting PEM Certificates in Zowe Docs.\\\\n\\\\n   --cert-key-file (local file path)\\\\n\\\\n      The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n   --base-profile | --base-p (string)\\\\n\\\\n      The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n   --show-inputs-only (boolean)\\\\n\\\\n      Show command inputs and do not run the command\\\\n\\\\n   --response-format-json | --rfj (boolean)\\\\n\\\\n      Produce JSON formatted data from a command\\\\n\\\\n   --help | -h (boolean)\\\\n\\\\n      Display help text\\\\n\\\\n   --help-web | --hw (boolean)\\\\n\\\\n      Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n   - Log in to an API ML instance to obtain or update the token\\\\n   stored in your base profile:\\\\n\\\\n      $ zowe auth login apiml\\\\n\\\\n   - Log in to an API ML instance to obtain a token without\\\\n   storing it in a profile:\\\\n\\\\n      $ zowe auth login apiml --show-token\\\\n\\\\n\\",
   \\"stderr\\": \\"\\",
-  \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n   apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n   Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n   token.\\\\n\\\\n   The token provides authentication to services that support the API ML SSO\\\\n   (Single Sign-On) capability. When you log in, the token is stored in your\\\\n   default base profile until it expires. Base profiles store connection\\\\n   information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n   not supply connection information in a service profile. To take advantage of the\\\\n   API ML SSO capability, you should omit username and password in service profiles\\\\n   so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n   zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n   --show-token | --st (boolean)\\\\n\\\\n      Show the token when login is successful. If specified, does not save the token\\\\n      to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n   --host | -H (string)\\\\n\\\\n      Host name of service on the mainframe.\\\\n\\\\n   --port | -P (number)\\\\n\\\\n      Port number of service on the mainframe.\\\\n\\\\n   --user | -u (string)\\\\n\\\\n      User name to authenticate to service on the mainframe.\\\\n\\\\n   --password | --pass | --pw (string)\\\\n\\\\n      Password to authenticate to service on the mainframe.\\\\n\\\\n   --reject-unauthorized | --ru (boolean)\\\\n\\\\n      Reject self-signed certificates.\\\\n\\\\n      Default value: true\\\\n\\\\n   --cert-file (local file path)\\\\n\\\\n      The file path to a certificate file to use for authentication\\\\n\\\\n   --cert-key-file (local file path)\\\\n\\\\n      The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n   --base-profile | --base-p (string)\\\\n\\\\n      The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n   --show-inputs-only (boolean)\\\\n\\\\n      Show command inputs and do not run the command\\\\n\\\\n   --response-format-json | --rfj (boolean)\\\\n\\\\n      Produce JSON formatted data from a command\\\\n\\\\n   --help | -h (boolean)\\\\n\\\\n      Display help text\\\\n\\\\n   --help-web | --hw (boolean)\\\\n\\\\n      Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n   - Log in to an API ML instance to obtain or update the token\\\\n   stored in your base profile:\\\\n\\\\n      $ zowe auth login apiml\\\\n\\\\n   - Log in to an API ML instance to obtain a token without\\\\n   storing it in a profile:\\\\n\\\\n      $ zowe auth login apiml --show-token\\\\n\\\\n\\"
+  \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n   apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n   Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n   token.\\\\n\\\\n   The token provides authentication to services that support the API ML SSO\\\\n   (Single Sign-On) capability. When you log in, the token is stored in your\\\\n   default base profile until it expires. Base profiles store connection\\\\n   information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n   not supply connection information in a service profile. To take advantage of the\\\\n   API ML SSO capability, you should omit username and password in service profiles\\\\n   so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n   zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n   --show-token | --st (boolean)\\\\n\\\\n      Show the token when login is successful. If specified, does not save the token\\\\n      to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n   --host | -H (string)\\\\n\\\\n      Host name of service on the mainframe.\\\\n\\\\n   --port | -P (number)\\\\n\\\\n      Port number of service on the mainframe.\\\\n\\\\n   --user | -u (string)\\\\n\\\\n      User name to authenticate to service on the mainframe.\\\\n\\\\n   --password | --pass | --pw (string)\\\\n\\\\n      Password to authenticate to service on the mainframe.\\\\n\\\\n   --reject-unauthorized | --ru (boolean)\\\\n\\\\n      Reject self-signed certificates.\\\\n\\\\n      Default value: true\\\\n\\\\n   --cert-file (local file path)\\\\n\\\\n      The file path to a certificate file to use for authentication.\\\\n\\\\n      Note: The CLI does not support certificate files that require a password. For\\\\n      more information, search Troubleshooting PEM Certificates in Zowe Docs.\\\\n\\\\n   --cert-key-file (local file path)\\\\n\\\\n      The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n   --base-profile | --base-p (string)\\\\n\\\\n      The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n   --show-inputs-only (boolean)\\\\n\\\\n      Show command inputs and do not run the command\\\\n\\\\n   --response-format-json | --rfj (boolean)\\\\n\\\\n      Produce JSON formatted data from a command\\\\n\\\\n   --help | -h (boolean)\\\\n\\\\n      Display help text\\\\n\\\\n   --help-web | --hw (boolean)\\\\n\\\\n      Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n   - Log in to an API ML instance to obtain or update the token\\\\n   stored in your base profile:\\\\n\\\\n      $ zowe auth login apiml\\\\n\\\\n   - Log in to an API ML instance to obtain a token without\\\\n   storing it in a profile:\\\\n\\\\n      $ zowe auth login apiml --show-token\\\\n\\\\n\\"
 }"
 `;
 

packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts

@@ -178,6 +178,38 @@ describe("Compare data set handler", () => {
             expect(getDiffStringSpy).toHaveBeenCalledWith("compared", "compared", options);
         });
 
+        it("should compare two data sets containing carriage returns in terminal with --seqnum specified", async () => {
+            const processArgCopy: any = {
+                ...processArguments,
+                arguments:{
+                    ...processArguments.arguments,
+                    seqnum: false,
+                }
+            };
+
+            //overwrite ds(strings 1 & 2) to include seqnums to chop off in LocalFileDatasetHandler
+            getDataSetSpy.mockImplementation(jest.fn(async (session) => {
+                fakeSession = session;
+                return Buffer.from("compared12345678\r\n");
+            }));
+
+            try {
+                // Invoke the handler with a full set of mocked arguments and response functions
+                await handler.process(processArgCopy);
+            } catch (e) {
+                error = e;
+            }
+
+            expect(error).toBeUndefined();
+            expect(getDataSetSpy).toHaveBeenCalledTimes(2);
+            expect(getDiffStringSpy).toHaveBeenCalledTimes(1);
+            expect(apiMessage).toEqual("");
+            expect(logMessage).toEqual("compared string");
+            expect(getDataSetSpy).toHaveBeenCalledWith(fakeSession as any, dataSetName1, { task: dsTask });
+            expect(jsonObj).toMatchObject({commandResponse: "compared string", success: true});
+            expect(getDiffStringSpy).toHaveBeenCalledWith("compared\n", "compared\n", options);
+        });
+
         it("should compare two data sets in browser", async () => {
             openDiffInbrowserSpy.mockImplementation(jest.fn());
             processArguments.arguments.browserView = true ;