Merge branch 'next' into octoreleaseChangelog

Signed-off-by: Amber Torrise <112635587+ATorrise@users.noreply.github.com>

.github/workflows/secrets-sdk-publish.yml

@@ -18,7 +18,8 @@ jobs:
         node-version: 20
         check-latest: true
         cache: npm
-    - name: Install dependencies
+    - name: Install workspace dependencies
+      working-directory: "."
       run: npm ci --ignore-scripts
     - name: Build source
       run: npm run build:ts

.github/workflows/secrets-sdk.yml

@@ -123,7 +123,8 @@ jobs:
         run: ${{ matrix.settings.setup }}
         if: ${{ matrix.settings.setup }}
         shell: bash
-      - name: Install dependencies
+      - name: Install workspace dependencies
+        working-directory: "."
         run: npm ci --ignore-scripts
       - name: Setup node x86
         uses: actions/setup-node@v3

.github/workflows/zowe-cli.yml

@@ -122,9 +122,9 @@ jobs:
       if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest' }}
       uses: t1m0thyj/unlock-keyring@v1
 
-    - name: Start Daemon on Windows only
+    - name: Start Daemon
       id: start-daemon
-      if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'windows-latest' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push') }}
+      if: ${{ always() && steps.build.outcome == 'success' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push') }}
       run: ./__tests__/__resources__/daemon_instances/zowe
 
     - name: Integration Tests (Native)
@@ -133,7 +133,7 @@ jobs:
 
     - name: Integration Tests (Daemon)
       if: ${{ always() && steps.build.outcome == 'success' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push') }}
-      run: npm run test:integration:inband
+      run: npm run test:integration -- --runInBand
 
     - name: Archive Results
       if: ${{ always() && steps.build.outcome == 'success' }}

.gitignore

@@ -118,3 +118,5 @@ target/
 # Browserified bundles and compiled JS for web help
 packages/imperative/web-help/dist/css/bundle*
 packages/imperative/web-help/dist/js/
+
+jest-stare/

packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/CliProfileManager.credentials.integration.test.ts.snap → __tests__/__integration__/__snapshots__/imperative.secure.integration.test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 1`] = `
+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:
@@ -19,23 +19,29 @@ Resolutions:
 "
 `;
 
-exports[`Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 2`] = `
+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[`Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 1`] = `
+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[`Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 2`] = `
+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

@@ -0,0 +1,31 @@
+/*
+* This program and the accompanying materials are made available under the terms of the
+* Eclipse Public License v2.0 which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-v20.html
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Copyright Contributors to the Zowe Project.
+*
+*/
+
+// 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
+/* 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");
+    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/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/CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to the Zowe CLI test utils package will be documented in thi
 
 - Breaking: First major version bump for V3
 
+## `7.18.11`
+
+- BugFix: Fix types error from an incorrect jstree type during compilation
+
 ## `7.18.9`
 
 - Enhancement: Adds the `CLI_TEST_UTILS_USE_PROJECT_ROOT_DIR` environment variable to force the test utility to use the global project dir instead of workspace dirs if set.

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

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "7.18.9",
+  "version": "7.18.11",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -42,11 +42,8 @@
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.0",
-    "@types/node": "^14.18.28",
     "@types/uuid": "^8.3.0",
-    "@zowe/imperative": "5.18.4",
-    "eslint": "^8.22.0",
-    "typescript": "^4.0.0"
+    "@zowe/imperative": "5.18.5"
   },
   "peerDependencies": {
     "@zowe/imperative": "^5.0.0"

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

@@ -9,6 +9,10 @@
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "types": [
+      "node",
+      "jest"
+    ]
   }
 }

jest.config.js

@@ -129,8 +129,8 @@ module.exports = {
             "reportTestSuiteErrors": true
         }],
         ["jest-stare", {
-            "resultDir": "__tests__/__results__/jest-stare",
-            "coverageLink": "../unit/coverage/lcov-report/index.html"
+            "coverageLink": "../unit/coverage/lcov-report/index.html",
+            "resultDir": "__tests__/__results__/jest-stare"
         }],
         ["github-actions", { "silent": false } ]
     ],
@@ -145,8 +145,7 @@ module.exports = {
     "collectCoverageFrom": [
         "packages/**/*.ts",
         "!**/packages/imperative/web-help/**/*.ts",
-        "!**/packages/**/__tests__/**/*.ts",
-        "__tests__/__packages__/*.ts",
+        "!**/__tests__/**/*.ts",
         "!**/node_modules/**",
         "!**/lib/**"
     ],

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.18.9",
+  "version": "7.18.11",
   "command": {
     "publish": {
       "ignoreChanges": [