Merge branch 'next' of https://github.com/zowe/zowe-cli into poc-1987…

…-mvp

Signed-off-by: zFernand0 <[email protected]>

.husky/commit-msg

@@ -2,7 +2,7 @@
 . "$(dirname "$0")/_/husky.sh"
 
 # If not a merge commit, require commit to be signed off
-if [ ! -e .git/MERGE_MSG ] && ! grep -q "^Signed-off-by: " "$1"; then
+if [ ! -e $(git rev-parse --git-dir)/MERGE_MSG ] && ! grep -q "^Signed-off-by: " "$1"; then
   echo >&2 "Commit message must be signed off with your user name and email."
   echo >&2 "To sign off your commit, add the -s flag to the git commit command."
   exit 1

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

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

__tests__/__system__/cli/logging/LoggingCredentials.system.test.ts

@@ -45,8 +45,8 @@ describe("Zowe CLI Logging", () => {
         const encodedAuth = Buffer.from(zosmfUsername + ":" + zosmfPassword).toString("base64");
 
         // Grab both log files
-        const imperativeLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, "/imperative/logs/imperative.log"));
-        const zoweLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, "/" + Constants.LOG_LOCATION));
+        const imperativeLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, "logs", "imperative.log"));
+        const zoweLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, Constants.LOG_LOCATION));
         const tempTestLog = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, TempTestProfiles.LOG_FILE_NAME));
 
         // ensure that the password and encoded auth does not appear in the imperative log
@@ -75,8 +75,8 @@ describe("Zowe CLI Logging", () => {
         expect(response.status).toBe(0);
 
         // Grab both log files
-        const imperativeLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, "/imperative/logs/imperative.log"));
-        const zoweLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, "/" + Constants.LOG_LOCATION));
+        const imperativeLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, "logs", "imperative.log"));
+        const zoweLogContents = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, Constants.LOG_LOCATION));
         const tempTestLog = fs.readFileSync(join(TEST_ENVIRONMENT.workingDir, TempTestProfiles.LOG_FILE_NAME));
 
         // ensure that the password and encoded auth does not appear in the imperative log

lerna.json

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

packages/cli/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## `8.0.0-next.202405061946`
+
+- Enhancement: Consolidated the Zowe client log files into the same directory. [#2116](https://github.com/zowe/zowe-cli/issues/2116)
+
+## `8.0.0-next.202404301428`
+
+- LTS Breaking: Add informative messages identifying why a user is being prompted for connection property values during a CLI command.
+
 ## `8.0.0-next.202404032038`
 
 - BugFix: Fixed error in `zos-files list all-members` command that could occur when members contain control characters in the name. [#2104](https://github.com/zowe/zowe-cli/pull/2104)