@broadcom/ops-for-zowe-cli 4.1.1 → 5.0.0-next.202401221923

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
 "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
 This software and all information contained therein is

package/README.md

@@ -42,27 +42,23 @@ To install the OPS/MVS® plug-in to the Zowe CLI from source, issue the followin
     $ zowe plugins validate @broadcom/ops-for-zowe-cli
     ```
 
-**Note:** For more information about using the install command,
-see [Manage Plug-ins.](**REMOVED**)
-
 ## Uninstall the OPS/MVS® Plug-in From Zowe CLI
 To uninstall the plug-in from Zowe CLI, issue the following command:
 ```sh
 $ zowe plugins uninstall @broadcom/ops-for-zowe-cli
 ```
 
-**Note:** For more information about using the uninstall command,
-see [Manage Plug-ins.](**REMOVED**)
-
 ### Create an OPS/MVS® Profile
 
 To create an OPS/MVS® plug-in profile gather the following data:
-- The host name of the LPAR on which OPS/MVS® Web Services is running
-- The OPS/MVS® Web Services port number
-- A user name that has authority to access OPS/MVS® Web Services
-- The password to the account tied to the user name
+- The host name of the LPAR on which OPS/MVS® Web Services or OPS/MVS® REST API server is running
+- The OPS/MVS® Web Services or OPS/MVS® REST API server port number
+- A user name that has authority to access OPS/MVS® Web Services or OPS/MVS® REST API server
+- The password to the account assigned to the user name
 
-To create an OPS/MVS® profile, issue the following command:
+To create an OPS/MVS® profile, edit the "global config" located at ~/'.zowe/zowe.config.json' file:
 ```sh
