Merge remote-tracking branch 'origin/next' into update-next-with-master

Signed-off-by: Andrew W. Harn <[email protected]>

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

@@ -1,45 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 1`] = `
-"Command Preparation Failed:
-Unable to load the secure field \\"username\\" associated with the profile \\"profile-name-changed\\" of type \\"username-password\\".
-Error Details:
-Unable to load credentials.
-Could not find an entry in the credential vault for the following:
-  Service = example_with_profiles
-  Account = username-password_profile-name-changed_username
-
-Possible Causes:
-  This could have been caused by any manual removal of credentials from your vault.
-
-Resolutions: 
-  Recreate the credentials in the vault for the particular service in the vault.
-  To recreate credentials, issue a 'profiles create' sub-command with the --ow flag.
-
-"
-`;
-
-exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 2`] = `
-"Your default profile named profile-name of type username-password was successfully deleted.
-Because you deleted it, the default profile for type username-password has been cleared.
-To set a new default profile, run \\"zowe profiles set-default username-password <profileName>\\".
-"
-`;
-
-exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 1`] = `
-"
-Warning: The command 'profiles update' is deprecated.
-Recommended replacement: The 'config set' command
-"
-`;
-
-exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 2`] = `
-"Your default profile named profile-name of type username-password was successfully deleted.
-Because you deleted it, the default profile for type username-password has been cleared.
-To set a new default profile, run \\"zowe profiles set-default username-password <profileName>\\".
-"
-`;
-
 exports[`Imperative Secure Tests imperative-test-cli config profiles should list profiles 1`] = `
 "secured
 base

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

@@ -14,7 +14,6 @@
 /* eslint-disable max-len */
 
 describe("Imperative Secure Tests", () => {
-    require("./imperative.integration.subtest");
     require("./../../packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.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");
@@ -23,7 +22,6 @@ describe("Imperative Secure Tests", () => {
     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/profiles/cli.imperative-test-cli.profiles.create.secured-profile.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");
 });

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

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.0.0-next.202401162202",
+  "version": "8.1.0-next.202401191548",
   "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.0",
     "@types/uuid": "^8.3.0",
-    "@zowe/imperative": "8.0.0-next.202401162202"
+    "@zowe/imperative": "8.1.0-next.202401191548"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0-next"

__tests__/__scripts__/exitOnFailure.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# function to exit if we encounter a bad return code
+exitOnFailure () {
+    failureMsg=${1:?"First parm (failureMsg) is required."}
+    actualExitCode=${2:?"Second parm (actualExitCode) is required."}
+    goodExitCode=${3:-0}
+    if [ $actualExitCode != $goodExitCode ]; then
+        echo `basename $0`": $failureMsg" 1>&2
+        exit $actualExitCode
+    fi
+}

jest.config.js

@@ -23,7 +23,8 @@ const sharedConfig = {
     "testRegex": "__tests__.*\\.(spec|test)\\.ts$",
     "moduleFileExtensions": [
         "ts",
-        "js"
+        "js",
+        "json"
     ],
     "testEnvironment": "node",
     "testPathIgnorePatterns": [

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-next.202401162202",
+  "version": "8.1.0-next.202401191548",
   "command": {
     "publish": {
       "ignoreChanges": [