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

package/lib/api/utils/OpsRestClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OpsRestClient.js","sourceRoot":"","sources":["../../../src/api/utils/OpsRestClient.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH,iDAAmF;AAEnF,MAAa,aAAc,SAAQ,uBAAU;IACzC;;;OAGG;IACH,IAAW,GAAG;QACV,OAAO,mBAAM,CAAC,YAAY,EAAE,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACO,YAAY,CAAC,QAA0B;QAC7C,QAAQ,CAAC,GAAG,GAAG,uBAAuB,GAAG,QAAQ,CAAC,GAAG,CAAC;QACtD,IAAI,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC;QACnC,IAAI;YACA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,4EAA4E;YAC5E,kCAAkC;YAClC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+CAA+C;oBAC1D,wDAAwD,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mFAAmF,CAAC,CAAC;gBACpG,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,yBAAyB;aAC/C;YAED,uEAAuE;YACvE,OAAO,GAAG,sBAAS,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;SAC1D;QAAC,OAAO,CAAC,EAAE;YACR,wDAAwD;YACxD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mGAAmG,CAAC,CAAC;SACvH;QACD,QAAQ,CAAC,GAAG,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,kDAAkD;QAClF,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAtCD,sCAsCC"}

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

@@ -1,6 +1,6 @@
 import { ICommandDefinitionPassOn, ICommandOptionDefinition } from "@zowe/imperative";
 /**
- * Class to hold APIs related to OPS Web Services
+ * Class to hold APIs related to OPS/MVS Web Services / REST API
  * @export
  * @class OpsRestUtils
  */