-$ zowe profiles create ops myLPAR --hostname mylpar.example.com --port 1234 --username myself --password fakepassword
+$ zowe config edit --gc
 ```
+NOTE: See the 'zowe.config.example.json' file in this project for examples of 
+profiles for both OPS/MVS® Web Services or OPS/MVS® REST API server.

package/lib/api/OpsProfilesConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is
@@ -23,59 +23,63 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpsProfilesConfig = void 0;
-const utils_1 = require("./utils");
+const OpsRestUtils_1 = require("./utils/OpsRestUtils");
 exports.OpsProfilesConfig = [
     {
         type: "ops",
         schema: {
             type: "object",
-            title: "OPS Web Services session profile",
-            description: "The OPS Web Services session profile schema, where you specify your session information and credentials",
+            title: "OPS/MVS Web Services / REST API session profile",
+            description: "The OPS/MVS Web Services / REST API session profile schema, where you specify your session information and credentials",
             properties: {
                 host: {
-                    optionDefinition: utils_1.OpsRestUtils.HOST_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.HOST_OPTION,
                     type: "string",
                 },
                 port: {
-                    optionDefinition: utils_1.OpsRestUtils.PORT_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.PORT_OPTION,
                     type: "number",
                 },
                 user: {
-                    optionDefinition: utils_1.OpsRestUtils.USER_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.USER_OPTION,
                     secure: true,
                     type: "string",
                 },
                 password: {
-                    optionDefinition: utils_1.OpsRestUtils.PASSWORD_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.PASSWORD_OPTION,
                     secure: true,
                     type: "string",
                 },
                 protocol: {
-                    optionDefinition: utils_1.OpsRestUtils.PROTOCOL_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.PROTOCOL_OPTION,
                     type: "string"
                 },
                 rejectUnauthorized: {
-                    optionDefinition: utils_1.OpsRestUtils.REJECT_UNAUTHORIZED_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.REJECT_UNAUTHORIZED_OPTION,
                     type: "boolean"
                 },
                 subsystem: {
-                    optionDefinition: utils_1.OpsRestUtils.SUBSYSTEM_OPTION,
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.SUBSYSTEM_OPTION,
                     type: "string"
+                },
+                restApi: {
+                    optionDefinition: OpsRestUtils_1.OpsRestUtils.RESTAPI_OPTION,
+                    type: "boolean"
                 }
             },
+            // required: ["host", "port"],
         },
-        // validationPlanModule: __dirname + "/OpsProfileValidationPlan",
         createProfileExamples: [
             {
                 options: "myLPAR --host lpar123 --port 8080 --user ibmuser --password !@#$^ --prot http --reject-unauthorized false",
-                description: "Create an OPS profile called 'myLPAR' to connect to OPS Web Services at host lpar123 and port 8080, " +
+                description: "Create an OPS profile called 'myLPAR' to connect to OPS/MVS REST API at host lpar123 and port 8080, " +
                     "using http protocol, allowing self-signed certificates"
             }
         ],
         updateProfileExamples: [
             {
                 options: "myLPAR --host lpar456",
-                description: "Update an OPS profile called 'myLPAR' to connect to OPS Web Services at host lpar456"
+                description: "Update an OPS profile called 'myLPAR' to connect to OPS/MVS Web Services at host lpar456"
             },
             {
                 options: "myLPAR --user user101 --password Km5sv78",

package/lib/api/OpsProfilesConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpsProfilesConfig.js","sourceRoot":"","sources":["../../src/api/OpsProfilesConfig.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,mCAAqC;AAExB,QAAA,iBAAiB,GAAwC;IAClE;QACI,IAAI,EAAE,KAAK;QACX,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,kCAAkC;YACzC,WAAW,EAAE,yGAAyG;YACtH,UAAU,EAAE;gBACR,IAAI,EAAE;oBACF,gBAAgB,EAAE,oBAAY,CAAC,WAAW;oBAC1C,IAAI,EAAE,QAAQ;iBACjB;gBACD,IAAI,EAAE;oBACF,gBAAgB,EAAE,oBAAY,CAAC,WAAW;oBAC1C,IAAI,EAAE,QAAQ;iBACjB;gBACD,IAAI,EAAE;oBACF,gBAAgB,EAAE,oBAAY,CAAC,WAAW;oBAC1C,MAAM,EAAE,IAAI;oBACZ,IAAI,EAAE,QAAQ;iBACjB;gBACD,QAAQ,EAAE;oBACN,gBAAgB,EAAE,oBAAY,CAAC,eAAe;oBAC9C,MAAM,EAAE,IAAI;oBACZ,IAAI,EAAE,QAAQ;iBACjB;gBACD,QAAQ,EAAE;oBACN,gBAAgB,EAAE,oBAAY,CAAC,eAAe;oBAC9C,IAAI,EAAE,QAAQ;iBACjB;gBACD,kBAAkB,EAAE;oBAChB,gBAAgB,EAAE,oBAAY,CAAC,0BAA0B;oBACzD,IAAI,EAAE,SAAS;iBAClB;gBACD,SAAS,EAAE;oBACP,gBAAgB,EAAE,oBAAY,CAAC,gBAAgB;oBAC/C,IAAI,EAAE,QAAQ;iBACjB;aACJ;SAEJ;QACD,iEAAiE;QACjE,qBAAqB,EAAE;YACnB;gBACI,OAAO,EAAE,2GAA2G;gBACpH,WAAW,EAAE,sGAAsG;oBAC/G,wDAAwD;aAC/D;SACJ;QACD,qBAAqB,EAAE;YACnB;gBACI,OAAO,EAAE,uBAAuB;gBAChC,WAAW,EAAE,sFAAsF;aACtG;YACD;gBACI,OAAO,EAAE,0CAA0C;gBACnD,WAAW,EAAE,sFAAsF;aACtG;SACJ;KACJ;CACJ,CAAC"}
+{"version":3,"file":"OpsProfilesConfig.js","sourceRoot":"","sources":["../../src/api/OpsProfilesConfig.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,uDAAoD;AAEvC,QAAA,iBAAiB,GAAuC;IACjE;QACI,IAAI,EAAE,KAAK;QACX,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,iDAAiD;YACxD,WAAW,EAAE,wHAAwH;YACrI,UAAU,EAAE;gBACR,IAAI,EAAE;oBACF,gBAAgB,EAAE,2BAAY,CAAC,WAAW;oBAC1C,IAAI,EAAE,QAAQ;iBACjB;gBACD,IAAI,EAAE;oBACF,gBAAgB,EAAE,2BAAY,CAAC,WAAW;oBAC1C,IAAI,EAAE,QAAQ;iBACjB;gBACD,IAAI,EAAE;oBACF,gBAAgB,EAAE,2BAAY,CAAC,WAAW;oBAC1C,MAAM,EAAE,IAAI;oBACZ,IAAI,EAAE,QAAQ;iBACjB;gBACD,QAAQ,EAAE;oBACN,gBAAgB,EAAE,2BAAY,CAAC,eAAe;oBAC9C,MAAM,EAAE,IAAI;oBACZ,IAAI,EAAE,QAAQ;iBACjB;gBACD,QAAQ,EAAE;oBACN,gBAAgB,EAAE,2BAAY,CAAC,eAAe;oBAC9C,IAAI,EAAE,QAAQ;iBACjB;gBACD,kBAAkB,EAAE;oBAChB,gBAAgB,EAAE,2BAAY,CAAC,0BAA0B;oBACzD,IAAI,EAAE,SAAS;iBAClB;gBACD,SAAS,EAAE;oBACP,gBAAgB,EAAE,2BAAY,CAAC,gBAAgB;oBAC/C,IAAI,EAAE,QAAQ;iBACjB;gBACD,OAAO,EAAE;oBACL,gBAAgB,EAAE,2BAAY,CAAC,cAAc;oBAC7C,IAAI,EAAE,SAAS;iBAClB;aACJ;YACD,8BAA8B;SACjC;QACD,qBAAqB,EAAE;YACnB;gBACI,OAAO,EAAE,2GAA2G;gBACpH,WAAW,EAAE,sGAAsG;oBAC/G,wDAAwD;aAC/D;SACJ;QACD,qBAAqB,EAAE;YACnB;gBACI,OAAO,EAAE,uBAAuB;gBAChC,WAAW,EAAE,0FAA0F;aAC1G;YACD;gBACI,OAAO,EAAE,0CAA0C;gBACnD,WAAW,EAAE,sFAAsF;aACtG;SACJ;KACJ;CACJ,CAAC"}

package/lib/api/Show.d.ts

@@ -0,0 +1,6 @@
+import { IHandlerParameters, Session } from "@zowe/imperative";
+import { IShowRuleResponse } from "./doc/IShowRuleResponse";
+import { IShowResourceResponse } from "./doc/IShowResourceResponse";
+export declare function showRule(session: Session, ruleSetName: string, ruleName: string, restApi: boolean, subSystem: string): Promise<IShowRuleResponse>;
+export declare function showResource(session: Session, resourceName: string, restApi: boolean, table: string, subsystem: string): Promise<IShowResourceResponse>;
+export declare function showRuleset(session: Session, ruleSetName: string, restApi: boolean, subSystem: string, params: IHandlerParameters): Promise<IShowRuleResponse>;

package/lib/api/Show.js

@@ -0,0 +1,67 @@
+"use strict";
+/*
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
+ * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+ *
+ * This software and all information contained therein is
+ * confidential and proprietary and shall not be duplicated,
+ * used, disclosed, or disseminated in any way except as
+ * authorized by the applicable license agreement, without the
+ * express written permission of Broadcom.  All authorized
+ * reproductions must be marked with this language.
+ *
+ * EXCEPT AS SET FORTH IN THE APPLICABLE LICENSE AGREEMENT, TO
+ * THE EXTENT PERMITTED BY APPLICABLE LAW, BROADCOM PROVIDES THIS
+ * SOFTWARE WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
+ * LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT WILL BROADCOM
+ * BE LIABLE TO THE END USER OR ANY THIRD PARTY FOR ANY LOSS OR
+ * DAMAGE, DIRECT OR INDIRECT, FROM THE USE OF THIS SOFTWARE,
+ * INCLUDING WITHOUT LIMITATION, LOST PROFITS, BUSINESS
+ * INTERRUPTION, GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS
+ * EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.showRuleset = exports.showResource = exports.showRule = void 0;
+const RuleUtils_1 = require("./utils/RuleUtils");
+const RulesetUtils_1 = require("./utils/RulesetUtils");
+const SSMUtils_1 = require("./utils/SSMUtils");
+const constants_1 = require("./constants");
+const OpsRestClient_1 = require("./utils/OpsRestClient");
+function showRule(session, ruleSetName, ruleName, restApi, subSystem) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ruleUrl = RuleUtils_1.RuleUtils.getRuleURL(session, ruleSetName, ruleName, restApi, subSystem);
+        return OpsRestClient_1.OpsRestClient.getExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers);
+    });
+}
+exports.showRule = showRule;
+function showResource(session, resourceName, restApi, table, subsystem) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const resourceUrl = SSMUtils_1.SSMUtils.getResourceURL(session, resourceName, restApi, table, subsystem);
+        return OpsRestClient_1.OpsRestClient.getExpectJSON(session, resourceUrl, constants_1.OpsConstants.headers);
+    });
+}
+exports.showResource = showResource;
+function showRuleset(session, ruleSetName, restApi, subSystem, params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (restApi) {
+            const rulesetUrl = RulesetUtils_1.RulesetUtils.getRulesetURL(session, ruleSetName, restApi, subSystem);
+            return OpsRestClient_1.OpsRestClient.getExpectJSON(session, rulesetUrl, constants_1.OpsConstants.headers);
+        }
+        else {
+            // Display message indicating 'show ruleset' not supported with web services
+            params.response.console.log("Command 'show ruleset' is only supported with the OPS/MVS REST API server");
+        }
+    });
+}
+exports.showRuleset = showRuleset;
+//# sourceMappingURL=Show.js.map

package/lib/api/Show.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Show.js","sourceRoot":"","sources":["../../src/api/Show.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;AAGH,iDAA8C;AAC9C,uDAAoD;AACpD,+CAA4C;AAC5C,2CAA2C;AAG3C,yDAAsD;AAEtD,SAAsB,QAAQ,CAAC,OAAgB,EAAE,WAAmB,EAAE,QAAgB,EAAE,OAAgB,EACzE,SAAiB;;QAC5C,MAAM,OAAO,GAAG,qBAAS,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACzF,OAAO,6BAAa,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,wBAAY,CAAC,OAAO,CAAC,CAAC;IAC/E,CAAC;CAAA;AAJD,4BAIC;AAED,SAAsB,YAAY,CAAC,OAAgB,EAAE,YAAoB,EAAE,OAAgB,EAAE,KAAa,EACvE,SAAiB;;QAChD,MAAM,WAAW,GAAG,mBAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC9F,OAAO,6BAAa,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,wBAAY,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;CAAA;AAJD,oCAIC;AAED,SAAsB,WAAW,CAAC,OAAgB,EAAE,WAAmB,EAAE,OAAgB,EACvD,SAAiB,EAAE,MAA0B;;QAE3E,IAAI,OAAO,EAAE;YACT,MAAM,UAAU,GAAG,2BAAY,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YACxF,OAAO,6BAAa,CAAC,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,wBAAY,CAAC,OAAO,CAAC,CAAC;SACjF;aAAM;YACH,4EAA4E;YAC5E,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC;SAC5G;IACL,CAAC;CAAA;AAVD,kCAUC"}

package/lib/api/{methods/update/Update.d.ts → Update.d.ts}

@@ -1,8 +1,8 @@
 import { Session } from "@zowe/imperative";
 export declare function updateRule(session: Session, ruleSetName: string, ruleName: string, newStatus: string, // eslint-disable-line
-subSystem?: string): Promise<{}>;
+restApi: boolean, subSystem?: string): Promise<{}>;
 /**
  * updateResource
  */
-export declare function updateResource(session: Session, resource: string, desiredState: string, subsystem?: string, // eslint-disable-line
+export declare function updateResource(session: Session, resource: string, restApi: boolean, desiredState: string, subsystem?: string, // eslint-disable-line
 table?: string, wait?: number): Promise<{}>;

package/lib/api/{methods/update/Update.js → Update.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is
@@ -33,36 +33,52 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateResource = exports.updateRule = void 0;
 const imperative_1 = require("@zowe/imperative");
-const constants_1 = require("../../constants");
-const utils_1 = require("../../utils");
-const ResourceParameterDefinitions_1 = require("../../../cli/ResourceParameterDefinitions");
-const show_1 = require("../show");
+const constants_1 = require("./constants");
+const RuleUtils_1 = require("./utils/RuleUtils");
+const SSMUtils_1 = require("./utils/SSMUtils");
+const ResourceParameterDefinitions_1 = require("../cli/ResourceParameterDefinitions");
+const Show_1 = require("./Show");
+const OpsRestClient_1 = require("./utils/OpsRestClient");
 function updateRule(session, ruleSetName, ruleName, newStatus, // eslint-disable-line
-subSystem) {
+restApi, subSystem) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ruleUrl = utils_1.RuleUtils.getRuleURL(session, ruleSetName, ruleName, subSystem);
-        const postBody = {
+        const ruleUrl = RuleUtils_1.RuleUtils.getRuleURL(session, ruleSetName, ruleName, restApi, subSystem);
+        const body = {
             status: newStatus
         };
-        return imperative_1.RestClient.postExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers, postBody);
+        if (restApi === false) {
+            return OpsRestClient_1.OpsRestClient.postExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers, body);
+        }
+        else {
+            return OpsRestClient_1.OpsRestClient.putExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers, body);
+        }
     });
 }
 exports.updateRule = updateRule;
 /**
  * updateResource
  */
-function updateResource(session, resource, desiredState, subsystem, // eslint-disable-line
+function updateResource(session, resource, restApi, desiredState, subsystem, // eslint-disable-line
 table, wait) {
     return __awaiter(this, void 0, void 0, function* () {
         if (wait != null) {
-            imperative_1.ImperativeExpect.toBeEqual(wait > 0 && wait <= ResourceParameterDefinitions_1.ResourceParameterDefinitions.ONE_DAY, true, "Wait value must be between 0 and " + ResourceParameterDefinitions_1.ResourceParameterDefinitions.ONE_DAY + "(inclusive) if specified. " +
+            imperative_1.ImperativeExpect.toBeEqual(wait > 0 && wait <= ResourceParameterDefinitions_1.ResourceParameterDefinitions.ONE_DAY, true, "Wait value must be between 0 and " + ResourceParameterDefinitions_1.ResourceParameterDefinitions.ONE_DAY + " (inclusive), if specified. " +
                 "You specified: " + wait);
         }
-        const resourceUrl = utils_1.SSMUtils.getResourceURL(session, resource, table, subsystem);
+        const resourceUrl = SSMUtils_1.SSMUtils.getResourceURLWithQueryParms(session, resource, restApi, table, subsystem);
         const postBody = {
             desired: desiredState
         };
-        const response = yield imperative_1.RestClient.postExpectJSON(session, resourceUrl, constants_1.OpsConstants.headers, postBody);
+        const postBodyRestApi = {
+            desiredState: desiredState
+        };
+        let response;
+        if (restApi) {
+            response = yield OpsRestClient_1.OpsRestClient.putExpectJSON(session, resourceUrl, constants_1.OpsConstants.headers, postBodyRestApi);
+        }
+        else {
+            response = yield OpsRestClient_1.OpsRestClient.postExpectJSON(session, resourceUrl, constants_1.OpsConstants.headers, postBody);
+        }
         if (wait == null) {
             // if we're not waiting, just return immediately
             return response;
@@ -70,19 +86,31 @@ table, wait) {
         else {
             // we are waiting, so set up the polling to determine if current = desired state
             // did we happen to instantly start/ stop the resource the first time? check
-            if (response.ssmresource[0].current.toUpperCase() === desiredState.toUpperCase()) {
-                return response;
+            let currentState = "";
+            if (restApi) {
+                if (response.currentState.toUpperCase() === desiredState.toUpperCase())
+                    return response;
+                currentState = response.currentState;
+            }
+            else {
+                if (response.ssmresource[0].current.toUpperCase() === desiredState.toUpperCase())
+                    return response;
+                currentState = response.ssmresource[0].current;
             }
             // otherwise we have to poll
             let pollResponse;
-            let currentState = response.ssmresource[0].current;
             const ONE_SECOND = 1000;
             const start = new Date().getTime();
             // looping with 'wait' value as max was taking approximately twice the requested time
             // so use the actual time to calculate when the 'wait' time is exceeded
             while (((new Date().getTime() - start) / ONE_SECOND) < wait) {
-                pollResponse = yield show_1.showResource(session, resource, table, subsystem);
-                currentState = pollResponse.ssmresource[0].current;
+                pollResponse = yield (0, Show_1.showResource)(session, resource, restApi, table, subsystem);
+                if (restApi) {
+                    currentState = pollResponse[0].currentState;
+                }
+                else {
+                    currentState = pollResponse.ssmresource[0].current;
+                }
                 if (currentState.toUpperCase() === desiredState.toUpperCase()) {
                     // successfully waited until the desired state equaled the current state
                     return pollResponse;

package/lib/api/Update.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Update.js","sourceRoot":"","sources":["../../src/api/Update.ts"],"names":[],"mappings":"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"}

package/lib/api/constants/Ops.constants.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is
@@ -30,12 +30,14 @@ exports.OpsConstants = {
     APP_URL: "/opsmvs/api",
     VERSION: "v1",
     BASE_URL: "/opsmvs/api/v1",
-    AOF_URL: "/opsmvs/api/v1/aof",
-    RULESET_URL: "/opsmvs/api/v1/aof/rulesets",
+    AOF_URL: "/api/v1/aof",
+    OPSMVS_URL: "/opsmvs",
+    RULES_URL: "/api/v1/aof/rules",
+    RULESET_URL: "/api/v1/aof/rulesets",
     RULE_URL: "/rules",
     STATUS_URL: "/status",
-    SSM_URL: "/opsmvs/api/v1/ssm",
-    RESOURCES_URL: "/opsmvs/api/v1/ssm/resources",
+    SSM_URL: "/api/v1/ssm",
+    RESOURCES_URL: "/api/v1/ssm/resources",
     STATE_URL: "/state",
     headers: [{ "Content-Type": "application/json" }, { Accept: "application/json" }]
 };

package/lib/api/constants/Ops.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"Ops.constants.js","sourceRoot":"","sources":["../../../src/api/constants/Ops.constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH;;GAEG;AACU,QAAA,YAAY,GAA2B;IAChD,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,gBAAgB;IAC1B,OAAO,EAAE,oBAAoB;IAC7B,WAAW,EAAE,6BAA6B;IAC1C,QAAQ,EAAE,QAAQ;IAClB,UAAU,EAAE,SAAS;IACrB,OAAO,EAAE,oBAAoB;IAC7B,aAAa,EAAE,8BAA8B;IAC7C,SAAS,EAAE,QAAQ;IACnB,OAAO,EAAE,CAAC,EAAC,cAAc,EAAE,kBAAkB,EAAC,EAAE,EAAC,MAAM,EAAG,kBAAkB,EAAC,CAAC;CACjF,CAAC"}
+{"version":3,"file":"Ops.constants.js","sourceRoot":"","sources":["../../../src/api/constants/Ops.constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH;;GAEG;AACU,QAAA,YAAY,GAA2B;IAChD,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,gBAAgB;IAC1B,OAAO,EAAE,aAAa;IACtB,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,mBAAmB;IAC9B,WAAW,EAAE,sBAAsB;IACnC,QAAQ,EAAE,QAAQ;IAClB,UAAU,EAAE,SAAS;IACrB,OAAO,EAAE,aAAa;IACtB,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,QAAQ;IACnB,OAAO,EAAE,CAAC,EAAC,cAAc,EAAE,kBAAkB,EAAC,EAAE,EAAC,MAAM,EAAG,kBAAkB,EAAC,CAAC;CACjF,CAAC"}

package/lib/api/constants/PluginConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is

package/lib/api/constants/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is
@@ -23,13 +23,17 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Ops.constants"), exports);

package/lib/api/constants/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/constants/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;AAEH,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/constants/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;;;;;AAEH,kDAAgC"}

package/lib/api/doc/IShowResourceResponse.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is

package/lib/api/doc/IShowRuleResponse.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is

package/lib/api/doc/IShowRulesetResponse.d.ts

@@ -0,0 +1,12 @@
+export interface IShowRulesetResponse {
+    count: number;
+    schemaVersion: string;
+    aofruleset: Array<{
+        sysplex: string;
+        system: string;
+        subsystem: string;
+        ruleset: string;
+        status: string;
+        autoEnabled: string;
+    }>;
+}

package/lib/api/{methods/update/index.js → doc/IShowRulesetResponse.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is
@@ -21,16 +21,5 @@
  * INTERRUPTION, GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS
  * EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Update"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=IShowRulesetResponse.js.map

package/lib/api/doc/IShowRulesetResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IShowRulesetResponse.js","sourceRoot":"","sources":["../../../src/api/doc/IShowRulesetResponse.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG"}

package/lib/api/index.d.ts

@@ -1,3 +1,6 @@
-export * from "./methods";
+export * from "./Show";
+export * from "./Update";
 export * from "./constants";
 export * from "./utils";
+export * from "./doc/IShowResourceResponse";
+export * from "./doc/IShowRuleResponse";

package/lib/api/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is
@@ -23,16 +23,23 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./methods"), exports);
+__exportStar(require("./Show"), exports);
+__exportStar(require("./Update"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./doc/IShowResourceResponse"), exports);
+__exportStar(require("./doc/IShowRuleResponse"), exports);
 //# sourceMappingURL=index.js.map

package/lib/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;AAEH,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;;;;;AAEH,yCAAuB;AACvB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,8DAA4C;AAC5C,0DAAwC"}

package/lib/api/utils/IOpsRestResponse.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2019 Broadcom.  All Rights Reserved.  The term
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
  * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This software and all information contained therein is

package/lib/api/utils/OpsRestClient.d.ts

@@ -0,0 +1,15 @@
+import { IImperativeError, Logger, RestClient } from "@zowe/imperative";
+export declare class OpsRestClient extends RestClient {
+    /**
+     * Use the Zowe logger instead of the imperative logger
+     * @type {Logger}
+     */
+    get log(): Logger;
+    /**
+     * Process an error encountered in the rest client
+     * @param {IImperativeError} original - the original error automatically built by the abstract rest client
+     * @returns {IImperativeError} - the processed error with details added
+     * @memberof ZosmfRestClient
+     */
+    protected processError(original: IImperativeError): IImperativeError;
+}

package/lib/api/utils/OpsRestClient.js

@@ -0,0 +1,66 @@
+"use strict";
+/*
+ * Copyright (c) 2024 Broadcom.  All Rights Reserved.  The term
+ * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+ *
+ * This software and all information contained therein is
+ * confidential and proprietary and shall not be duplicated,
+ * used, disclosed, or disseminated in any way except as
+ * authorized by the applicable license agreement, without the
+ * express written permission of Broadcom.  All authorized
+ * reproductions must be marked with this language.
+ *
+ * EXCEPT AS SET FORTH IN THE APPLICABLE LICENSE AGREEMENT, TO
+ * THE EXTENT PERMITTED BY APPLICABLE LAW, BROADCOM PROVIDES THIS
+ * SOFTWARE WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
+ * LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT WILL BROADCOM
+ * BE LIABLE TO THE END USER OR ANY THIRD PARTY FOR ANY LOSS OR
+ * DAMAGE, DIRECT OR INDIRECT, FROM THE USE OF THIS SOFTWARE,
+ * INCLUDING WITHOUT LIMITATION, LOST PROFITS, BUSINESS
+ * INTERRUPTION, GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS
+ * EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpsRestClient = void 0;
+const imperative_1 = require("@zowe/imperative");
+class OpsRestClient extends imperative_1.RestClient {
+    /**
+     * Use the Zowe logger instead of the imperative logger
+     * @type {Logger}
+     */
+    get log() {
+        return imperative_1.Logger.getAppLogger();
+    }
+    /**
+     * Process an error encountered in the rest client
+     * @param {IImperativeError} original - the original error automatically built by the abstract rest client
+     * @returns {IImperativeError} - the processed error with details added
+     * @memberof ZosmfRestClient
+     */
+    processError(original) {
+        original.msg = "OPS REST API Error:\n" + original.msg;
+        let details = original.causeErrors;
+        try {
+            const json = JSON.parse(details);
+            // if we didn't get an error trying to parse json, check if there is a stack
+            // on the JSON error and delete it
+            if (json.stack != null) {
+                this.log.error("An error was encountered in OPS with a stack." +
+                    " Here is the full error before deleting the stack:\n%s", JSON.stringify(json));
+                this.log.error("The stack has been deleted from the error before displaying the error to the user");
+                delete json.stack; // remove the stack field
+            }
+            // if we didn't get an error, make the parsed details part of the error
+            details = imperative_1.TextUtils.prettyJson(json, undefined, false);
+        }
+        catch (e) {
+            // if there's an error, the causeErrors text is not json
+            this.log.debug("Encountered an error trying to parse causeErrors as JSON  - causeErrors is likely not JSON format");
+        }
+        original.msg += "\n" + details; // add the data string which is the original error
+        return original;
+    }
+}
+exports.OpsRestClient = OpsRestClient;
+//# sourceMappingURL=OpsRestClient.js.map