pluginHealthCheck, PMF_ROOT comment, flattenCommandTreeWithAliaises

Signed-off-by: Amber Torrise <at895452@broadcom.net>
zowe · Nov 9, 2023 · b52c7d2 · b52c7d2
1 parent a624c1a
commit b52c7d2
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 3,100 deletions.
diff --git a/packages/core/__tests__/apiml/__unit__/allPluginCfgPropsMock.json b/packages/core/__tests__/apiml/__unit__/allPluginCfgPropsMock.json
@@ -6,7 +6,6 @@
       "commandModuleGlobs": [
         "**/*.definition!(.d).*s"
       ],
-      "pluginHealthCheck": "./lib/HealthCheck.handler",
       "rootCommandDescription": "CA Endevor SCM plug-in for listing Endevor environment information, working with elements and packages located in specified Endevor instance.",
       "envVariablePrefix": "ENDEVOR",
       "defaultHome": "C:\\Users\\ej608771/.endevor",
@@ -309,7 +308,6 @@
       "commandModuleGlobs": [
         "**/cli/*/*.definition!(.d).*s"
       ],
-      "pluginHealthCheck": "C:\\Users\\ej608771\\.zowe\\plugins\\installed\\node_modules\\@broadcom\\jclcheck-for-zowe-cli\\lib/healthCheck.handler",
       "pluginSummary": "JCLCheck plugin",
       "pluginAliases": [
         "jck"

diff --git a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/ValidatePlugin.ts b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/ValidatePlugin.ts
@@ -247,88 +247,6 @@ describe("Validate plugin", () => {
                 expect(result.status).toEqual(1);
             });
 
-            // TODO: remove this test in V3, when pluginHealthCheck is removed
-            it("missing pluginHealthCheck property", () => {
-                const testPlugin = "missing_pluginHealthCheck";
-                const fullPluginPath = join(testPluginDir, "error_plugins", testPlugin);
-
-                let cmd = `plugins install ${fullPluginPath}`;
-                let result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                expect(result.stdout).toContain(`Installed plugin name = '${testPlugin}'`);
-
-                cmd = `plugins validate ${testPlugin}`;
-                result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                result.stderr = removeNewline(result.stderr);
-                expect(result.stdout).toContain(testPlugin);
-                expect(result.stdout).toContain("This plugin was successfully validated. Enjoy the plugin.");
-                expect(result.stdout).not.toContain("Warning");
-                expect(result.stdout).not.toContain("The plugin's configuration does not contain an 'imperative.pluginHealthCheck' property.");
-                expect(result.stderr).not.toContain("Problems detected during plugin validation.");
-                expect(result.status).toEqual(0);
-            });
-
-            // TODO: remove this test in V3, when pluginHealthCheck is removed
-            it("missing pluginHealthCheck property - warning", () => {
-                const testPlugin = "missing_pluginHealthCheck";
-                const fullPluginPath = join(testPluginDir, "error_plugins", testPlugin);
-
-                let cmd = `plugins install ${fullPluginPath}`;
-                let result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                expect(result.stdout).toContain(`Installed plugin name = '${testPlugin}'`);
-
-                cmd = `plugins validate ${testPlugin} --fail-on-warning`;
-                result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                result.stderr = removeNewline(result.stderr);
-                expect(result.stdout).toContain(testPlugin);
-                expect(result.stdout).toContain("This plugin was successfully validated. Enjoy the plugin.");
-                expect(result.stdout).not.toContain("Warning");
-                expect(result.stdout).not.toContain("The plugin's configuration does not contain an 'imperative.pluginHealthCheck' property.");
-                expect(result.stderr).not.toContain("Problems detected during plugin validation.");
-                expect(result.status).toEqual(0);
-            });
-
-            // TODO: remove this test in V3, when pluginHealthCheck is removed
-            it("missing pluginHealthCheck handler", () => {
-                const testPlugin = "missing_healthcheck_handler";
-                const fullPluginPath = join(testPluginDir, "error_plugins", testPlugin);
-
-                let cmd = `plugins install ${fullPluginPath}`;
-                let result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                expect(result.stdout).toContain(`Installed plugin name = '${testPlugin}'`);
-
-                cmd = `plugins validate ${testPlugin} --no-fail-on-error`;
-                result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                result.stderr = removeNewline(result.stderr);
-                expect(result.stdout).toContain(testPlugin);
-                expect(result.stdout).toContain("This plugin was successfully validated. Enjoy the plugin.");
-                expect(result.stdout).not.toContain("Error");
-                expect(result.stdout).not.toContain(`The program for the 'imperative.pluginHealthCheck' property does not exist:`);
-                expect(result.stdout).not.toContain("This plugin has configuration errors. No component of the plugin will be available");
-                expect(result.stderr).not.toContain("Problems detected during plugin validation.");
-                expect(result.status).toEqual(0);
-            });
-
-            // TODO: remove this test in V3, when pluginHealthCheck is removed
-            it("missing pluginHealthCheck handler - error", () => {
-                const testPlugin = "missing_healthcheck_handler";
-                const fullPluginPath = join(testPluginDir, "error_plugins", testPlugin);
-
-                let cmd = `plugins install ${fullPluginPath}`;
-                let result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                expect(result.stdout).toContain(`Installed plugin name = '${testPlugin}'`);
-
-                cmd = `plugins validate ${testPlugin}`;
-                result = T.executeTestCLICommand(cliBin, this, cmd.split(" "));
-                result.stderr = removeNewline(result.stderr);
-                expect(result.stdout).toContain(testPlugin);
-                expect(result.stdout).toContain("This plugin was successfully validated. Enjoy the plugin.");
-                expect(result.stdout).not.toContain("Error");
-                expect(result.stdout).not.toContain(`The program for the 'imperative.pluginHealthCheck' property does not exist:`);
-                expect(result.stdout).not.toContain("This plugin has configuration errors. No component of the plugin will be available");
-                expect(result.stderr).not.toContain("Problems detected during plugin validation.");
-                expect(result.status).toEqual(0);
-            });
-
             it("missing peerDependencies properties", () => {
                 const testPlugin = "missing_dependencies";
                 const fullPluginPath = join(testPluginDir, "error_plugins", testPlugin);

diff --git a/..._tests__/src/packages/imperative/plugins/test_plugins/chained_handler_plugin/package.json b/..._tests__/src/packages/imperative/plugins/test_plugins/chained_handler_plugin/package.json
@@ -10,7 +10,6 @@
     "name": "chained-handler-plugin",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./lib/sample-plugin/healthCheck.handler",
     "pluginAliases": [
       "chp",
       "chainedhandlerp"

diff --git a/...imperative/plugins/test_plugins/error_plugins/definition_bad_chained_handler/package.json b/...imperative/plugins/test_plugins/error_plugins/definition_bad_chained_handler/package.json
@@ -10,7 +10,6 @@
     "name": "definition_bad_chained_handler",
     "rootCommandDescription": "definition bad chained handler",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ackages/imperative/plugins/test_plugins/error_plugins/definition_empty_array/package.json b/...ackages/imperative/plugins/test_plugins/error_plugins/definition_empty_array/package.json
@@ -10,7 +10,6 @@
     "name": "definition_empty_array",
     "rootCommandDescription": "definition empty array",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": []
   },
   "peerDependencies": {

diff --git a/...perative/plugins/test_plugins/error_plugins/definition_empty_chained_handler/package.json b/...perative/plugins/test_plugins/error_plugins/definition_empty_chained_handler/package.json
@@ -10,7 +10,6 @@
     "name": "definition_empty_chained_handler",
     "rootCommandDescription": "definition empty chained handler",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...rative/plugins/test_plugins/error_plugins/definition_missing_chained_handler/package.json b/...rative/plugins/test_plugins/error_plugins/definition_missing_chained_handler/package.json
@@ -10,7 +10,6 @@
     "name": "definition_missing_chained_handler",
     "rootCommandDescription": "definition missing chained handler",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...imperative/plugins/test_plugins/error_plugins/definition_missing_description/package.json b/...imperative/plugins/test_plugins/error_plugins/definition_missing_description/package.json
@@ -10,7 +10,6 @@
     "name": "definition_missing_description",
     "rootCommandDescription": "definition missing description",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ges/imperative/plugins/test_plugins/error_plugins/definition_missing_handler/package.json b/...ges/imperative/plugins/test_plugins/error_plugins/definition_missing_handler/package.json
@@ -10,7 +10,6 @@
     "name": "definition_missing_handler",
     "rootCommandDescription": "definition missing handler",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ckages/imperative/plugins/test_plugins/error_plugins/definition_missing_name/package.json b/...ckages/imperative/plugins/test_plugins/error_plugins/definition_missing_name/package.json
@@ -10,7 +10,6 @@
     "name": "definition_missing_name",
     "rootCommandDescription": "definition missing name",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "description": "dummy foo command",

diff --git a/...ckages/imperative/plugins/test_plugins/error_plugins/definition_missing_type/package.json b/...ckages/imperative/plugins/test_plugins/error_plugins/definition_missing_type/package.json
@@ -10,7 +10,6 @@
     "name": "definition_missing_type",
     "rootCommandDescription": "definition missing type",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ve/plugins/test_plugins/error_plugins/definition_type_group_without_children/package.json b/...ve/plugins/test_plugins/error_plugins/definition_type_group_without_children/package.json
@@ -10,7 +10,6 @@
     "name": "definition_type_group_without_children",
     "rootCommandDescription": "definition type group without children",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...es/imperative/plugins/test_plugins/error_plugins/duplicated_base_cli_command/package.json b/...es/imperative/plugins/test_plugins/error_plugins/duplicated_base_cli_command/package.json
@@ -10,7 +10,6 @@
     "name": "plugins",
     "rootCommandDescription": "duplicated base cli command",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ative/plugins/test_plugins/error_plugins/duplicated_installed_plugin_command/package.json b/...ative/plugins/test_plugins/error_plugins/duplicated_installed_plugin_command/package.json
@@ -10,7 +10,6 @@
     "name": "normal-plugin",
     "rootCommandDescription": "duplicated installed plugin command",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...mperative/plugins/test_plugins/error_plugins/incompatible_imperative_version/package.json b/...mperative/plugins/test_plugins/error_plugins/incompatible_imperative_version/package.json
@@ -10,7 +10,6 @@
     "name": "incompatible_imperative_version",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^2.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ckages/imperative/plugins/test_plugins/error_plugins/missing_command_handler/package.json b/...ckages/imperative/plugins/test_plugins/error_plugins/missing_command_handler/package.json
@@ -10,7 +10,6 @@
     "name": "missing_command_handler",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...c/packages/imperative/plugins/test_plugins/error_plugins/missing_definitions/package.json b/...c/packages/imperative/plugins/test_plugins/error_plugins/missing_definitions/package.json
@@ -9,8 +9,7 @@
   "imperative": {
     "name": "missing_definitions",
     "rootCommandDescription": "missing definitions",
-    "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler"
+    "pluginBaseCliVersion": "^1.0.0"
   },
   "peerDependencies": {
     "@zowe/imperative": "1.0.0"

diff --git a/.../packages/imperative/plugins/test_plugins/error_plugins/missing_dependencies/package.json b/.../packages/imperative/plugins/test_plugins/error_plugins/missing_dependencies/package.json
@@ -10,7 +10,6 @@
     "name": "missing_dependencies",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...es/imperative/plugins/test_plugins/error_plugins/missing_healthcheck_handler/package.json b/...es/imperative/plugins/test_plugins/error_plugins/missing_healthcheck_handler/package.json
@@ -10,7 +10,6 @@
     "name": "missing_healthcheck_handler",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./non_existing_path",
     "definitions": [
       {
         "name": "foo",

diff --git a/...s/imperative/plugins/test_plugins/error_plugins/missing_pluginBaseCliVersion/package.json b/...s/imperative/plugins/test_plugins/error_plugins/missing_pluginBaseCliVersion/package.json
@@ -9,7 +9,6 @@
   "imperative": {
     "name": "missing_pluginBaseCliVersion",
     "rootCommandDescription": "imperative working test plugin",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/.../imperative/plugins/test_plugins/error_plugins/missing_pluginHealthCheck/dummy.handler.js b/.../imperative/plugins/test_plugins/error_plugins/missing_pluginHealthCheck/dummy.handler.js
diff --git a/...ages/imperative/plugins/test_plugins/error_plugins/missing_pluginHealthCheck/package.json b/...ages/imperative/plugins/test_plugins/error_plugins/missing_pluginHealthCheck/package.json
diff --git a/...imperative/plugins/test_plugins/error_plugins/missing_rootCommandDescription/package.json b/...imperative/plugins/test_plugins/error_plugins/missing_rootCommandDescription/package.json
@@ -9,7 +9,6 @@
   "imperative": {
     "name": "missing_rootCommandDescription",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ages/imperative/plugins/test_plugins/error_plugins/profile_dup_in_plugin/configuration.js b/...ages/imperative/plugins/test_plugins/error_plugins/profile_dup_in_plugin/configuration.js
diff --git a/...kages/imperative/plugins/test_plugins/error_plugins/profile_dup_with_cli/configuration.js b/...kages/imperative/plugins/test_plugins/error_plugins/profile_dup_with_cli/configuration.js
diff --git a/...e/__tests__/src/packages/imperative/plugins/test_plugins/missing_name_plugin/package.json b/...e/__tests__/src/packages/imperative/plugins/test_plugins/missing_name_plugin/package.json
@@ -9,7 +9,6 @@
   "imperative": {
     "rootCommandDescription": "missing name plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./dummy.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...erative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin/package.json b/...erative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin/package.json
@@ -10,7 +10,6 @@
     "name": "normal-plugin",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./lib/sample-plugin/healthCheck.handler",
     "pluginAliases": [
       "np",
       "normalp"

diff --git a/...ative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_2/package.json b/...ative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_2/package.json
@@ -10,7 +10,6 @@
     "name": "normal-plugin-2",
     "rootCommandDescription": "imperative working test plugin 2",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./lib/sample-plugin/healthCheck.handler",
     "definitions": [
       {
         "name": "foo",

diff --git a/...ckages/imperative/plugins/test_plugins/normal_plugin_3/lib/sample-plugin/configuration.js b/...ckages/imperative/plugins/test_plugins/normal_plugin_3/lib/sample-plugin/configuration.js
diff --git a/...ve/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_misc/package.json b/...ve/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_misc/package.json
@@ -10,7 +10,6 @@
     "name": "normal-plugin-misc",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./lib/sample-plugin/healthCheck.handler",
     "pluginAliases": [
       "misc"
     ],

diff --git a/...ative/__tests__/src/packages/imperative/plugins/test_plugins/override_plugin/package.json b/...ative/__tests__/src/packages/imperative/plugins/test_plugins/override_plugin/package.json
@@ -10,7 +10,6 @@
     "name": "override-plugin",
     "rootCommandDescription": "imperative override plugin rootCommandDescription",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./lib/sample-plugin/healthCheck.handler",
     "overrides": {
       "CredentialManager": "./sample-plugin/overrides/CredentialManager.override"
     },

diff --git a/.../__tests__/src/packages/imperative/plugins/test_plugins/space in path plugin/package.json b/.../__tests__/src/packages/imperative/plugins/test_plugins/space in path plugin/package.json
@@ -10,7 +10,6 @@
     "name": "space-in-path-plugin",
     "rootCommandDescription": "imperative working test plugin",
     "pluginBaseCliVersion": "^1.0.0",
-    "pluginHealthCheck": "./lib/sample-plugin/healthCheck.handler",
     "pluginAliases": [
       "np",
       "normalp"

diff --git a/packages/imperative/src/cmd/__tests__/utils/CommandUtils.unit.test.ts b/packages/imperative/src/cmd/__tests__/utils/CommandUtils.unit.test.ts
@@ -89,7 +89,7 @@ describe("Command Utils", () => {
     });
 
     it("We should be able to flatten a nested command tree with aliases for display and searching purposes", () => {
-        const flatten: ICommandTreeEntry[] = CommandUtils.flattenCommandTreeWithAliases(COMPLEX_COMMAND_WITH_ALIASES);
+        const flatten: ICommandTreeEntry[] = CommandUtils.flattenCommandTree(COMPLEX_COMMAND_WITH_ALIASES);
         TestLogger.info("Flattened Command Tree:\n" + inspect(flatten));
         expect(flatten).toMatchSnapshot();
     });