@@ -9,7 +9,7 @@ export declare class OpsRestUtils {
     static readonly VERSION: string;
     static readonly BASE_URL: string;
     static readonly AOF_URL: string;
-    static readonly OPS_CONNECTION_GROUP = "OPS WEB SERVICES CONNECTION OPTIONS";
+    static readonly OPS_CONNECTION_GROUP = "OPS/MVS Web Services / REST API connection options";
     static HOST_OPTION: ICommandOptionDefinition;
     static PORT_OPTION: ICommandOptionDefinition;
     static USER_OPTION: ICommandOptionDefinition;
@@ -17,6 +17,7 @@ export declare class OpsRestUtils {
     static PROTOCOL_OPTION: ICommandOptionDefinition;
     static REJECT_UNAUTHORIZED_OPTION: ICommandOptionDefinition;
     static SUBSYSTEM_OPTION: ICommandOptionDefinition;
+    static RESTAPI_OPTION: ICommandOptionDefinition;
     static OPS_CONNECTION_OPTIONS: ICommandOptionDefinition[];
     /**
      * Using the passOn feature of imperative, we can make all child commands

package/lib/api/utils/OpsRestUtils.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
@@ -24,7 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpsRestUtils = void 0;
 /**
- * Class to hold APIs related to OPS Web Services
+ * Class to hold APIs related to OPS/MVS Web Services / REST API
  * @export
  * @class OpsRestUtils
  */
@@ -36,37 +36,37 @@ OpsRestUtils.VERSION = "v1";
 // public static serviceID: string = "serviceId";
 OpsRestUtils.BASE_URL = OpsRestUtils.APP_URL + "/" + OpsRestUtils.VERSION;
 OpsRestUtils.AOF_URL = OpsRestUtils.BASE_URL + "/aof";
-OpsRestUtils.OPS_CONNECTION_GROUP = "OPS WEB SERVICES CONNECTION OPTIONS";
+OpsRestUtils.OPS_CONNECTION_GROUP = "OPS/MVS Web Services / REST API connection options";
 OpsRestUtils.HOST_OPTION = {
-    description: "The hostname of the server where OPS Web Services is running.",
+    description: "The hostname of the server where OPS/MVS Web Services / REST API is running.",
     type: "string",
     name: "host",
     required: false,
     group: OpsRestUtils.OPS_CONNECTION_GROUP
 };
 OpsRestUtils.PORT_OPTION = {
-    description: "The port number for OPS Web Services.",
+    description: "The port number for OPS/MVS Web Services / REST API.",
     type: "number",
     name: "port", aliases: ["p"],
     required: false,
     group: OpsRestUtils.OPS_CONNECTION_GROUP
 };
 OpsRestUtils.USER_OPTION = {
-    description: "Your z/OS user name used to authenticate to OPS Web Services",
+    description: "Your z/OS user name that is used to authenticate to OPS/MVS Web Services / REST API.",
     type: "string",
     name: "user",
     required: false,
     group: OpsRestUtils.OPS_CONNECTION_GROUP
 };
 OpsRestUtils.PASSWORD_OPTION = {
-    description: "Your z/OS password used to authenticate to OPS Web Services",
+    description: "Your z/OS password that is used to authenticate to OPS/MVS Web Services / REST API.",
     type: "string",
     name: "password", aliases: ["pass"],
     required: false,
     group: OpsRestUtils.OPS_CONNECTION_GROUP
 };
 OpsRestUtils.PROTOCOL_OPTION = {
-    description: "The protocol used for connecting to OPS Web Services",
+    description: "The protocol that is used for connecting to OPS/MVS Web Services / REST API.",
     type: "string",
     name: "protocol", aliases: ["prot"],
     defaultValue: "https",
@@ -89,6 +89,16 @@ OpsRestUtils.SUBSYSTEM_OPTION = {
     description: "Specifies the subsystem id of the OPS/MVS instance to which commands will be directed.",
     type: "string",
     name: "subsystem", aliases: ["subs"],
+    defaultValue: "OPSS",
+    group: OpsRestUtils.OPS_CONNECTION_GROUP
+};
+OpsRestUtils.RESTAPI_OPTION = {
+    description: "If set to true, the plugin executes the command against the OPS/MVS REST API. If " +
+        "set to false, the plugin executes against the OPS/MVS Web Services.",
+    type: "boolean",
+    name: "rest-api", aliases: ["ra"],
+    defaultValue: false,
+    required: false,
     group: OpsRestUtils.OPS_CONNECTION_GROUP
 };
 OpsRestUtils.OPS_CONNECTION_OPTIONS = [
@@ -98,7 +108,8 @@ OpsRestUtils.OPS_CONNECTION_OPTIONS = [
     OpsRestUtils.PORT_OPTION,
     OpsRestUtils.REJECT_UNAUTHORIZED_OPTION,
     OpsRestUtils.PROTOCOL_OPTION,
-    OpsRestUtils.SUBSYSTEM_OPTION
+    OpsRestUtils.SUBSYSTEM_OPTION,
+    OpsRestUtils.RESTAPI_OPTION
 ];
 /**
  * Using the passOn feature of imperative, we can make all child commands

package/lib/api/utils/OpsRestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpsRestUtils.js","sourceRoot":"","sources":["../../../src/api/utils/OpsRestUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAIH;;;;GAIG;AACH,MAAa,YAAY;;AAAzB,oCA6FC;AA3F0B,oBAAO,GAAW,aAAa,CAAC;AAChC,oBAAO,GAAW,IAAI,CAAC;AAC9C,iDAAiD;AAC1B,qBAAQ,GAAG,YAAY,CAAC,OAAO,GAAG,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;AAC7D,oBAAO,GAAW,YAAY,CAAC,QAAQ,GAAG,MAAM,CAAC;AAEjD,iCAAoB,GAAG,qCAAqC,CAAC;AAEtE,wBAAW,GAA6B;IAClD,WAAW,EAAE,+DAA+D;IAC5E,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,wBAAW,GAA6B;IAClD,WAAW,EAAE,uCAAuC;IACpD,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC;IAC5B,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,wBAAW,GAA6B;IAClD,WAAW,EAAE,8DAA8D;IAC3E,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,4BAAe,GAA6B;IACtD,WAAW,EAAE,6DAA6D;IAC1E,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC;IACnC,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,4BAAe,GAA6B;IACtD,WAAW,EAAE,sDAAsD;IACnE,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO;IACrB,eAAe,EAAE;QACb,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;QACzB,aAAa,EAAE,KAAK;KACvB;IACD,QAAQ,EAAE,IAAI;IACd,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,uCAA0B,GAA6B;IACjE,WAAW,EAAE,0FAA0F;QACnG,0DAA0D;IAC9D,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC;IAC5C,YAAY,EAAE,IAAI;IAClB,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,6BAAgB,GAA6B;IACvD,WAAW,EAAE,wFAAwF;IACrG,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,YAAY,CAAC,oBAAoB;CAC3C,CAAC;AAEY,mCAAsB,GAA+B;IAC/D,YAAY,CAAC,WAAW;IACxB,YAAY,CAAC,eAAe;IAC5B,YAAY,CAAC,WAAW;IACxB,YAAY,CAAC,WAAW;IACxB,YAAY,CAAC,0BAA0B;IACvC,YAAY,CAAC,eAAe;IAC5B,YAAY,CAAC,gBAAgB;CAChC,CAAC;AAEF;;;GAGG;AACW,mCAAsB,GAA+B,CAAC;QAChE,WAAW,EAAE,CAAC;gBACV,IAAI,EAAE,OAAO;aAChB,CAAC;QACF,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,YAAY,CAAC,sBAAsB;QAC1C,KAAK,EAAE,IAAI;KACd,CAAC,CAAC"}
+{"version":3,"file":"OpsRestUtils.js","sourceRoot":"","sources":["../../../src/api/utils/OpsRestUtils.ts"],"names":[],"mappings":"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"}

package/lib/api/utils/OpsTextUtils.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
@@ -36,10 +36,19 @@ class OpsTextUtils {
     }
     static handleOpsError(e, params) {
         try {
-            const errors = JSON.parse(e.causeErrors);
-            if (errors.AppInfo !== undefined && errors.AppInfo.Reason !== undefined) {
-                params.response.console.log(OpsTextUtils.colorizeError("OPS Error Details:"));
-                params.response.console.log(errors.AppInfo.Reason);
+            if (params.arguments.restApi) {
+                const errors = JSON.parse(e.causeErrors);
+                if (errors.messages !== undefined && errors.messages[0].messageContent !== undefined) {
+                    params.response.console.log(OpsTextUtils.colorizeError("OPS Error Details:"));
+                    params.response.console.log(errors.messages[0].messageNumber + " " + errors.messages[0].messageContent);
+                }
+            }
+            else {
+                const errors = JSON.parse(e.causeErrors);
+                if (errors.AppInfo !== undefined && errors.AppInfo.Reason !== undefined) {
+                    params.response.console.log(OpsTextUtils.colorizeError("OPS Error Details:"));
+                    params.response.console.log(errors.AppInfo.Reason);
+                }
             }
         }
         catch (jsonError) {

package/lib/api/utils/OpsTextUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpsTextUtils.js","sourceRoot":"","sources":["../../../src/api/utils/OpsTextUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH,iDAAmF;AAEnF,MAAa,YAAY;IAEd,MAAM,CAAC,UAAU,CAAC,IAAY;QACjC,OAAO,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,IAAY;QACpC,OAAO,sBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,IAAY;QACxC,OAAO,sBAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,CAAmB,EAAE,MAA0B;QACxE,IAAI;YACA,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACzC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;gBACrE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC9E,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aACtD;SACJ;QACD,OAAO,SAAS,EAAE;YACd,MAAM,CAAC,CAAC;SACX;IACL,CAAC;CACJ;AA1BD,oCA0BC"}
+{"version":3,"file":"OpsTextUtils.js","sourceRoot":"","sources":["../../../src/api/utils/OpsTextUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH,iDAAmF;AAEnF,MAAa,YAAY;IAEd,MAAM,CAAC,UAAU,CAAC,IAAY;QACjC,OAAO,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,IAAY;QACpC,OAAO,sBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,IAAY;QACxC,OAAO,sBAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,CAAmB,EAAE,MAA0B;QACxE,IAAI;YACA,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE;gBAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;gBACzC,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,KAAK,SAAS,EAAE;oBAClF,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;oBAC9E,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;iBAC3G;aACJ;iBACI;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;gBACzC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;oBACrE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;oBAC9E,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;iBACtD;aACJ;SACJ;QACD,OAAO,SAAS,EAAE;YACd,MAAM,CAAC,CAAC;SACX;IACL,CAAC;CACJ;AAnCD,oCAmCC"}

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

@@ -2,4 +2,5 @@ import { IHandlerParameters } from "@zowe/imperative";
 export declare class RuleListUtils {
     static printRuleStatusResponse(ruleList: any, params: IHandlerParameters): void;
     static printShowRuleResponse(ruleList: any, params: IHandlerParameters): void;
+    static printShowRuleError(params: IHandlerParameters): void;
 }

package/lib/api/utils/RuleListUtils.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
@@ -26,19 +26,46 @@ exports.RuleListUtils = void 0;
 const RuleUtils_1 = require("./RuleUtils");
 class RuleListUtils {
     static printRuleStatusResponse(ruleList, params) {
-        for (let i = 0; i < ruleList.count; i += 1) {
-            const rule = ruleList.aofrule[i];
-            params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(rule.system, rule.ruleset, rule.rule));
-            params.response.console.log(RuleUtils_1.RuleUtils.formatStatusResponse(rule.status, rule.oldStatus));
+        if (params.arguments.restApi === false) {
+            for (let i = 0; i < ruleList.count; i += 1) {
+                const rule = ruleList.aofrule[i];
+                params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(rule.system, rule.ruleset, rule.rule));
+                params.response.console.log(RuleUtils_1.RuleUtils.formatStatusResponse(rule.status, rule.oldStatus));
+            }
+        }
+        else {
+            params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(ruleList.system, ruleList.ruleset, ruleList.rule));
+            params.response.console.log(RuleUtils_1.RuleUtils.formatStatusResponse(ruleList.status, ruleList.oldStatus));
         }
     }
     static printShowRuleResponse(ruleList, params) {
-        for (let i = 0; i < ruleList.count; i += 1) {
-            const rule = ruleList.aofrule[i];
-            params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(rule.system, rule.ruleset, rule.rule));
-            params.response.console.log(RuleUtils_1.RuleUtils.formatShowResponse(rule.status));
+        if (params.arguments.restApi === false) {
+            // Response from Web Services server
+            for (let i = 0; i < ruleList.count; i += 1) {
+                const rule = ruleList.aofrule[i];
+                params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(rule.system, rule.ruleset, rule.rule));
+                params.response.console.log(RuleUtils_1.RuleUtils.formatShowResponse(rule.status));
+            }
+        }
+        else {
+            // Response from REST API server
+            if (ruleList.length > 0) {
+                for (let i = 0; i < ruleList.length; i += 1) {
+                    const rule = ruleList[i];
+                    params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(rule.system, rule.ruleset, rule.rule));
+                    params.response.console.log(RuleUtils_1.RuleUtils.formatShowResponse(rule.status));
+                }
+            }
+            else {
+                params.response.console.log(RuleUtils_1.RuleUtils.formatRuleResponse(ruleList.system, ruleList.ruleset, ruleList.rule));
+                params.response.console.log(RuleUtils_1.RuleUtils.formatShowResponse(ruleList.status));
+            }
         }
     }
+    static printShowRuleError(params) {
+        params.response.console.log("Specifying ruleset = '*' and a specific rule, in this case rule = '"
+            + params.arguments.rule + "', is invalid.");
+    }
 }
 exports.RuleListUtils = RuleListUtils;
 //# sourceMappingURL=RuleListUtils.js.map

package/lib/api/utils/RuleListUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"RuleListUtils.js","sourceRoot":"","sources":["../../../src/api/utils/RuleListUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,2CAAwC;AAExC,MAAa,aAAa;IAEf,MAAM,CAAC,uBAAuB,CAAC,QAAa,EAAE,MAA0B;QAE3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;YACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAChG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;SAC5F;IACL,CAAC;IACM,MAAM,CAAC,qBAAqB,CAAC,QAAa,EAAE,MAA0B;QAEzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;YACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAChG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC1E;IACL,CAAC;CACJ;AAlBD,sCAkBC"}
+{"version":3,"file":"RuleListUtils.js","sourceRoot":"","sources":["../../../src/api/utils/RuleListUtils.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,11 @@
 import { Session } from "@zowe/imperative";
 export declare class RuleUtils {
     /**
-     * setRuleState
+     * setRuleStatus
      */
-    static setRuleStatus(session: Session, ruleSetName: string, ruleName: string, newState: string, subSystem?: string): Promise<{}>;
-    static showRuleStatus(session: Session, ruleSetName: string, ruleName: string, subSystem?: string): Promise<{}>;
-    static getRuleURL(session: Session, ruleSetName: string, ruleName: string, subSystem: string): string;
+    static setRuleStatus(session: Session, ruleSetName: string, ruleName: string, newState: string, restApi: boolean, subSystem?: string): Promise<{}>;
+    static showRuleStatus(session: Session, ruleSetName: string, ruleName: string, restApi: boolean, subSystem?: string): Promise<{}>;
+    static getRuleURL(session: Session, ruleSetName: string, ruleName: string, restApi: boolean, subSystem: string): string;
     static formatRuleResponse(system: string, ruleSet: string, ruleName: string): string;
     static formatStatusResponse(newStatus: string, oldStatus: string): string;
     static formatShowResponse(status: string): string;

package/lib/api/utils/RuleUtils.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
@@ -32,41 +32,57 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuleUtils = void 0;
-const imperative_1 = require("@zowe/imperative");
 const constants_1 = require("../constants");
+const OpsRestClient_1 = require("./OpsRestClient");
 const OpsTextUtils_1 = require("./OpsTextUtils");
 class RuleUtils {
-    // public static readonly RULESET_URL: string = OpsRestUtils.AOF_URL + "/rulesets";
-    // public static readonly RULE_URL: string = "/rules";
-    // public static readonly STATUS_URL: string = "/status";
-    // public static readonly headers = [{"Content-Type": "application/json"}, {Accept : "application/json"}];
     /**
-     * setRuleState
+     * setRuleStatus
      */
-    static setRuleStatus(session, ruleSetName, ruleName, newState, subSystem) {
+    static setRuleStatus(session, ruleSetName, ruleName, newState, restApi, subSystem) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ruleUrl = this.getRuleURL(session, ruleSetName, ruleName, subSystem);
+            const ruleUrl = this.getRuleURL(session, ruleSetName, ruleName, restApi, subSystem);
             const postBody = {
                 status: newState
             };
-            return imperative_1.RestClient.postExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers, postBody);
+            return OpsRestClient_1.OpsRestClient.postExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers, postBody);
         });
     }
-    static showRuleStatus(session, ruleSetName, ruleName, subSystem) {
+    static showRuleStatus(session, ruleSetName, ruleName, restApi, subSystem) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ruleUrl = this.getRuleURL(session, ruleSetName, ruleName, subSystem);
-            return imperative_1.RestClient.getExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers);
+            const ruleUrl = this.getRuleURL(session, ruleSetName, ruleName, restApi, subSystem);
+            return OpsRestClient_1.OpsRestClient.getExpectJSON(session, ruleUrl, constants_1.OpsConstants.headers);
         });
     }
