From 09e682fb8c5389148976e6622bbd9ccff7a06e57 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 31 Jan 2024 14:42:38 +0000 Subject: [PATCH 01/13] Add ARM64 MacOS runner Signed-off-by: Andrew W. Harn --- .github/workflows/zowe-cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index d933e32e62..871ab243c0 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: node-version: [18.x, 20.x] - os: [windows-latest, ubuntu-latest, macos-latest] + os: [windows-latest, ubuntu-latest, macos-latest, macos-14] env: OS: ${{ matrix.os }} From 93aaee5acf19a3b0e7582d7e21eb0c84202cade6 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 31 Jan 2024 16:56:17 +0000 Subject: [PATCH 02/13] Add ability to choose MacOS version Signed-off-by: Andrew W. Harn --- .github/workflows/zowe-cli.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index 871ab243c0..1885e9fedb 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -16,6 +16,13 @@ on: description: Specify whether to run tests using the `binary` or regular `nodejs` executable default: binary required: false + macos-type: + type: choice + description: Run against x86-based MacOS (12), otherwise run against ARM64-based MacOS (14) + default: macos-14 + options: + - macos-12 + - macos-14 jobs: test: @@ -28,7 +35,10 @@ jobs: fail-fast: false matrix: node-version: [18.x, 20.x] - os: [windows-latest, ubuntu-latest, macos-latest, macos-14] + os: + - windows-latest + - ubuntu-latest + - ${{ github.event.inputs.macos-type || 'macos-14'}} env: OS: ${{ matrix.os }} From 35c1f92dee9b0506929ea7884e49be1f2853e32c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 2 Feb 2024 14:03:02 +0000 Subject: [PATCH 03/13] Update CLI workflows to Node 20 versions Signed-off-by: Andrew W. Harn --- .github/workflows/audit.yml | 4 ++-- .github/workflows/auto-comment.yml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/linter.yml | 4 ++-- .github/workflows/rust-cli-publish.yml | 2 +- .github/workflows/rust-cli.yml | 12 ++++++------ .github/workflows/secrets-sdk-publish.yml | 4 ++-- .github/workflows/secrets-sdk.yml | 18 +++++++++--------- .github/workflows/sonar.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/zowe-cli.yml | 14 +++++++------- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index f8f5a43b4e..f20812b55e 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -15,10 +15,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js LTS - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: lts/* diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml index e5ac484317..1d707b5af8 100644 --- a/.github/workflows/auto-comment.yml +++ b/.github/workflows/auto-comment.yml @@ -9,7 +9,7 @@ jobs: name: Process Label Action runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Process Label Action uses: hramos/respond-to-issue-based-on-label@v2 diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 1b2f0ffb75..dbcf70835d 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 32b54d14ec..94718d6832 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 6b2375cb20..0fd38c2ad9 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -17,10 +17,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js LTS - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: lts/* diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml index 84309e5c5c..65901b6431 100644 --- a/.github/workflows/rust-cli-publish.yml +++ b/.github/workflows/rust-cli-publish.yml @@ -19,7 +19,7 @@ jobs: ZOWEX_VERSION: ${{ steps.get-version.outputs.ZOWEX_VERSION }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get version id: get-version diff --git a/.github/workflows/rust-cli.yml b/.github/workflows/rust-cli.yml index 97edb5c689..594cebf2bd 100644 --- a/.github/workflows/rust-cli.yml +++ b/.github/workflows/rust-cli.yml @@ -18,7 +18,7 @@ jobs: if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable @@ -41,7 +41,7 @@ jobs: - name: Archive Results id: upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zowe-linux.tgz path: zowex/target/x86_64-unknown-linux-gnu/debug/zowe.tgz @@ -59,7 +59,7 @@ jobs: if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable @@ -81,7 +81,7 @@ jobs: - name: Archive Results id: upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zowe-macos.tgz path: zowex/target/debug/zowe.tgz @@ -95,7 +95,7 @@ jobs: if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable @@ -112,7 +112,7 @@ jobs: - name: Archive Results id: upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zowe-windows.tgz path: zowex/target/debug/zowe.tgz diff --git a/.github/workflows/secrets-sdk-publish.yml b/.github/workflows/secrets-sdk-publish.yml index 3ae4d2050b..6015eeb40c 100644 --- a/.github/workflows/secrets-sdk-publish.yml +++ b/.github/workflows/secrets-sdk-publish.yml @@ -11,9 +11,9 @@ jobs: run: working-directory: packages/secrets steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 check-latest: true diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml index e069cd6d8a..c03956a729 100644 --- a/.github/workflows/secrets-sdk.yml +++ b/.github/workflows/secrets-sdk.yml @@ -93,9 +93,9 @@ jobs: name: stable - ${{ matrix.settings.target }} - node@20 runs-on: ${{ matrix.settings.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 if: ${{ !matrix.settings.docker }} with: node-version: 20 @@ -108,7 +108,7 @@ jobs: toolchain: stable target: ${{ matrix.settings.target }} - name: Cache cargo - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo/registry/index/ @@ -127,7 +127,7 @@ jobs: working-directory: "." run: npm ci --ignore-scripts - name: Setup node x86 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 if: matrix.settings.target == 'i686-pc-windows-msvc' with: node-version: 20 @@ -146,7 +146,7 @@ jobs: if: ${{ !matrix.settings.docker }} shell: bash - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bindings-${{ matrix.settings.target }} path: packages/secrets/src/keyring/${{ env.APP_NAME }}.*.node @@ -229,9 +229,9 @@ jobs: - "20" runs-on: ${{ matrix.settings.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} check-latest: true @@ -239,12 +239,12 @@ jobs: - name: Install dependencies run: npm ci --ignore-scripts - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bindings-${{ matrix.settings.target }} path: packages/secrets/src/keyring/ - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 if: ${{ matrix.settings.platform }} with: platforms: ${{ matrix.settings.platform }} diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 206794b77b..8d08046c1c 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ github.event.workflow_run.head_repository.full_name }} ref: ${{ github.event.workflow_run.head_branch }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index c46005d17a..6acaccc7f2 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -11,7 +11,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: # General rules applied to both, issues and pull requests (PRs) start-date: "2022-07-30T00:00:00Z" diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index 1885e9fedb..b56cceb963 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -53,10 +53,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} check-latest: true @@ -105,7 +105,7 @@ jobs: - name: Archive Binary if: github.event.inputs.test-type == 'binary' || github.event_name == 'push' id: upload-binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zowe-${{ matrix.os }}.tgz path: zowe.tgz @@ -147,14 +147,14 @@ jobs: - name: Archive Results if: ${{ always() && steps.build.outcome == 'success' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.os }}-${{ matrix.node-version }}-results path: __tests__/__results__/ - name: Upload Results to Codecov if: ${{ always() && steps.build.outcome == 'success' }} - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: env_vars: OS,NODE @@ -165,7 +165,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 persist-credentials: false @@ -173,7 +173,7 @@ jobs: # Use Node 20. Currently the latest. - name: Use Node.js 20 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '20' From 10be709b740aed0ed1afa261d1614e4b4d37358c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 2 Feb 2024 14:49:28 +0000 Subject: [PATCH 04/13] Add overwrite to workflow Signed-off-by: Andrew W. Harn --- .github/workflows/zowe-cli.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index b56cceb963..d17983562a 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -109,6 +109,7 @@ jobs: with: name: zowe-${{ matrix.os }}.tgz path: zowe.tgz + overwrite: true - name: Setup Binary in PATH if: github.event.inputs.test-type == 'binary' || github.event_name == 'push' From fc40026b4f0660af020c6ac332106d7dcee5cb16 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 2 Feb 2024 16:02:51 +0000 Subject: [PATCH 05/13] Fix CodeCov Signed-off-by: Andrew W. Harn --- .github/workflows/zowe-cli.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index d17983562a..6d9873e550 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -158,6 +158,7 @@ jobs: uses: codecov/codecov-action@v4 with: env_vars: OS,NODE + token: ${{ secrets.CODECOV_TOKEN }} release: if: github.event_name == 'push' && github.ref_protected From 8a4fdf0bb936ba5bc053e611ebde93650b3e17be Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 2 Feb 2024 16:49:35 +0000 Subject: [PATCH 06/13] Bump version to 8.0.0-next.202402021649 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 122 +++++++++--------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 28 ++-- packages/core/package.json | 6 +- packages/imperative/package.json | 4 +- packages/provisioning/package.json | 8 +- packages/secrets/package.json | 2 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/CHANGELOG.md | 2 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/CHANGELOG.md | 2 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/CHANGELOG.md | 2 +- packages/zosmf/package.json | 8 +- packages/zostso/CHANGELOG.md | 2 +- packages/zostso/package.json | 10 +- packages/zosuss/CHANGELOG.md | 2 +- packages/zosuss/package.json | 6 +- 22 files changed, 129 insertions(+), 129 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 562354e06a..fc3025cb05 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "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.202401262128" + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/lerna.json b/lerna.json index 5d7bd0133f..8faed576f7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 61aba7ecc2..67d575f977 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21272,21 +21272,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128", - "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401262128", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649", + "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202402021649", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -21300,7 +21300,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.0.0-next.202401262128", + "@zowe/cli-test-utils": "8.0.0-next.202402021649", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -21309,7 +21309,7 @@ "node": ">=14.0.0" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202402021649" } }, "packages/cli/node_modules/brace-expansion": { @@ -21331,15 +21331,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { "comment-json": "^4.1.1", "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21347,7 +21347,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { "@types/yargs": "^13.0.4", @@ -21401,7 +21401,7 @@ "@types/progress": "^2.0.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401262128", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202402021649", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", @@ -21668,16 +21668,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { "js-yaml": "^4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21686,7 +21686,7 @@ }, "packages/secrets": { "name": "@zowe/secrets-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "hasInstallScript": true, "license": "EPL-2.0", "devDependencies": { @@ -21699,15 +21699,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202402021649" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21716,12 +21716,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21730,17 +21730,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { "get-stream": "^6.0.1", "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21766,15 +21766,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202402021649" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21783,12 +21783,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21797,12 +21797,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21811,15 +21811,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202402021649" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21828,15 +21828,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "license": "EPL-2.0", "dependencies": { "ssh2": "^1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index e948aa40e6..5818326799 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe CLI package will be documented in this file. -## Recent Changes +## `8.0.0-next.202402021649` LTS Breaking: Removed the following previously deprecated items: [#1981](https://github.com/zowe/zowe-cli/pull/1981) - Moved the many constants from `zowe-cli/packages/cli/src/Constants.ts` to `zowe-cli/packages/core/src/constants/Core.constants.ts` diff --git a/packages/cli/package.json b/packages/cli/package.json index e2d849dda6..dc5f64fd82 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.", "author": "Zowe", "license": "EPL-2.0", @@ -57,17 +57,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128", - "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401262128", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649", + "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202402021649", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -78,13 +78,13 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.0.0-next.202401262128", + "@zowe/cli-test-utils": "8.0.0-next.202402021649", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202402021649" }, "engines": { "node": ">=14.0.0" diff --git a/packages/core/package.json b/packages/core/package.json index 5a62cab3b4..481f82740d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 993fb50481..d42edbb400 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", @@ -94,7 +94,7 @@ "@types/progress": "^2.0.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401262128", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202402021649", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index 369a711a47..da97129de9 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/secrets/package.json b/packages/secrets/package.json index 1326088e25..07c8f430f2 100644 --- a/packages/secrets/package.json +++ b/packages/secrets/package.json @@ -3,7 +3,7 @@ "description": "Credential management facilities for Imperative, Zowe CLI, and extenders.", "repository": "https://github.com/zowe/zowe-cli.git", "author": "Zowe", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "homepage": "https://github.com/zowe/zowe-cli/tree/master/packages/secrets#readme", "bugs": { "url": "https://github.com/zowe/zowe-cli/issues" diff --git a/packages/workflows/package.json b/packages/workflows/package.json index bc816eb922..9869a72f1e 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with the z/OS workflows APIs", "author": "Zowe", "license": "EPL-2.0", @@ -45,12 +45,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202402021649" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 621d832b29..206e1f6c85 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index ea17a747c1..885cfdea8e 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. -## Recent Changes +## `8.0.0-next.202402021649` - LTS Breaking: Removed the following previously deprecated items: - Removed `ZosFilesCreateExtraOptions.showAttributes` without replacement diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 53e8595428..aca957ab91 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosjobs/CHANGELOG.md b/packages/zosjobs/CHANGELOG.md index 8e8c2f32ec..9076d4d3b8 100644 --- a/packages/zosjobs/CHANGELOG.md +++ b/packages/zosjobs/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS jobs SDK package will be documented in this file. -## Recent Changes +## `8.0.0-next.202402021649` - LTS Breaking: Removed `getSpoolDownloadFile` use `getSpoolDownloadFilePath` instead diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 7ec444ea95..8b04bb5154 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with jobs on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -46,12 +46,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202402021649" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 5cdeec091b..b12dde1645 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosmf/CHANGELOG.md b/packages/zosmf/CHANGELOG.md index 0f04a6f365..412b427d6e 100644 --- a/packages/zosmf/CHANGELOG.md +++ b/packages/zosmf/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OSMF SDK package will be documented in this file. -## Recent Changes +## `8.0.0-next.202402021649` - LTS Breaking: Removed the following constants from ZosmfSession - ZOSMF_OPTION_HOST_PROFILE use ZOSMF_OPTION_HOST instead diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index e4594186c2..f4b401a0ac 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zostso/CHANGELOG.md b/packages/zostso/CHANGELOG.md index 4f6ff0bd32..2e3c8833f7 100644 --- a/packages/zostso/CHANGELOG.md +++ b/packages/zostso/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS TSO SDK package will be documented in this file. -## Recent Changes +## `8.0.0-next.202402021649` - LTS Breaking: Moved all constants from `zowe-cli/packages/cli/src/zostso/constants/ZosTso.constants.ts` to `@zowe/zos-tso-for-zowe-sdk` diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 03275ebe7a..ef807db345 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with TSO on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -45,12 +45,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401262128" + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202402021649" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosuss/CHANGELOG.md b/packages/zosuss/CHANGELOG.md index 86bafac324..056aea62f3 100644 --- a/packages/zosuss/CHANGELOG.md +++ b/packages/zosuss/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS USS SDK package will be documented in this file. -## Recent Changes +## `8.0.0-next.202402021649` - LTS Breaking: Removed the following previously deprecated items: - Removed the following constants from SshSession.ts diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 10a99fe61a..d160231691 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.0.0-next.202401262128", + "version": "8.0.0-next.202402021649", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.0.0-next.202401262128", - "@zowe/imperative": "8.0.0-next.202401262128" + "@zowe/cli-test-utils": "8.0.0-next.202402021649", + "@zowe/imperative": "8.0.0-next.202402021649" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" From 7f6701761e3d406d657afdde1b3f9c914add5caf Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 2 Feb 2024 19:45:47 +0000 Subject: [PATCH 07/13] Use maintained label action Signed-off-by: Andrew W. Harn --- .github/workflows/auto-comment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml index 1d707b5af8..952eeffd9a 100644 --- a/.github/workflows/auto-comment.yml +++ b/.github/workflows/auto-comment.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4 - name: Process Label Action - uses: hramos/respond-to-issue-based-on-label@v2 + uses: dessant/label-actions@v4 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: '.github/label-actions.yml' + github-token: ${{ secrets.GITHUB_TOKEN }} + config-path: '.github/label-actions.yml' From c04812963139475840510ff876a8243087820ac0 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 2 Feb 2024 20:25:00 +0000 Subject: [PATCH 08/13] Use GH CLI for release publish Signed-off-by: Andrew W. Harn --- .github/workflows/rust-cli-publish.yml | 48 ++++++-------------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml index 65901b6431..0c63f13a0c 100644 --- a/.github/workflows/rust-cli-publish.yml +++ b/.github/workflows/rust-cli-publish.yml @@ -28,19 +28,15 @@ jobs: - name: Create Release id: create_release - uses: ncipollo/release-action@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag: native-v${{ steps.get-version.outputs.ZOWEX_VERSION }} - name: Native Client Release ${{ steps.get-version.outputs.ZOWEX_VERSION }} - body: | - Native Zowe CLI client which communicates with a "daemon" version of Zowe CLI. - draft: false - prerelease: false - makeLatest: false - - - uses: actions/upload-artifact@v3 + run: | + gh release create \ + -n "Native Zowe CLI client which communicates with a 'daemon' version of Zowe CLI." \ + -t "Native Client Release ${{ steps.get-version.outputs.ZOWEX_VERSION }}" \ + native-v${{ steps.get-version.outputs.ZOWEX_VERSION }} + + - uses: actions/upload-artifact@v4 with: name: repo path: | @@ -79,17 +75,9 @@ jobs: - name: Upload Release Asset id: upload-release-asset - uses: ncipollo/release-action@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag: native-v${{ needs.release.outputs.ZOWEX_VERSION }} - name: Native Client Release ${{ needs.release.outputs.ZOWEX_VERSION }} - allowUpdates: true - artifacts: target/x86_64-unknown-linux-gnu/release/zowe-linux.tgz - artifactContentType: application/octet-stream - removeArtifacts: false - replacesArtifacts: false + run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/x86_64-unknown-linux-gnu/release/zowe-linux.tgz build-macos: @@ -126,17 +114,9 @@ jobs: - name: Upload Release Asset id: upload-release-asset - uses: ncipollo/release-action@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag: native-v${{ needs.release.outputs.ZOWEX_VERSION }} - name: Native Client Release ${{ needs.release.outputs.ZOWEX_VERSION }} - allowUpdates: true - artifacts: target/release/zowe-macos.tgz - artifactContentType: application/octet-stream - removeArtifacts: false - replacesArtifacts: false + run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-macos.tgz build-windows: @@ -168,14 +148,6 @@ jobs: - name: Upload Release Asset id: upload-release-asset - uses: ncipollo/release-action@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag: native-v${{ needs.release.outputs.ZOWEX_VERSION }} - name: Native Client Release ${{ needs.release.outputs.ZOWEX_VERSION }} - allowUpdates: true - artifacts: target/release/zowe-windows.tgz - artifactContentType: application/octet-stream - removeArtifacts: false - replacesArtifacts: false + run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-windows.tgz From 37ebe2d267b2b09dd954587bf8a7625255e8dfb3 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 2 Feb 2024 20:26:42 +0000 Subject: [PATCH 09/13] Update artifact steps Signed-off-by: Andrew W. Harn --- .github/workflows/rust-cli-publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml index 0c63f13a0c..5d001c3fa6 100644 --- a/.github/workflows/rust-cli-publish.yml +++ b/.github/workflows/rust-cli-publish.yml @@ -55,7 +55,7 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: repo @@ -94,7 +94,7 @@ jobs: with: targets: aarch64-apple-darwin - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: repo @@ -131,7 +131,7 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: repo From bdee3384fb46ca2e0ae9527c9546222ef7ed9a0c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 6 Feb 2024 14:28:13 -0500 Subject: [PATCH 10/13] Add Zowe Release version output Signed-off-by: Andrew W. Harn --- packages/cli/package.json | 1 + packages/imperative/CHANGELOG.md | 4 ++ .../__tests__/Imperative.unit.test.ts | 2 +- ...efaultRootCommandHandler.unit.test.ts.snap | 37 ++++++++++++++++++- packages/imperative/src/imperative/index.ts | 1 + .../imperative/src/doc/IImperativeVersions.ts | 25 +++++++++++++ .../src/handlers/DefaultRootCommandHandler.ts | 12 ++++-- .../src/__mocks__/ImperativeConfig.ts | 2 +- 8 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 packages/imperative/src/imperative/src/doc/IImperativeVersions.ts diff --git a/packages/cli/package.json b/packages/cli/package.json index dc5f64fd82..23940908f7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,7 @@ { "name": "@zowe/cli", "version": "8.0.0-next.202402021649", + "zoweVersion": "V3", "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index ea983dc831..ada26356e8 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Imperative package will be documented in this file. +## Recent Changes + +- LTS Breaking: Added Zowe release version output for `--version` [#2028](https://github.com/zowe/zowe-cli/issues/2028) + ## `8.0.0-next.202401191954` - LTS Breaking: Removed the following: diff --git a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts b/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts index e6b897ccbb..d60148701f 100644 --- a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts +++ b/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts @@ -185,7 +185,7 @@ describe("Imperative", () => { expect(result).toBeUndefined(); expect(mocks.Config.load).toHaveBeenCalledTimes(1); expect(mocks.OverridesLoader.load).toHaveBeenCalledTimes(1); - expect(mocks.OverridesLoader.load).toHaveBeenCalledWith(defaultConfig, { version: 10000, name: "sample" }); + expect(mocks.OverridesLoader.load).toHaveBeenCalledWith(defaultConfig, { version: 10000, name: "sample", zoweVersion: "V99" }); }); describe("AppSettings", () => { diff --git a/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap b/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap index 69b79cfc2c..66a04e23d7 100644 --- a/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap +++ b/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap @@ -280,22 +280,57 @@ exports[`Default Root Command Handler should display the version if --version is Object { "data": Object { "version": 10000, + "zoweVersion": "V99", }, "error": undefined, "exitCode": 0, - "message": "Version displayed", + "message": "Version(s) displayed", "stderr": Object { "data": Array [], "type": "Buffer", }, "stdout": Object { "data": Array [ + 67, + 76, + 73, + 32, + 86, + 101, + 114, + 115, + 105, + 111, + 110, + 58, + 32, 49, 48, 48, 48, 48, 10, + 82, + 101, + 108, + 101, + 97, + 115, + 101, + 32, + 86, + 101, + 114, + 115, + 105, + 111, + 110, + 58, + 32, + 86, + 57, + 57, + 10, ], "type": "Buffer", }, diff --git a/packages/imperative/src/imperative/index.ts b/packages/imperative/src/imperative/index.ts index f5b505beb9..b93c2a3f00 100644 --- a/packages/imperative/src/imperative/index.ts +++ b/packages/imperative/src/imperative/index.ts @@ -16,6 +16,7 @@ export * from "./src/doc/IImperativeEnvironmentalVariableSetting"; export * from "./src/doc/IImperativeEnvironmentalVariableSettings"; export * from "./src/doc/IImperativeConfig"; export * from "./src/doc/IImperativeLoggingConfig"; +export * from "./src/doc/IImperativeVersions"; export * from "./src/ConfigurationLoader"; export * from "./src/ConfigurationValidator"; export * from "./src/DefinitionTreeResolver"; diff --git a/packages/imperative/src/imperative/src/doc/IImperativeVersions.ts b/packages/imperative/src/imperative/src/doc/IImperativeVersions.ts new file mode 100644 index 0000000000..eeee41de35 --- /dev/null +++ b/packages/imperative/src/imperative/src/doc/IImperativeVersions.ts @@ -0,0 +1,25 @@ +/* +* 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. +* +*/ + +export interface IImperativeVersions { + /** + * The version of the consuming program, retrieved from `version` in package.json + * @type {string} + * @memberof IImperativeVersions + */ + version: string, + /** + * The Zowe LTS release number from the consuming program, retrieved from `zoweVersion` in package.json + * @type {string} + * @memberof IImperativeVersions + */ + zoweVersion?: string +} \ No newline at end of file diff --git a/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts b/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts index 176b8b7775..826faef637 100644 --- a/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts +++ b/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts @@ -13,6 +13,7 @@ import { Imperative } from "../../../imperative/src/Imperative"; import { ICommandHandler, IHandlerParameters, ICommandTreeEntry, CommandUtils } from "../../../cmd"; import { ImperativeConfig, TextUtils } from "../../../utilities"; import { WebHelpManager } from "../../../cmd/src/help/WebHelpManager"; +import { IImperativeVersions } from "../doc/IImperativeVersions"; /** * The default command handler for the top level/root command * Allows the user to check the version of the package. @@ -24,9 +25,14 @@ export default class DefaultRootCommandHandler implements ICommandHandler { if (params.arguments.version) { // load the user's package.json to check the version of their package const packageJson: any = ImperativeConfig.instance.callerPackageJson; - params.response.console.log(packageJson.version); - params.response.data.setObj({ version: packageJson.version }); - params.response.data.setMessage("Version displayed"); + const jsonResponse: IImperativeVersions = { version: packageJson.version }; + params.response.console.log("CLI Version: " + packageJson.version); + if (packageJson.zoweVersion) { + params.response.console.log("Release Version: " + packageJson.zoweVersion); + jsonResponse.zoweVersion = packageJson.zoweVersion; + } + params.response.data.setObj(jsonResponse); + params.response.data.setMessage("Version(s) displayed"); } else if(params.arguments.availableCommands) { // Gather and display the full set of commands available to the CLI with descriptions diff --git a/packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts b/packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts index f6535abce4..492983bae1 100644 --- a/packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts +++ b/packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts @@ -43,7 +43,7 @@ export class ImperativeConfig { } public get callerPackageJson(): any { - return {version: 10000, name: "sample"}; + return {version: 10000, zoweVersion: "V99", name: "sample"}; } public get cliHome(): string { From 1cf0f1dd1ccbbfc53fc97e3318e4de7a6b39088c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 6 Feb 2024 16:19:22 -0500 Subject: [PATCH 11/13] Remove RECFM validation, update changelogs & tests Signed-off-by: Andrew W. Harn --- packages/cli/CHANGELOG.md | 4 ++ .../Cmd.cli.root.integration.test.ts.snap | 3 +- .../__integration__/cmd/package.json | 1 + .../HelloWorldCli.integration.test.ts.snap | 3 +- .../__integration__/hello_world/package.json | 1 + .../__integration__/imperative/package.json | 1 + packages/zosfiles/CHANGELOG.md | 4 ++ .../methods/create/Create.unit.test.ts | 4 +- .../zosfiles/src/methods/create/Create.ts | 41 ++----------------- 9 files changed, 21 insertions(+), 41 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 5818326799..4401af9643 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe CLI package will be documented in this file. +## Recent Changes + +- LTS Breaking: Removed record format (recfm) validation when issuing `zowe files create` commands [#1699](https://github.com/zowe/zowe-cli/issues/1699) + ## `8.0.0-next.202402021649` LTS Breaking: Removed the following previously deprecated items: [#1981](https://github.com/zowe/zowe-cli/pull/1981) diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap index b5e4cde0ea..ac2b5270c2 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap @@ -124,7 +124,8 @@ exports[`cmd-cli should display the help 1`] = ` exports[`cmd-cli should display the version 1`] = ` "================ISSUING VERSION=============== -0.0.0 +CLI Version: 0.0.0 +Release Version: V99 " `; diff --git a/packages/imperative/__tests__/__integration__/cmd/package.json b/packages/imperative/__tests__/__integration__/cmd/package.json index 08b7fe6699..2c3d184688 100644 --- a/packages/imperative/__tests__/__integration__/cmd/package.json +++ b/packages/imperative/__tests__/__integration__/cmd/package.json @@ -1,6 +1,7 @@ { "name": "cmd-sample-cli", "version": "0.0.0", + "zoweVersion": "V99", "description": "Command Sample CLI", "license": "EPL-2.0", "repository": "", diff --git a/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap b/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap index b0a0a3688b..ae7a7185e9 100644 --- a/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap +++ b/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap @@ -49,7 +49,8 @@ exports[`Hello World should print help if the option is specified 1`] = ` `; exports[`Hello World should print version if the option is specified 1`] = ` -"0.0.0 +"CLI Version: 0.0.0 +Release Version: V99 " `; diff --git a/packages/imperative/__tests__/__integration__/hello_world/package.json b/packages/imperative/__tests__/__integration__/hello_world/package.json index 66c623db7a..849e84bc98 100644 --- a/packages/imperative/__tests__/__integration__/hello_world/package.json +++ b/packages/imperative/__tests__/__integration__/hello_world/package.json @@ -1,6 +1,7 @@ { "name": "hello-world-cli", "version": "0.0.0", + "zoweVersion": "V99", "description": "Hello World Sample CLI", "license": "EPL 2.0", "repository": "", diff --git a/packages/imperative/__tests__/__integration__/imperative/package.json b/packages/imperative/__tests__/__integration__/imperative/package.json index 8895054427..34b956b281 100644 --- a/packages/imperative/__tests__/__integration__/imperative/package.json +++ b/packages/imperative/__tests__/__integration__/imperative/package.json @@ -1,6 +1,7 @@ { "name": "imperative-test-cli", "version": "0.0.0", + "zoweVersion": "V99", "description": "Imperative Test CLI", "license": "EPL 2.0", "repository": "", diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 885cfdea8e..ec608f4008 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. +## Recent Changes + +- LTS Breaking: Removed record format (recfm) validation when creating data-sets [#1699](https://github.com/zowe/zowe-cli/issues/1699) + ## `8.0.0-next.202402021649` - LTS Breaking: Removed the following previously deprecated items: diff --git a/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts b/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts index 164852ce08..7f52d10523 100644 --- a/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts +++ b/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts @@ -1066,14 +1066,14 @@ describe("Create data set Validator", () => { expect(testOptions.secondary).toEqual(0); // Should be changed during create validation to zOSMF default of 0 }); - it("recfm should default to 'F' if not specified", async () => { + it("recfm should not default to anything if not specified", async () => { const testOptions: any = { recfm: undefined }; Create.dataSetValidateOptions(testOptions); - expect(testOptions.recfm).toEqual("F"); // Should be changed during create validation to zOSMF default of 'F' + expect(testOptions.recfm).not.toEqual("F"); // Should not be changed during create validation to zOSMF default of 'F' }); }); diff --git a/packages/zosfiles/src/methods/create/Create.ts b/packages/zosfiles/src/methods/create/Create.ts index 07677e1358..79f7b50d7a 100644 --- a/packages/zosfiles/src/methods/create/Create.ts +++ b/packages/zosfiles/src/methods/create/Create.ts @@ -234,20 +234,10 @@ export class Create { tempOptions.blksize = tempOptions.lrecl; } - if(tempOptions.blksize <= tempOptions.lrecl ){ + if(tempOptions.blksize <= tempOptions.lrecl ){ tempOptions.blksize = tempOptions.lrecl; - if(tempOptions.recfm === null || tempOptions.recfm === undefined){ - tempOptions.recfm = "FB"; - } - switch (tempOptions.recfm.toUpperCase()) { - case "V": - case "VB": - case "VBS": - case "VS": - tempOptions.blksize += 4; - break; - default: - break; + if (tempOptions.recfm && tempOptions.recfm.toUpperCase().startsWith("V")) { + tempOptions.blksize += 4; } } break; @@ -315,31 +305,8 @@ export class Create { break; case "recfm": - // zOSMF defaults to F if missing so mimic it's behavior - if (tempOptions.recfm === null || tempOptions.recfm === undefined) { - tempOptions.recfm = "F"; - } + // no validation - // F, V, or U are required; B, A, M, S, T or additional - // VBA works on mainframe but not via zOSMF - switch (tempOptions.recfm.toUpperCase()) { - case "D": - case "DB": - case "DBS": - case "DS": - case "F": - case "FB": - case "FBS": - case "FS": - case "V": - case "VB": - case "VBS": - case "VS": - case "U": - break; - default: - throw new ImperativeError({ msg: ZosFilesMessages.invalidRecfmOption.message + tempOptions.recfm }); - } break; // SMS class values From 7a0a5bcf91f1e0c547fbd97358b69bf499a51207 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 6 Feb 2024 16:27:03 -0500 Subject: [PATCH 12/13] Update CLI changelog Signed-off-by: Andrew W. Harn --- packages/cli/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 4401af9643..0d9b9f9b63 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to the Zowe CLI package will be documented in this file. ## Recent Changes - LTS Breaking: Removed record format (recfm) validation when issuing `zowe files create` commands [#1699](https://github.com/zowe/zowe-cli/issues/1699) +- LTS Breaking: Added Zowe release version output for `--version` [#2028](https://github.com/zowe/zowe-cli/issues/2028) ## `8.0.0-next.202402021649` From 205504813bfe42b6031f534ca3cbae668a47016c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 7 Feb 2024 18:38:10 +0000 Subject: [PATCH 13/13] Update version output and snapshots Signed-off-by: Andrew W. Harn --- .../root/__snapshots__/Cmd.cli.root.integration.test.ts.snap | 2 +- .../__snapshots__/HelloWorldCli.integration.test.ts.snap | 2 +- .../DefaultRootCommandHandler.unit.test.ts.snap | 5 +++++ .../src/imperative/src/handlers/DefaultRootCommandHandler.ts | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap index ac2b5270c2..8606fe3568 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap @@ -125,7 +125,7 @@ exports[`cmd-cli should display the help 1`] = ` exports[`cmd-cli should display the version 1`] = ` "================ISSUING VERSION=============== CLI Version: 0.0.0 -Release Version: V99 +Zowe Release Version: V99 " `; diff --git a/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap b/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap index ae7a7185e9..6f25772045 100644 --- a/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap +++ b/packages/imperative/__tests__/__integration__/hello_world/__tests__/__snapshots__/HelloWorldCli.integration.test.ts.snap @@ -50,7 +50,7 @@ exports[`Hello World should print help if the option is specified 1`] = ` exports[`Hello World should print version if the option is specified 1`] = ` "CLI Version: 0.0.0 -Release Version: V99 +Zowe Release Version: V99 " `; diff --git a/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap b/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap index 66a04e23d7..13319de429 100644 --- a/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap +++ b/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap @@ -310,6 +310,11 @@ Object { 48, 48, 10, + 90, + 111, + 119, + 101, + 32, 82, 101, 108, diff --git a/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts b/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts index 826faef637..55cbba6e05 100644 --- a/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts +++ b/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts @@ -28,7 +28,7 @@ export default class DefaultRootCommandHandler implements ICommandHandler { const jsonResponse: IImperativeVersions = { version: packageJson.version }; params.response.console.log("CLI Version: " + packageJson.version); if (packageJson.zoweVersion) { - params.response.console.log("Release Version: " + packageJson.zoweVersion); + params.response.console.log("Zowe Release Version: " + packageJson.zoweVersion); jsonResponse.zoweVersion = packageJson.zoweVersion; } params.response.data.setObj(jsonResponse);