Merge remote-tracking branch 'origin/next' into rm-v1-profile-writes

Signed-off-by: Gene Johnston <[email protected]>

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

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.0.0-next.202403131702",
+  "version": "8.0.0-next.202403132009",
   "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": "^9.0.8",
-    "@zowe/imperative": "8.0.0-next.202403131702"
+    "@zowe/imperative": "8.0.0-next.202403132009"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0-next"

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-next.202403131702",
+  "version": "8.0.0-next.202403132009",
   "command": {
     "publish": {
       "ignoreChanges": [

packages/cli/CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to the Zowe CLI package will be documented in this file.
 
 - Enhancement: Changed references in command output from 'Team Configuration' to 'Zowe client configuration' [#2019](https://github.com/zowe/zowe-cli/issues/2019).
 
+## `8.0.0-next.202403132009`
+
+- Enhancement: Prompt for user/password on SSH commands when a token is stored in the config. [#2081](https://github.com/zowe/zowe-cli/pull/2081)
+
 ## `8.0.0-next.202403131702`
 
 - BugFix: Removing stack trace for zosjobs errors. [#2078](https://github.com/zowe/zowe-cli/pull/2078)

packages/cli/__tests__/zosuss/__integration__/issue/cli.zos-uss.issue.ssh.integration.test.ts

@@ -45,5 +45,4 @@ describe("zos-uss issue ssh command", () => {
         expect(response.stderr.toString()).toContain('Command entered: "zos-uss issue ss"');
         expect(response.stderr.toString()).toContain('Use "zowe --help" to view groups, commands, and options.');
     });
-
 });

packages/cli/__tests__/zosuss/__system__/issue/cli.issue.ssh.system.test.ts

@@ -272,4 +272,16 @@ describe("zowe uss issue ssh passwords and passkeys", () => {
             [command, "--ssh-p", invalidPrivateKey]);
         expect(response.stderr.toString()).toMatch("no such file or directory, open 'bogusKey'");
     });
+
+    it("should fail command execution without trace when improper user credentials", async () => {
+        // create a temporary zowe profile with an invalid user
+        const user = "bogusUser";
+        const invalidCreds = await TempTestProfiles.createV2Profile(TEST_ENVIRONMENT, "ssh",
+            { host, port, user, password });
+
+        const command = "echo test";
+        const response = await runCliScript(__dirname + "/__scripts__/issue_ssh_no_cwd.sh", TEST_ENVIRONMENT,
+            [command, "--ssh-p", invalidCreds]);
+        expect(response.stderr.toString()).toMatch("All configured authentication methods failed");
+    });
 });