-    static getRuleURL(session, ruleSetName, ruleName, subSystem) {
+    static getRuleURL(session, ruleSetName, ruleName, restApi, subSystem) {
         ruleSetName = encodeURIComponent(ruleSetName);
         ruleName = encodeURIComponent(ruleName);
         let subsystemQueryString = "";
         if (subSystem != null) {
             subsystemQueryString = "?sub=" + encodeURIComponent(subSystem);
         }
-        return constants_1.OpsConstants.RULESET_URL + "/" + ruleSetName + constants_1.OpsConstants.RULE_URL + "/" +
-            ruleName + constants_1.OpsConstants.STATUS_URL + subsystemQueryString;
+        // Endpoint formatted based on restApi value
+        if (restApi === false) { // web services
+            return `${constants_1.OpsConstants.OPSMVS_URL}${constants_1.OpsConstants.RULESET_URL}/${ruleSetName}${constants_1.OpsConstants.RULE_URL}/${ruleName}${constants_1.OpsConstants.STATUS_URL}${subsystemQueryString}`;
+        }
+        else {
+            // TODO don't allow ruleSetName * and ruleName with value (this is validated at the CLI command handling
+            if ((ruleSetName === "*") || (ruleName === "*")) {
+                if (ruleSetName === "*") {
+                    if (ruleName !== "*") {
+                        return;
+                    }
+                    ruleSetName = "%2A";
+                }
+                if (ruleName === "*") {
+                    ruleName = "%2A";
+                }
+                return `${constants_1.OpsConstants.RULES_URL}${subsystemQueryString}&ruleset=${ruleSetName}&rulename=${ruleName}`;
+            }
+            else {
+                return `${constants_1.OpsConstants.RULES_URL}/${ruleSetName}.${ruleName}${subsystemQueryString}`;
+            }
+        }
     }
     static formatRuleResponse(system, ruleSet, ruleName) {
         const name = OpsTextUtils_1.OpsTextUtils.colorizeAttention("name: ");

package/lib/api/utils/RuleUtils.js.map

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

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

@@ -0,0 +1,4 @@
+import { IHandlerParameters } from "@zowe/imperative";
+export declare class RulesetListUtils {
+    static printShowRulesetResponse(rulesetList: any, params: IHandlerParameters): void;
+}

package/lib/api/{methods/index.js → utils/RulesetListUtils.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,17 +21,21 @@
  * 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("./show"), exports);
-__exportStar(require("./update"), exports);
-//# sourceMappingURL=index.js.map
+exports.RulesetListUtils = void 0;
+const RulesetUtils_1 = require("./RulesetUtils");
+class RulesetListUtils {
+    static printShowRulesetResponse(rulesetList, params) {
+        if (rulesetList.length > 1) {
+            for (let i = 0; i < rulesetList.length; i++) {
+                params.response.console.log(RulesetUtils_1.RulesetUtils.formatRulesetResponse(rulesetList[i].ruleset, rulesetList[i].system, rulesetList[i].subsystem, rulesetList[i].status, rulesetList[i].autoEnabled));
+            }
+        }
+        else {
+            // Response from REST API server
+            params.response.console.log(RulesetUtils_1.RulesetUtils.formatRulesetResponse(rulesetList.ruleset, rulesetList.system, rulesetList.subsystem, rulesetList.status, rulesetList.autoEnabled));
+        }
+    }
+}
+exports.RulesetListUtils = RulesetListUtils;
+//# sourceMappingURL=RulesetListUtils.js.map

package/lib/api/utils/RulesetListUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RulesetListUtils.js","sourceRoot":"","sources":["../../../src/api/utils/RulesetListUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,iDAA8C;AAE9C,MAAa,gBAAgB;IAElB,MAAM,CAAC,wBAAwB,CAAC,WAAgB,EAAE,MAA0B;QAE/E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAAY,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,EACjF,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;aAC5G;SACJ;aAAM;YACH,gCAAgC;YAChC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAAY,CAAC,qBAAqB,CAAC,WAAW,CAAC,OAAO,EAC9E,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;SAChG;IACL,CAAC;CACJ;AAfD,4CAeC"}

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

@@ -0,0 +1,5 @@
+import { Session } from "@zowe/imperative";
+export declare class RulesetUtils {
+    static getRulesetURL(session: Session, ruleSetName: string, restApi: boolean, subSystem: string): string;
+    static formatRulesetResponse(ruleSet: string, system: string, subsystem: string, status: string, autoenabled: string): string;
+}

package/lib/api/utils/RulesetUtils.js

@@ -0,0 +1,51 @@
+"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.RulesetUtils = void 0;
+const constants_1 = require("../constants");
+const OpsTextUtils_1 = require("./OpsTextUtils");
+class RulesetUtils {
+    static getRulesetURL(session, ruleSetName, restApi, subSystem) {
+        let subsystemQueryString = "";
+        if (subSystem != null) {
+            subsystemQueryString = "?sub=" + encodeURIComponent(subSystem);
+        }
+        if (ruleSetName != null) {
+            ruleSetName = encodeURIComponent(ruleSetName);
+            return `${constants_1.OpsConstants.RULESET_URL}/${ruleSetName}${subsystemQueryString}`;
+        }
+        else {
+            return `${constants_1.OpsConstants.RULESET_URL}${subsystemQueryString}`;
+        }
+    }
+    static formatRulesetResponse(ruleSet, system, subsystem, status, autoenabled) {
+        const name = OpsTextUtils_1.OpsTextUtils.colorizeAttention("name: ");
+        const statusText = OpsTextUtils_1.OpsTextUtils.colorizeAttention(" status: ");
+        const autoenabledText = OpsTextUtils_1.OpsTextUtils.colorizeAttention(" autoenabled: ");
+        return name + system + "/" + subsystem + "/" + ruleSet
+            + statusText + status + autoenabledText + autoenabled;
+    }
+}
+exports.RulesetUtils = RulesetUtils;
+//# sourceMappingURL=RulesetUtils.js.map

package/lib/api/utils/RulesetUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RulesetUtils.js","sourceRoot":"","sources":["../../../src/api/utils/RulesetUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,4CAA4C;AAC5C,iDAA8C;AAE9C,MAAa,YAAY;IAEd,MAAM,CAAC,aAAa,CAAC,OAAgB,EAAE,WAAmB,EAAE,OAAgB,EAAE,SAAiB;QAElG,IAAI,oBAAoB,GAAG,EAAE,CAAC;QAC9B,IAAI,SAAS,IAAI,IAAI,EAAE;YACnB,oBAAoB,GAAG,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;SAClE;QAED,IAAI,WAAW,IAAI,IAAI,EAAE;YACrB,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC9C,OAAO,GAAG,wBAAY,CAAC,WAAW,IAAI,WAAW,GAAG,oBAAoB,EAAE,CAAC;SAC9E;aACI;YACD,OAAO,GAAG,wBAAY,CAAC,WAAW,GAAG,oBAAoB,EAAE,CAAC;SAC/D;IACL,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,OAAe,EAAE,MAAc,EAAE,SAAiB,EAClD,MAAc,EAAE,WAAmB;QACnE,MAAM,IAAI,GAAG,2BAAY,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,2BAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,eAAe,GAAG,2BAAY,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QACzE,OAAO,IAAI,GAAG,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,OAAO;cAChD,UAAU,GAAG,MAAM,GAAG,eAAe,GAAG,WAAW,CAAC;IAC9D,CAAC;CACJ;AA1BD,oCA0BC"}

package/lib/api/utils/SSMResourceListUtils.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
@@ -27,10 +27,26 @@ const SSMUtils_1 = require("./SSMUtils");
 class SSMResourceListUtils {
     static printResourceList(SSMResourceList, params) {
         let table = "";
-        for (let i = 0; i < SSMResourceList.count; i += 1) {
-            table = SSMResourceList.ssmresource[i].table;
-            params.response.console.log(SSMUtils_1.SSMUtils.formatResourceResponse(table, SSMResourceList.ssmresource[i].resource));
-            params.response.console.log(SSMUtils_1.SSMUtils.formatStateResponse(SSMResourceList.ssmresource[i].current, SSMResourceList.ssmresource[i].desired));
+        if (params.arguments.restApi === false) {
+            for (let i = 0; i < SSMResourceList.count; i += 1) {
+                table = SSMResourceList.ssmresource[i].table;
+                params.response.console.log(SSMUtils_1.SSMUtils.formatResourceResponse(table, SSMResourceList.ssmresource[i].resource));
+                params.response.console.log(SSMUtils_1.SSMUtils.formatStateResponse(SSMResourceList.ssmresource[i].current, SSMResourceList.ssmresource[i].desired, params.arguments.restApi));
+            }
+        }
+        else {
+            if (SSMResourceList.length > 0) {
+                for (let i = 0; i < SSMResourceList.length; i += 1) {
+                    table = SSMResourceList[i].table;
+                    params.response.console.log(SSMUtils_1.SSMUtils.formatResourceResponse(table, SSMResourceList[i].resource));
+                    params.response.console.log(SSMUtils_1.SSMUtils.formatStateResponse(SSMResourceList[i].currentState, SSMResourceList[i].desiredState, params.arguments.restApi));
+                }
+            }
+            else {
+                table = SSMResourceList.table;
+                params.response.console.log(SSMUtils_1.SSMUtils.formatResourceResponse(table, SSMResourceList.resource));
+                params.response.console.log(SSMUtils_1.SSMUtils.formatStateResponse(SSMResourceList.currentState, SSMResourceList.desiredState, params.arguments.restApi));
+            }
         }
     }
 }

package/lib/api/utils/SSMResourceListUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"SSMResourceListUtils.js","sourceRoot":"","sources":["../../../src/api/utils/SSMResourceListUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,yCAAoC;AAEpC,MAAa,oBAAoB;IAEtB,MAAM,CAAC,iBAAiB,CAAC,eAAoB,EAAE,MAA0B;QAC5E,IAAI,KAAK,GAAG,EAAE,CAAC;QAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/C,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7G,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;SAC7I;IACL,CAAC;CACJ;AAXD,oDAWC"}
+{"version":3,"file":"SSMResourceListUtils.js","sourceRoot":"","sources":["../../../src/api/utils/SSMResourceListUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAGH,yCAAoC;AAEpC,MAAa,oBAAoB;IAEtB,MAAM,CAAC,iBAAiB,CAAC,eAAoB,EAAE,MAA0B;QAC5E,IAAI,KAAK,GAAG,EAAE,CAAC;QAEf,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,KAAK,KAAK,EAAE;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC/C,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC7C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7G,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,EAC3F,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1E;SACJ;aAAM;YACH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;oBAChD,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBACjC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACjG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,EACpF,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;iBACnE;aACJ;iBAAM;gBACH,KAAK,GAAG,eAAe,CAAE,KAAK,CAAC;gBAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9F,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAQ,CAAC,mBAAmB,CAAC,eAAe,CAAC,YAAY,EACjF,eAAe,CAAC,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aAChE;SACJ;IACL,CAAC;CACJ;AA5BD,oDA4BC"}

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

@@ -13,9 +13,10 @@ export declare class SSMUtils {
     /**
      * setResourceState
      */
-    static setResourceState(session: Session, resource: string, desiredState: string, subsystem?: string, table?: string): Promise<{}>;
-    static showResourceState(session: Session, resourceName: string, subsystem?: string, table?: string): Promise<{}>;
-    static getResourceURL(session: Session, resourceName: string, table?: string, subSystem?: string): string;
+    static setResourceState(session: Session, resource: string, restApi: boolean, desiredState: string, subsystem?: string, table?: string): Promise<{}>;
+    static showResourceState(session: Session, resourceName: string, restApi: boolean, subsystem?: string, table?: string): Promise<{}>;
+    static getResourceURL(session: Session, resourceName: string, restApi: boolean, table?: string, subSystem?: string): string;
+    static getResourceURLWithQueryParms(session: Session, resourceName: string, restApi: boolean, table?: string, subSystem?: string): string;
     static formatResourceResponse(table: string, resourceName: string): string;
-    static formatStateResponse(current: string, desired: string): string;
+    static formatStateResponse(current: string, desired: string, restApi: boolean): string;
 }