Merge remote-tracking branch 'origin/next' into system-test-cleanup

__tests__/__integration__/__snapshots__/imperative.secure.integration.test.ts.snap

@@ -1,6 +1,113 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Imperative Secure Tests imperative-test-cli config profiles should list profiles 1`] = `
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config import failure scenarios should fail to import if location is not specified 1`] = `
+"
+Syntax Error:
+Missing Positional Argument: location
+Argument Description: File path or URL to import from.
+
+Example:
+
+ - Import config from local file on disk:
+
+      $ imperative-test-cli config import ~/Downloads/zowe.config.json
+
+Use \\"imperative-test-cli config import --help\\" to view command description, usage, and options.
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config list should list the configuration 1`] = `
+"profiles: 
+  secured: 
+    type:       secured
+    properties: 
+      info: 
+    secure: 
+      (empty array)
+  project_base: 
+    type:       base
+    properties: 
+    secure: 
+      - secret
+  global_base: 
+    type:       base
+    properties: 
+    secure: 
+      - secret
+defaults: 
+  secured: secured
+  base:    project_base
+autoStore: true
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config list should list the configuration without showing secure values 1`] = `
+"profiles: 
+  secured: 
+    type:       secured
+    properties: 
+      info: 
+    secure: 
+      (empty array)
+  project_base: 
+    type:       base
+    properties: 
+      secret: (secure value)
+    secure: 
+      - secret
+  global_base: 
+    type:       base
+    properties: 
+    secure: 
+      - secret
+defaults: 
+  secured: secured
+  base:    project_base
+autoStore: true
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config list should list the defaults configuration property 1`] = `
+"secured: secured
+base:    project_base
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config list should list the profiles configuration property 1`] = `
+"secured: 
+  type:       secured
+  properties: 
+    info: 
+  secure: 
+    (empty array)
+project_base: 
+  type:       base
+  properties: 
+  secure: 
+    - secret
+global_base: 
+  type:       base
+  properties: 
+  secure: 
+    - secret
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config list should list the root level property names only 1 1`] = `
+"profiles
+defaults
+autoStore
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config list should list the root level property names only 2 1`] = `
+"profiles
+defaults
+autoStore
+"
+`;
+
+exports[`Imperative Secure Tests Imperative Test CLI Secure Tests imperative-test-cli config profiles should list profiles 1`] = `
 "secured
 project_base
 global_base

__tests__/__integration__/imperative.secure.integration.test.ts

@@ -11,19 +11,12 @@
 
 // These tests require access to the same values on the keyring, therefore they cannot run in parallel
 // The test order is important - some tests depend on other tests not running first - do not change it
+// All tests that mess with the keyring must go here - the MacOS Keyring is NOT thread safe, and cannot run anything in parallel
 /* eslint-disable max-len */
 
 describe("Imperative Secure Tests", () => {
-     require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.subtest");
-     require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/PluginManagementFacility.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/init/cli.imperative-test-cli.config.init.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/auto-init/imperative.test.cli.config.auto-init.fruit.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/profiles/cli.imperative-test-cli.config.profiles.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/secure/cli.imperative-test-cli.config.secure.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/set/cli.imperative-test-cli.config.set.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/test/cli.imperative-test-cli.test.config-auto-store.integration.subtest");
-    require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/test/cli.imperative-test-cli.test.config-override.integration.subtest");
+    require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.subtest");
+    require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/PluginManagementFacility.integration.subtest");
+    require("../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/cli.imperative-test-cli.integration.subtest");
+    require("../../packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.fruit.integration.subtest");
 });
-
-

__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.
 
+## `8.0.0-next.202408131445`
+
+- Update: See `7.28.3` for details
+
 ## `8.0.0-next.202407262216`
 
 - Update: See `7.28.2` for details
@@ -18,6 +22,10 @@ All notable changes to the Zowe CLI test utils package will be documented in thi
 
 - Major: First major version bump for V3
 
+## `7.28.3`
+
+- BugFix: Refactored code to reduce the use of deprecated functions to prepare for upcoming Node.js 22 support. [#2191](https://github.com/zowe/zowe-cli/issues/2191)
+
 ## `7.28.2`
 
 - BugFix: Improved the error message shown on Windows when `runCliScript` method cannot find `sh` executable on PATH. [#2208](https://github.com/zowe/zowe-cli/issues/2208)

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

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

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

@@ -179,6 +179,7 @@ export function mockHandlerParameters(params: PartialHandlerParameters): IHandle
             ...params.arguments || {}
         },
         positionals: params.positionals || [],
+        // eslint-disable-next-line deprecation/deprecation
         profiles: params.profiles || new CommandProfiles(new Map()),
         definition: params.definition,
         fullDefinition: params.definition,

lerna.json

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