Merge pull request #2748 from zowe/2.15.0-release

Prepare the 2.15.0 release

.github/actions/deploy-npm-package/action.yml

@@ -17,5 +17,5 @@ outputs:
   changelog:
     description: The body of the changelog to be added to GH Releases
 runs:
-  using: node12
+  using: node20
   main: index.js

.github/actions/deploy-vscode-extension/action.yml

@@ -17,5 +17,5 @@ outputs:
   changelog:
     description: The body of the changelog to be added to GH Releases
 runs:
-  using: node12
+  using: node20
   main: index.js

.github/workflows/audit.yml

@@ -10,10 +10,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/*
 

.github/workflows/auto-comment.yml

@@ -9,10 +9,10 @@ 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
+        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'

.github/workflows/changelog.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/deployment.yml

@@ -23,16 +23,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
           ref: ${{ github.ref }}
 
       - name: Use Node.js LTS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.x'
 
       - name: Install Yarn and Lerna
         run: npm install -g yarn lerna@6

.github/workflows/lint.yml

@@ -10,10 +10,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/*
 

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           any-of-issue-labels: "needs more info, pending closure"
           close-issue-message: >

.github/workflows/theia-zowe-explorer-ci.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       # check out source
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # install dependencies
       - run: yarn install --frozen-lockfile
@@ -77,7 +77,7 @@ jobs:
 
       - name: Upload test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: theia-zowe-explorer-results
           path: packages/zowe-explorer/results/

.github/workflows/zowe-explorer-ci.yml

@@ -32,10 +32,10 @@ jobs:
 
     steps:
       - name: Check out code
-        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 }}
 
@@ -50,23 +50,24 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
         with:
           name: zowe-explorer-results
           path: packages/zowe-explorer/results/
 
       - name: Upload API test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
         with:
           name: zowe-explorer-api-results
           path: packages/zowe-explorer-api/results/
 
       - name: Upload Results to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           env_vars: OS,NODE
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Package VSIX
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
@@ -75,7 +76,7 @@ jobs:
 
       - name: Archive VSIX artifact
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: zowe-explorer-vsix
           path: dist/*.vsix

.github/workflows/zowe-explorer-ftp-ci.yml

@@ -32,10 +32,10 @@ jobs:
 
     steps:
       - name: Check out code
-        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 }}
 
@@ -50,7 +50,7 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
         with:
           name: zowe-explorer-ftp-extension-results
@@ -70,7 +70,7 @@ jobs:
 
       - name: Archive VSIX artifact
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: zowe-explorer-ftp-extension-vsix
           path: dist/*.vsix

.github/workflows/zowe-explorer-samples.yml

@@ -31,10 +31,10 @@ jobs:
 
     steps:
       - name: Check out code
-        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 }}
 

.gitignore

@@ -7,6 +7,7 @@ testProfileData.ts
 results
 *.log
 npm-shrinkwrap.json
+tsconfig.tsbuildinfo
 vscode-extension-for-zowe*.vsix
 .vscode/settings.json
 .vscode/*.env

.vscode/launch.json

@@ -48,8 +48,32 @@
       "name": "Zowe Explorer Unit Tests (Jest)",
       "request": "launch",
       "program": "${workspaceFolder}/node_modules/yarn/bin/yarn.js",
-      "args": ["run", "test"],
-      "cwd": "${workspaceFolder}",
+      "args": ["test"],
+      "cwd": "${workspaceFolder}/packages/zowe-explorer",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "smartStep": true,
+      "skipFiles": ["<node_internals>/**"]
+    },
+    {
+      "type": "node",
+      "name": "Zowe Explorer API Unit Tests (Jest)",
+      "request": "launch",
+      "program": "${workspaceFolder}/node_modules/yarn/bin/yarn.js",
+      "args": ["test"],
+      "cwd": "${workspaceFolder}/packages/zowe-explorer-api",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "smartStep": true,
+      "skipFiles": ["<node_internals>/**"]
+    },
+    {
+      "type": "node",
+      "name": "Zowe Explorer FTP Unit Tests (Jest)",
+      "request": "launch",
+      "program": "${workspaceFolder}/node_modules/yarn/bin/yarn.js",
+      "args": ["test"],
+      "cwd": "${workspaceFolder}/packages/zowe-explorer-ftp-extension",
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "smartStep": true,

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.14.2-SNAPSHOT",
+  "version": "2.15.0",
   "command": {
     "version": {
       "forcePublish": true,

package.json

@@ -16,7 +16,7 @@
     "vscode": "^1.53.2"
   },
   "dependencies": {
-    "@zowe/cli": "7.23.2",
+    "@zowe/cli": "7.23.3",
     "vscode-nls": "4.1.2"
   },
   "devDependencies": {
@@ -40,10 +40,14 @@
     "prettier": "2.6.0",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.0.3",
+    "ts-loader": "^7.0.1",
+    "ts-node": "^8.10.1",
     "typescript": "^4.5.3",
     "vsce": "2.15.0",
     "vscode-nls-dev": "^4.0.0",
     "vscode-test": "^1.4.0",
+    "webpack": "^4.42.1",
+    "webpack-cli": "^3.3.11",
     "yarn": "1.22.19"
   },
   "scripts": {

packages/eslint-plugin-zowe-explorer/CHANGELOG.md

@@ -2,10 +2,6 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen
 
 ## TBD Release
 
-### New features and enhancements
-
-### Bug fixes
-
 ## `2.14.1`
 
 ## `2.14.0`

packages/eslint-plugin-zowe-explorer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zowe-explorer",
-  "version": "2.14.2-SNAPSHOT",
+  "version": "2.15.0-SNAPSHOT",
   "description": "Custom ESLint Rules for ZOWE Explorer",
   "keywords": [
     "eslint",

packages/zowe-explorer-api/CHANGELOG.md

@@ -4,10 +4,12 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ## TBD Release
 
-### New features and enhancements
-
 ### Bug fixes
 
+- Fix login and logout operations when APIML dynamic tokens are enabled. [#2692](https://github.com/zowe/vscode-extension-for-zowe/pull/2692)
+- Fixed issue where `zosmf` profiles did not respect the `protocol` property. [#2703](https://github.com/zowe/vscode-extension-for-zowe/issues/2703)
+- Fix to restore accessibility to all profiles when default profile has APIML token authentication. [#2111](https://github.com/zowe/vscode-extension-for-zowe/issues/2111)
+
 ## `2.14.1`
 
 ### Bug fixes
@@ -26,6 +28,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 - Added new functions `loginWithBaseProfile` and `logoutWithBaseProfile` to provide extenders with the ability to automatically login to their respective services. [#2493](https://github.com/zowe/vscode-extension-for-zowe/pull/2493)
 - Added APIML dynamic token support. [#2665](https://github.com/zowe/vscode-extension-for-zowe/issues/2665)
 - Added new optional method `getCommonApi` to `ZoweExplorerApi.IApiRegisterClient` for enhanced typings in other Zowe Explorer APIs. [#2493](https://github.com/zowe/vscode-extension-for-zowe/pull/2493)
+- Add Created Date to `stats` optional variable for storing dataset stats
+- Add Date created to DatasetSortOpts enum [#2707](https://github.com/zowe/vscode-extension-for-zowe/pull/2707)
 
 ### Bug fixes
 

packages/zowe-explorer-api/__tests__/__unit__/profiles/ZoweExplorerZosmfApi.unit.test.ts

@@ -57,6 +57,29 @@ describe("ZosmfUssApi", () => {
         jest.clearAllMocks();
     });
 
+    describe("_getSession", () => {
+        const exampleProfile = {
+            message: "",
+            type: "zosmf",
+            failNotFound: false,
+            name: "test.zosmf",
+            profile: {
+                host: "localhost",
+                password: "password",
+                protocol: "http",
+                user: "aZosmfUser",
+            },
+        } as zowe.imperative.IProfileLoaded;
+
+        it("should include profile properties in the built session object", () => {
+            const api = new ZosmfUssApi();
+
+            const transformedProps = { ...exampleProfile.profile, hostname: exampleProfile.profile?.host };
+            delete transformedProps["host"];
+            expect((api as any)._getSession(exampleProfile).mISession).toMatchObject(transformedProps);
+        });
+    });
+
     describe("updateAttributes", () => {
         const ussApi = new ZosmfUssApi();
         const getSessionMock = jest.spyOn(ussApi, "getSession").mockReturnValue(fakeSession);
@@ -230,16 +253,17 @@ describe("ZosmfUssApi", () => {
         expect(checkStatusSpy).toHaveBeenCalledTimes(1);
     });
 
-    it("should test that copy calls zowe.Utilities.putUSSPayload", () => {
+    it("should test that copy calls zowe.Utilities.putUSSPayload", async () => {
         const api = new ZosmfUssApi();
         api.getSession = jest.fn();
+        const response = Buffer.from("hello world!");
 
         Object.defineProperty(zowe.Utilities, "putUSSPayload", {
-            value: jest.fn().mockResolvedValue(Buffer.from("hello world!")),
+            value: jest.fn().mockResolvedValue(response),
             configurable: true,
         });
 
-        expect(api.copy("/")).toStrictEqual(Promise.resolve(zowe.Utilities.putUSSPayload(api.getSession(), "/", { request: "copy" })));
+        await expect(api.copy("/")).resolves.toEqual(response);
     });
 
     it("getStatus should validate unverified profile", async () => {