Merge pull request #1004 from zowe/feat/keytar-rs

feat: Use `keyring` module in `@zowe/secrets-for-zowe-sdk` as replacement for `node-keytar`

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the Imperative package will be documented in this file.
 
+## Recent Changes
+
+- Enhancement: Replaced use of `node-keytar` with the new `keyring` module from `@zowe/secrets-for-zowe-sdk`. [zowe-cli#1622](https://github.com/zowe/zowe-cli/issues/1622)
+
 ## `5.17.0`
 
 - Enhancement: Added `inSchema` property for ProfileInfo to indicate if argument is a known schema argument [#899](https://github.com/zowe/imperative/issues/899)

__tests__/__integration__/imperative/__tests__/__integration__/cli/auth/imperative.test.cli.auth.login.fruit.integration.test.ts

@@ -14,7 +14,7 @@ import { runCliScript } from "../../../../../../src/TestUtil";
 import { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment";
 import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment";
 import * as fs from "fs";
-import * as keytar from "keytar";
+import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk";
 
 // Test Environment populated in the beforeAll();
 let TEST_ENVIRONMENT: ITestEnvironment;

__tests__/__integration__/imperative/__tests__/__integration__/cli/auth/imperative.test.cli.auth.logout.fruit.integration.test.ts

@@ -13,7 +13,7 @@ import { runCliScript } from "../../../../../../src/TestUtil";
 import { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment";
 import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment";
 import * as fs from "fs";
-import * as keytar from "keytar";
+import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk";
 
 // Test Environment populated in the beforeAll();
 let TEST_ENVIRONMENT: ITestEnvironment;

__tests__/__integration__/imperative/__tests__/__integration__/cli/config/auto-init/imperative.test.cli.config.auto-init.fruit.integration.test.ts

@@ -12,7 +12,7 @@
 import * as fs from "fs";
 import * as glob from "glob";
 import * as jsonfile from "jsonfile";
-import * as keytar from "keytar";
+import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk";
 import { IConfig } from "../../../../../../../../packages";
 import { IConfigSecureProperties } from "../../../../../../../../packages/config/src/doc/IConfigSecure";
 import { runCliScript } from "../../../../../../../src/TestUtil";

__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.test.ts

@@ -12,7 +12,7 @@
 import * as fs from "fs";
 import * as fsExtra from "fs-extra";
 import * as path from "path";
-import * as keytar from "keytar";
+import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk";
 import { ITestEnvironment } from "../../../../../../../__src__/environment/doc/response/ITestEnvironment";
 import { SetupTestEnvironment } from "../../../../../../../__src__/environment/SetupTestEnvironment";
 import { runCliScript } from "../../../../../../../src/TestUtil";

__tests__/__integration__/imperative/__tests__/__integration__/cli/config/secure/cli.imperative-test-cli.config.secure.integration.test.ts

@@ -14,7 +14,7 @@ import { SetupTestEnvironment } from "../../../../../../../__src__/environment/S
 import { runCliScript } from "../../../../../../../src/TestUtil";
 import { expectedConfigObject, expectedUserConfigObject } from "../__resources__/expectedObjects";
 import * as fs from "fs";
-import * as keytar from "keytar";
+import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk";
 import * as path from "path";
 import * as lodash from "lodash";
 import { IConfigProfile } from "../../../../../../../../packages";

__tests__/__integration__/imperative/__tests__/__integration__/cli/config/set/cli.imperative-test-cli.config.set.integration.test.ts

@@ -15,7 +15,7 @@ import { runCliScript } from "../../../../../../../src/TestUtil";
 import { expectedConfigObject, expectedUserConfigObject } from "../__resources__/expectedObjects";
 import * as fs from "fs";
 import * as path from "path";
-import * as keytar from "keytar";
+import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk";
 import * as lodash from "lodash";
 
 // Test Environment populated in the beforeAll();

__tests__/__integration__/imperative/package.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@zowe/imperative": "../../..",
-    "keytar": "^7.1.0"
+    "@zowe/secrets-for-zowe-sdk": "7.18.0-next.4"
   },
   "engines": {
     "node": ">=8.0.0"

__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.spec.ts

@@ -240,8 +240,8 @@ describe("Cli Profile Manager", () => {
 
         describe("Missing keytar installation", () => {
             const profileName = "missing-keytar";
-            const keyTarDir = path.join(__dirname, "../../../../../node_modules/keytar");
-            const renamedKeyTarDir = path.join(__dirname, "../../../../../node_modules/keytar-renamed");
+            const keyTarDir = path.join(__dirname, "../../../../../node_modules/@zowe/secrets-for-zowe-sdk");
+            const renamedKeyTarDir = path.join(__dirname, "../../../../../node_modules/@zowe/zowe-for-secrets-sdk");
 
             const renameKeyTar = () => {
                 if (fs.existsSync(keyTarDir)) {

__tests__/src/packages/profiles/test_cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "test-cli-for-profiles",
     "dependencies": {
-        "keytar": "rock-out-with-a-keytar"
+        "@zowe/secrets-for-zowe-sdk": "plaintext"
     }
 }