@rockcarver/frodo-cli 0.18.2-13 → 0.18.2-14

package/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.18.2-14] - 2022-12-10
+
 ## [0.18.2-13] - 2022-12-01
 
 ## [0.18.2-12] - 2022-11-29
@@ -740,7 +742,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Fixed problem with adding connection profiles
 -   Miscellaneous bug fixes
 
-[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v0.18.2-13...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v0.18.2-14...HEAD
+
+[0.18.2-14]: https://github.com/rockcarver/frodo-cli/compare/v0.18.2-13...v0.18.2-14
 
 [0.18.2-13]: https://github.com/rockcarver/frodo-cli/compare/v0.18.2-12...v0.18.2-13
 

package/esm/app.js

@@ -28,7 +28,7 @@ const {
   try {
     const program = new Command('frodo').version(await getVersions(false), '-v, --version');
     printMessage(await getVersions(true), 'text', false);
-    initConnectionProfiles();
+    await initConnectionProfiles();
     program.addCommand(admin());
     program.addCommand(agent());
     program.addCommand(app());

package/esm/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","names":["ConnectionProfile","Command","admin","agent","app","conn","email","esv","idm","idp","info","journey","logging","realm","saml","script","service","theme","printMessage","getVersions","initConnectionProfiles","program","version","addCommand","showHelpAfterError","enablePositionalOptions","parse","e"],"sources":["app.ts"],"sourcesContent":["#!/usr/bin/env -S node --no-warnings --enable-source-maps --experimental-specifier-resolution=node\n\nimport { ConnectionProfile } from '@rockcarver/frodo-lib';\nimport { Command } from 'commander';\n\n// commands\nimport admin from './cli/admin/admin';\nimport agent from './cli/agent/agent';\nimport app from './cli/app/app';\nimport conn from './cli/conn/conn';\nimport email from './cli/email/email';\nimport esv from './cli/esv/esv';\nimport idm from './cli/idm/idm';\nimport idp from './cli/idp/idp';\nimport info from './cli/info/info';\nimport journey from './cli/journey/journey';\nimport logging from './cli/logging/logs';\nimport realm from './cli/realm/realm';\nimport saml from './cli/saml/saml';\nimport script from './cli/script/script';\nimport service from './cli/service/service';\nimport theme from './cli/theme/theme';\nimport { printMessage } from './utils/Console';\nimport { getVersions } from './utils/Version';\n\nconst { initConnectionProfiles } = ConnectionProfile;\n\n(async () => {\n  try {\n    const program = new Command('frodo').version(\n      await getVersions(false),\n      '-v, --version'\n    );\n\n    printMessage(await getVersions(true), 'text', false);\n\n    initConnectionProfiles();\n\n    program.addCommand(admin());\n    program.addCommand(agent());\n    program.addCommand(app());\n    program.addCommand(conn());\n    program.addCommand(email());\n    program.addCommand(esv());\n    program.addCommand(idm());\n    program.addCommand(idp());\n    program.addCommand(info());\n    program.addCommand(journey());\n    program.addCommand(logging());\n    program.addCommand(realm());\n    program.addCommand(saml());\n    program.addCommand(script());\n    program.addCommand(service());\n    program.addCommand(theme());\n\n    program.showHelpAfterError();\n    program.enablePositionalOptions();\n    program.parse();\n  } catch (e) {\n    printMessage(`ERROR: exception running frodo - ${e}`, 'error');\n  }\n})();\n"],"mappings":"AAAA;AAEA,SAASA,iBAAiB,QAAQ,uBAAuB;AACzD,SAASC,OAAO,QAAQ,WAAW;;AAEnC;AACA,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,IAAI,MAAM,iBAAiB;AAClC,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,IAAI,MAAM,iBAAiB;AAClC,OAAOC,OAAO,MAAM,uBAAuB;AAC3C,OAAOC,OAAO,MAAM,oBAAoB;AACxC,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,IAAI,MAAM,iBAAiB;AAClC,OAAOC,MAAM,MAAM,qBAAqB;AACxC,OAAOC,OAAO,MAAM,uBAAuB;AAC3C,OAAOC,KAAK,MAAM,mBAAmB;AACrC,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,WAAW,QAAQ,iBAAiB;AAE7C,MAAM;EAAEC;AAAuB,CAAC,GAAGpB,iBAAiB;AAEpD,CAAC,YAAY;EACX,IAAI;IACF,MAAMqB,OAAO,GAAG,IAAIpB,OAAO,CAAC,OAAO,CAAC,CAACqB,OAAO,CAC1C,MAAMH,WAAW,CAAC,KAAK,CAAC,EACxB,eAAe,CAChB;IAEDD,YAAY,CAAC,MAAMC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;IAEpDC,sBAAsB,EAAE;IAExBC,OAAO,CAACE,UAAU,CAACrB,KAAK,EAAE,CAAC;IAC3BmB,OAAO,CAACE,UAAU,CAACpB,KAAK,EAAE,CAAC;IAC3BkB,OAAO,CAACE,UAAU,CAACnB,GAAG,EAAE,CAAC;IACzBiB,OAAO,CAACE,UAAU,CAAClB,IAAI,EAAE,CAAC;IAC1BgB,OAAO,CAACE,UAAU,CAACjB,KAAK,EAAE,CAAC;IAC3Be,OAAO,CAACE,UAAU,CAAChB,GAAG,EAAE,CAAC;IACzBc,OAAO,CAACE,UAAU,CAACf,GAAG,EAAE,CAAC;IACzBa,OAAO,CAACE,UAAU,CAACd,GAAG,EAAE,CAAC;IACzBY,OAAO,CAACE,UAAU,CAACb,IAAI,EAAE,CAAC;IAC1BW,OAAO,CAACE,UAAU,CAACZ,OAAO,EAAE,CAAC;IAC7BU,OAAO,CAACE,UAAU,CAACX,OAAO,EAAE,CAAC;IAC7BS,OAAO,CAACE,UAAU,CAACV,KAAK,EAAE,CAAC;IAC3BQ,OAAO,CAACE,UAAU,CAACT,IAAI,EAAE,CAAC;IAC1BO,OAAO,CAACE,UAAU,CAACR,MAAM,EAAE,CAAC;IAC5BM,OAAO,CAACE,UAAU,CAACP,OAAO,EAAE,CAAC;IAC7BK,OAAO,CAACE,UAAU,CAACN,KAAK,EAAE,CAAC;IAE3BI,OAAO,CAACG,kBAAkB,EAAE;IAC5BH,OAAO,CAACI,uBAAuB,EAAE;IACjCJ,OAAO,CAACK,KAAK,EAAE;EACjB,CAAC,CAAC,OAAOC,CAAC,EAAE;IACVT,YAAY,CAAE,oCAAmCS,CAAE,EAAC,EAAE,OAAO,CAAC;EAChE;AACF,CAAC,GAAG"}
+{"version":3,"file":"app.js","names":["ConnectionProfile","Command","admin","agent","app","conn","email","esv","idm","idp","info","journey","logging","realm","saml","script","service","theme","printMessage","getVersions","initConnectionProfiles","program","version","addCommand","showHelpAfterError","enablePositionalOptions","parse","e"],"sources":["app.ts"],"sourcesContent":["#!/usr/bin/env -S node --no-warnings --enable-source-maps --experimental-specifier-resolution=node\n\nimport { ConnectionProfile } from '@rockcarver/frodo-lib';\nimport { Command } from 'commander';\n\n// commands\nimport admin from './cli/admin/admin';\nimport agent from './cli/agent/agent';\nimport app from './cli/app/app';\nimport conn from './cli/conn/conn';\nimport email from './cli/email/email';\nimport esv from './cli/esv/esv';\nimport idm from './cli/idm/idm';\nimport idp from './cli/idp/idp';\nimport info from './cli/info/info';\nimport journey from './cli/journey/journey';\nimport logging from './cli/logging/logs';\nimport realm from './cli/realm/realm';\nimport saml from './cli/saml/saml';\nimport script from './cli/script/script';\nimport service from './cli/service/service';\nimport theme from './cli/theme/theme';\nimport { printMessage } from './utils/Console';\nimport { getVersions } from './utils/Version';\n\nconst { initConnectionProfiles } = ConnectionProfile;\n\n(async () => {\n  try {\n    const program = new Command('frodo').version(\n      await getVersions(false),\n      '-v, --version'\n    );\n\n    printMessage(await getVersions(true), 'text', false);\n\n    await initConnectionProfiles();\n\n    program.addCommand(admin());\n    program.addCommand(agent());\n    program.addCommand(app());\n    program.addCommand(conn());\n    program.addCommand(email());\n    program.addCommand(esv());\n    program.addCommand(idm());\n    program.addCommand(idp());\n    program.addCommand(info());\n    program.addCommand(journey());\n    program.addCommand(logging());\n    program.addCommand(realm());\n    program.addCommand(saml());\n    program.addCommand(script());\n    program.addCommand(service());\n    program.addCommand(theme());\n\n    program.showHelpAfterError();\n    program.enablePositionalOptions();\n    program.parse();\n  } catch (e) {\n    printMessage(`ERROR: exception running frodo - ${e}`, 'error');\n  }\n})();\n"],"mappings":"AAAA;AAEA,SAASA,iBAAiB,QAAQ,uBAAuB;AACzD,SAASC,OAAO,QAAQ,WAAW;;AAEnC;AACA,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,IAAI,MAAM,iBAAiB;AAClC,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,GAAG,MAAM,eAAe;AAC/B,OAAOC,IAAI,MAAM,iBAAiB;AAClC,OAAOC,OAAO,MAAM,uBAAuB;AAC3C,OAAOC,OAAO,MAAM,oBAAoB;AACxC,OAAOC,KAAK,MAAM,mBAAmB;AACrC,OAAOC,IAAI,MAAM,iBAAiB;AAClC,OAAOC,MAAM,MAAM,qBAAqB;AACxC,OAAOC,OAAO,MAAM,uBAAuB;AAC3C,OAAOC,KAAK,MAAM,mBAAmB;AACrC,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,WAAW,QAAQ,iBAAiB;AAE7C,MAAM;EAAEC;AAAuB,CAAC,GAAGpB,iBAAiB;AAEpD,CAAC,YAAY;EACX,IAAI;IACF,MAAMqB,OAAO,GAAG,IAAIpB,OAAO,CAAC,OAAO,CAAC,CAACqB,OAAO,CAC1C,MAAMH,WAAW,CAAC,KAAK,CAAC,EACxB,eAAe,CAChB;IAEDD,YAAY,CAAC,MAAMC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;IAEpD,MAAMC,sBAAsB,EAAE;IAE9BC,OAAO,CAACE,UAAU,CAACrB,KAAK,EAAE,CAAC;IAC3BmB,OAAO,CAACE,UAAU,CAACpB,KAAK,EAAE,CAAC;IAC3BkB,OAAO,CAACE,UAAU,CAACnB,GAAG,EAAE,CAAC;IACzBiB,OAAO,CAACE,UAAU,CAAClB,IAAI,EAAE,CAAC;IAC1BgB,OAAO,CAACE,UAAU,CAACjB,KAAK,EAAE,CAAC;IAC3Be,OAAO,CAACE,UAAU,CAAChB,GAAG,EAAE,CAAC;IACzBc,OAAO,CAACE,UAAU,CAACf,GAAG,EAAE,CAAC;IACzBa,OAAO,CAACE,UAAU,CAACd,GAAG,EAAE,CAAC;IACzBY,OAAO,CAACE,UAAU,CAACb,IAAI,EAAE,CAAC;IAC1BW,OAAO,CAACE,UAAU,CAACZ,OAAO,EAAE,CAAC;IAC7BU,OAAO,CAACE,UAAU,CAACX,OAAO,EAAE,CAAC;IAC7BS,OAAO,CAACE,UAAU,CAACV,KAAK,EAAE,CAAC;IAC3BQ,OAAO,CAACE,UAAU,CAACT,IAAI,EAAE,CAAC;IAC1BO,OAAO,CAACE,UAAU,CAACR,MAAM,EAAE,CAAC;IAC5BM,OAAO,CAACE,UAAU,CAACP,OAAO,EAAE,CAAC;IAC7BK,OAAO,CAACE,UAAU,CAACN,KAAK,EAAE,CAAC;IAE3BI,OAAO,CAACG,kBAAkB,EAAE;IAC5BH,OAAO,CAACI,uBAAuB,EAAE;IACjCJ,OAAO,CAACK,KAAK,EAAE;EACjB,CAAC,CAAC,OAAOC,CAAC,EAAE;IACVT,YAAY,CAAE,oCAAmCS,CAAE,EAAC,EAAE,OAAO,CAAC;EAChE;AACF,CAAC,GAAG"}

package/esm/cli/conn/conn-save.js

@@ -0,0 +1,78 @@
+import { Command, Option } from 'commander';
+import { Authenticate, ConnectionProfile, ServiceAccount, state, constants } from '@rockcarver/frodo-lib';
+import * as common from '../cmd_common.js';
+import { verboseMessage, printMessage } from '../../utils/Console';
+import { addExistingServiceAccount } from '../../ops/ConnectionProfileOps.js';
+const {
+  getTokens
+} = Authenticate;
+const {
+  saveConnectionProfile,
+  addNewServiceAccount
+} = ConnectionProfile;
+const {
+  isServiceAccountsFeatureAvailable
+} = ServiceAccount;
+const program = new Command('frodo conn save');
+program.alias('add').description('Save connection profiles.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.userArgument).addArgument(common.passwordArgument).addArgument(common.apiKeyArgument).addArgument(common.apiSecretArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('--sa-id <uuid>', "Service account's uuid. If specified, must also include --sa-jwk-file. Ignored with --no-sa.")).addOption(new Option('--sa-jwk-file <file>', "File containing the service account's java web key (jwk). Jwk must contain private key! If specified, must also include --sa-id. Ignored with --no-sa.")).addOption(new Option('--no-sa', 'Do not add service account.')).addOption(new Option('--no-validate', 'Do not validate connection.')).addOption(new Option('--authentication-service [service]', 'Name of the authentication service/tree to use.')).addOption(new Option('--authentication-header-overrides [headers]', 'Map of headers: {"host":"am.example.com:8081"}.')).action(
+// implement command logic inside action handler
+async (host, user, password, key, secret, options) => {
+  state.default.session.setTenant(host);
+  state.default.session.setUsername(user);
+  state.default.session.setPassword(password);
+  state.default.session.setLogApiKey(key);
+  state.default.session.setLogApiSecret(secret);
+  state.default.session.setDeploymentType(options.type);
+  state.default.session.setAllowInsecureConnection(options.insecure);
+  state.default.session.setVerbose(options.verbose);
+  state.default.session.setDebug(options.debug);
+  state.default.session.setCurlirize(options.curlirize);
+  if (options.authenticationService) {
+    state.default.session.setAuthenticationService(options.authenticationService);
+  }
+  if (options.authenticationHeaderOverrides) {
+    state.default.session.setAuthenticationHeaderOverrides(JSON.parse(options.authenticationHeaderOverrides));
+  }
+  if (options.validate && (await getTokens()) || !options.validate) {
+    verboseMessage(`Saving connection profile for tenant ${state.default.session.getTenant()}...`);
+    // if cloud deployment add service account
+    if (options.validate && state.default.session.getDeploymentType() === constants.CLOUD_DEPLOYMENT_TYPE_KEY && options.sa && (await isServiceAccountsFeatureAvailable())) {
+      // validate and add existing service account
+      if (options.saId && options.saJwkFile) {
+        verboseMessage(`Validating and adding service account...`);
+        if (await addExistingServiceAccount(options.saId, options.saJwkFile, options.validate)) {
+          printMessage(`Validated and added service account with id ${options.saId} to profile.`);
+        }
+      }
+      // add new service account if none already exists in the profile
+      else if (!state.default.session.getServiceAccountId()) {
+        try {
+          verboseMessage(`Creating service account...`);
+          const sa = await addNewServiceAccount();
+          printMessage(`Created and added service account ${sa.name} with id ${sa._id} to profile.`);
+        } catch (error) {
+          var _error$response, _error$response2, _error$response2$data;
+          printMessage((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, 'error');
+          printMessage(`Error creating service account: ${(_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message}`, 'error');
+          process.exitCode = 1;
+        }
+      }
+    }
+    // add existing service account without validation
+    else if (!options.validate && options.saId && options.saJwkFile && options.sa) {
+      addExistingServiceAccount(options.saId, options.saJwkFile, options.validate);
+    }
+    if (await saveConnectionProfile(host)) {
+      printMessage(`Saved connection profile ${state.default.session.getTenant()}`);
+    } else {
+      process.exitCode = 1;
+    }
+  } else {
+    process.exitCode = 1;
+  }
+}
+// end command logic inside action handler
+);
+
+program.parse();
+//# sourceMappingURL=conn-save.js.map

package/esm/cli/conn/conn-save.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conn-save.js","names":["Command","Option","Authenticate","ConnectionProfile","ServiceAccount","state","constants","common","verboseMessage","printMessage","addExistingServiceAccount","getTokens","saveConnectionProfile","addNewServiceAccount","isServiceAccountsFeatureAvailable","program","alias","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","apiKeyArgument","apiSecretArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","user","password","key","secret","options","default","session","setTenant","setUsername","setPassword","setLogApiKey","setLogApiSecret","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","authenticationService","setAuthenticationService","authenticationHeaderOverrides","setAuthenticationHeaderOverrides","JSON","parse","validate","getTenant","getDeploymentType","CLOUD_DEPLOYMENT_TYPE_KEY","sa","saId","saJwkFile","getServiceAccountId","name","_id","error","response","data","message","process","exitCode"],"sources":["cli/conn/conn-save.ts"],"sourcesContent":["import { Command, Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  ServiceAccount,\n  state,\n  constants,\n} from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common.js';\nimport { verboseMessage, printMessage } from '../../utils/Console';\nimport { addExistingServiceAccount } from '../../ops/ConnectionProfileOps.js';\n\nconst { getTokens } = Authenticate;\nconst { saveConnectionProfile, addNewServiceAccount } = ConnectionProfile;\nconst { isServiceAccountsFeatureAvailable } = ServiceAccount;\n\nconst program = new Command('frodo conn save');\n\nprogram\n  .alias('add')\n  .description('Save connection profiles.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addArgument(common.apiKeyArgument)\n  .addArgument(common.apiSecretArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option(\n      '--sa-id <uuid>',\n      \"Service account's uuid. If specified, must also include --sa-jwk-file. Ignored with --no-sa.\"\n    )\n  )\n  .addOption(\n    new Option(\n      '--sa-jwk-file <file>',\n      \"File containing the service account's java web key (jwk). Jwk must contain private key! If specified, must also include --sa-id. Ignored with --no-sa.\"\n    )\n  )\n  .addOption(new Option('--no-sa', 'Do not add service account.'))\n  .addOption(new Option('--no-validate', 'Do not validate connection.'))\n  .addOption(\n    new Option(\n      '--authentication-service [service]',\n      'Name of the authentication service/tree to use.'\n    )\n  )\n  .addOption(\n    new Option(\n      '--authentication-header-overrides [headers]',\n      'Map of headers: {\"host\":\"am.example.com:8081\"}.'\n    )\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, user, password, key, secret, options) => {\n      state.default.session.setTenant(host);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setLogApiKey(key);\n      state.default.session.setLogApiSecret(secret);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      if (options.authenticationService) {\n        state.default.session.setAuthenticationService(\n          options.authenticationService\n        );\n      }\n      if (options.authenticationHeaderOverrides) {\n        state.default.session.setAuthenticationHeaderOverrides(\n          JSON.parse(options.authenticationHeaderOverrides)\n        );\n      }\n      if ((options.validate && (await getTokens())) || !options.validate) {\n        verboseMessage(\n          `Saving connection profile for tenant ${state.default.session.getTenant()}...`\n        );\n        // if cloud deployment add service account\n        if (\n          options.validate &&\n          state.default.session.getDeploymentType() ===\n            constants.CLOUD_DEPLOYMENT_TYPE_KEY &&\n          options.sa &&\n          (await isServiceAccountsFeatureAvailable())\n        ) {\n          // validate and add existing service account\n          if (options.saId && options.saJwkFile) {\n            verboseMessage(`Validating and adding service account...`);\n            if (\n              await addExistingServiceAccount(\n                options.saId,\n                options.saJwkFile,\n                options.validate\n              )\n            ) {\n              printMessage(\n                `Validated and added service account with id ${options.saId} to profile.`\n              );\n            }\n          }\n          // add new service account if none already exists in the profile\n          else if (!state.default.session.getServiceAccountId()) {\n            try {\n              verboseMessage(`Creating service account...`);\n              const sa = await addNewServiceAccount();\n              printMessage(\n                `Created and added service account ${sa.name} with id ${sa._id} to profile.`\n              );\n            } catch (error) {\n              printMessage(error.response?.data, 'error');\n              printMessage(\n                `Error creating service account: ${error.response?.data?.message}`,\n                'error'\n              );\n              process.exitCode = 1;\n            }\n          }\n        }\n        // add existing service account without validation\n        else if (\n          !options.validate &&\n          options.saId &&\n          options.saJwkFile &&\n          options.sa\n        ) {\n          addExistingServiceAccount(\n            options.saId,\n            options.saJwkFile,\n            options.validate\n          );\n        }\n        if (await saveConnectionProfile(host)) {\n          printMessage(\n            `Saved connection profile ${state.default.session.getTenant()}`\n          );\n        } else {\n          process.exitCode = 1;\n        }\n      } else {\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/conn/conn.js

@@ -6,7 +6,7 @@ export default function setup() {
   const program = new Command('conn').alias('connection')
   // for backwards compatibility
   .alias('connections').helpOption('-h, --help', 'Help').description('Manage connection profiles.').executableDir(__dirname);
-  program.command('add', 'Add connection profiles.').showHelpAfterError();
+  program.command('save', 'Save connection profiles.').alias('add').showHelpAfterError();
   program.command('delete', 'Delete connection profiles.').showHelpAfterError();
   program.command('describe', 'Describe connection profiles.').showHelpAfterError();
   program.command('list', 'List connection profiles.').showHelpAfterError();

package/esm/cli/conn/conn.js.map

@@ -1 +1 @@
-{"version":3,"file":"conn.js","names":["Command","path","fileURLToPath","__dirname","dirname","import","meta","url","setup","program","alias","helpOption","description","executableDir","command","showHelpAfterError"],"sources":["cli/conn/conn.ts"],"sourcesContent":["import { Command } from 'commander';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default function setup() {\n  const program = new Command('conn')\n    .alias('connection')\n    // for backwards compatibility\n    .alias('connections')\n    .helpOption('-h, --help', 'Help')\n    .description('Manage connection profiles.')\n    .executableDir(__dirname);\n\n  program.command('add', 'Add connection profiles.').showHelpAfterError();\n\n  program.command('delete', 'Delete connection profiles.').showHelpAfterError();\n\n  program\n    .command('describe', 'Describe connection profiles.')\n    .showHelpAfterError();\n\n  program.command('list', 'List connection profiles.').showHelpAfterError();\n\n  program.showHelpAfterError();\n  return program;\n}\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,WAAW;AACnC,OAAOC,IAAI,MAAM,MAAM;AACvB,SAASC,aAAa,QAAQ,KAAK;AAEnC,MAAMC,SAAS,GAAGF,IAAI,CAACG,OAAO,CAACF,aAAa,CAACG,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC;AAE9D,eAAe,SAASC,KAAK,GAAG;EAC9B,MAAMC,OAAO,GAAG,IAAIT,OAAO,CAAC,MAAM,CAAC,CAChCU,KAAK,CAAC,YAAY;EACnB;EAAA,CACCA,KAAK,CAAC,aAAa,CAAC,CACpBC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAChCC,WAAW,CAAC,6BAA6B,CAAC,CAC1CC,aAAa,CAACV,SAAS,CAAC;EAE3BM,OAAO,CAACK,OAAO,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAACC,kBAAkB,EAAE;EAEvEN,OAAO,CAACK,OAAO,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAACC,kBAAkB,EAAE;EAE7EN,OAAO,CACJK,OAAO,CAAC,UAAU,EAAE,+BAA+B,CAAC,CACpDC,kBAAkB,EAAE;EAEvBN,OAAO,CAACK,OAAO,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAACC,kBAAkB,EAAE;EAEzEN,OAAO,CAACM,kBAAkB,EAAE;EAC5B,OAAON,OAAO;AAChB"}
+{"version":3,"file":"conn.js","names":["Command","path","fileURLToPath","__dirname","dirname","import","meta","url","setup","program","alias","helpOption","description","executableDir","command","showHelpAfterError"],"sources":["cli/conn/conn.ts"],"sourcesContent":["import { Command } from 'commander';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default function setup() {\n  const program = new Command('conn')\n    .alias('connection')\n    // for backwards compatibility\n    .alias('connections')\n    .helpOption('-h, --help', 'Help')\n    .description('Manage connection profiles.')\n    .executableDir(__dirname);\n\n  program\n    .command('save', 'Save connection profiles.')\n    .alias('add')\n    .showHelpAfterError();\n\n  program.command('delete', 'Delete connection profiles.').showHelpAfterError();\n\n  program\n    .command('describe', 'Describe connection profiles.')\n    .showHelpAfterError();\n\n  program.command('list', 'List connection profiles.').showHelpAfterError();\n\n  program.showHelpAfterError();\n  return program;\n}\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,WAAW;AACnC,OAAOC,IAAI,MAAM,MAAM;AACvB,SAASC,aAAa,QAAQ,KAAK;AAEnC,MAAMC,SAAS,GAAGF,IAAI,CAACG,OAAO,CAACF,aAAa,CAACG,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC;AAE9D,eAAe,SAASC,KAAK,GAAG;EAC9B,MAAMC,OAAO,GAAG,IAAIT,OAAO,CAAC,MAAM,CAAC,CAChCU,KAAK,CAAC,YAAY;EACnB;EAAA,CACCA,KAAK,CAAC,aAAa,CAAC,CACpBC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAChCC,WAAW,CAAC,6BAA6B,CAAC,CAC1CC,aAAa,CAACV,SAAS,CAAC;EAE3BM,OAAO,CACJK,OAAO,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAC5CJ,KAAK,CAAC,KAAK,CAAC,CACZK,kBAAkB,EAAE;EAEvBN,OAAO,CAACK,OAAO,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAACC,kBAAkB,EAAE;EAE7EN,OAAO,CACJK,OAAO,CAAC,UAAU,EAAE,+BAA+B,CAAC,CACpDC,kBAAkB,EAAE;EAEvBN,OAAO,CAACK,OAAO,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAACC,kBAAkB,EAAE;EAEzEN,OAAO,CAACM,kBAAkB,EAAE;EAC5B,OAAON,OAAO;AAChB"}

package/esm/cli/info/info.js

@@ -5,36 +5,54 @@ import { printMessage, verboseMessage } from '../../utils/Console';
 const {
   getTokens
 } = Authenticate;
+const {
+  getCookieName,
+  getCookieValue,
+  getBearerToken,
+  setTenant,
+  setUsername,
+  setPassword,
+  setDeploymentType,
+  setAllowInsecureConnection,
+  setVerbose,
+  setDebug,
+  setCurlirize,
+  setItem
+} = state.default.session;
 export default function setup() {
   const info = new Command('info');
   info.addArgument(common.hostArgumentM).addArgument(common.userArgument).addArgument(common.passwordArgument).helpOption('-h, --help', 'Help').addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(common.scriptFriendlyOption).description('Print versions and tokens.').action(async (host, user, password, options) => {
-    state.default.session.setTenant(host);
-    state.default.session.setUsername(user);
-    state.default.session.setPassword(password);
-    state.default.session.setDeploymentType(options.type);
-    state.default.session.setAllowInsecureConnection(options.insecure);
-    state.default.session.setVerbose(options.verbose);
-    state.default.session.setDebug(options.debug);
-    state.default.session.setCurlirize(options.curlirize);
-    state.default.session.setItem('scriptFriendly', options.scriptFriendly);
+    setTenant(host);
+    setUsername(user);
+    setPassword(password);
+    setDeploymentType(options.type);
+    setAllowInsecureConnection(options.insecure);
+    setVerbose(options.verbose);
+    setDebug(options.debug);
+    setCurlirize(options.curlirize);
+    setItem('scriptFriendly', options.scriptFriendly);
     if (!options.scriptFriendly) {
       verboseMessage('Printing versions and tokens...');
       if (await getTokens()) {
-        printMessage(`Cookie name: ${state.default.session.getCookieName()}`);
-        printMessage(`Session token: ${state.default.session.getCookieValue()}`);
-        if (state.default.session.getBearerToken()) {
-          printMessage(`Bearer token: ${state.default.session.getBearerToken()}`);
+        printMessage(`Cookie name: ${getCookieName()}`);
+        if (getCookieValue()) {
+          printMessage(`Session token: ${getCookieValue()}`);
+        }
+        if (getBearerToken()) {
+          printMessage(`Bearer token: ${getBearerToken()}`);
         }
       } else {
         process.exitCode = 1;
       }
     } else if (await getTokens()) {
       const output = {
-        cookieName: state.default.session.getCookieName(),
-        sessionToken: state.default.session.getCookieValue()
+        cookieName: getCookieName()
       };
-      if (state.default.session.getBearerToken()) {
-        output['bearerToken'] = state.default.session.getBearerToken();
+      if (getCookieValue()) {
+        output['sessionToken'] = getCookieValue();
+      }
+      if (getBearerToken()) {
+        output['bearerToken'] = getBearerToken();
       }
       printMessage(JSON.stringify(output, null, 2), 'data');
     } else {

package/esm/cli/info/info.js.map

@@ -1 +1 @@
-{"version":3,"file":"info.js","names":["Command","Authenticate","state","common","printMessage","verboseMessage","getTokens","setup","info","addArgument","hostArgumentM","userArgument","passwordArgument","helpOption","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","scriptFriendlyOption","description","action","host","user","password","options","default","session","setTenant","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","setItem","scriptFriendly","getCookieName","getCookieValue","getBearerToken","process","exitCode","output","cookieName","sessionToken","JSON","stringify","showHelpAfterError"],"sources":["cli/info/info.ts"],"sourcesContent":["import { Command } from 'commander';\nimport { Authenticate, state } from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common';\nimport { printMessage, verboseMessage } from '../../utils/Console';\n\nconst { getTokens } = Authenticate;\n\nexport default function setup() {\n  const info = new Command('info');\n  info\n    .addArgument(common.hostArgumentM)\n    .addArgument(common.userArgument)\n    .addArgument(common.passwordArgument)\n    .helpOption('-h, --help', 'Help')\n    .addOption(common.deploymentOption)\n    .addOption(common.insecureOption)\n    .addOption(common.verboseOption)\n    .addOption(common.debugOption)\n    .addOption(common.curlirizeOption)\n    .addOption(common.scriptFriendlyOption)\n    .description('Print versions and tokens.')\n    .action(async (host, user, password, options) => {\n      state.default.session.setTenant(host);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      state.default.session.setItem('scriptFriendly', options.scriptFriendly);\n      if (!options.scriptFriendly) {\n        verboseMessage('Printing versions and tokens...');\n        if (await getTokens()) {\n          printMessage(`Cookie name: ${state.default.session.getCookieName()}`);\n          printMessage(\n            `Session token: ${state.default.session.getCookieValue()}`\n          );\n          if (state.default.session.getBearerToken()) {\n            printMessage(\n              `Bearer token: ${state.default.session.getBearerToken()}`\n            );\n          }\n        } else {\n          process.exitCode = 1;\n        }\n      } else if (await getTokens()) {\n        const output = {\n          cookieName: state.default.session.getCookieName(),\n          sessionToken: state.default.session.getCookieValue(),\n        };\n        if (state.default.session.getBearerToken()) {\n          output['bearerToken'] = state.default.session.getBearerToken();\n        }\n        printMessage(JSON.stringify(output, null, 2), 'data');\n      } else {\n        process.exitCode = 1;\n      }\n    });\n  info.showHelpAfterError();\n  return info;\n}\n"],"mappings":"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"}
+{"version":3,"file":"info.js","names":["Command","Authenticate","state","common","printMessage","verboseMessage","getTokens","getCookieName","getCookieValue","getBearerToken","setTenant","setUsername","setPassword","setDeploymentType","setAllowInsecureConnection","setVerbose","setDebug","setCurlirize","setItem","default","session","setup","info","addArgument","hostArgumentM","userArgument","passwordArgument","helpOption","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","scriptFriendlyOption","description","action","host","user","password","options","type","insecure","verbose","debug","curlirize","scriptFriendly","process","exitCode","output","cookieName","JSON","stringify","showHelpAfterError"],"sources":["cli/info/info.ts"],"sourcesContent":["import { Command } from 'commander';\nimport { Authenticate, state } from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common';\nimport { printMessage, verboseMessage } from '../../utils/Console';\n\nconst { getTokens } = Authenticate;\nconst {\n  getCookieName,\n  getCookieValue,\n  getBearerToken,\n  setTenant,\n  setUsername,\n  setPassword,\n  setDeploymentType,\n  setAllowInsecureConnection,\n  setVerbose,\n  setDebug,\n  setCurlirize,\n  setItem,\n} = state.default.session;\n\nexport default function setup() {\n  const info = new Command('info');\n  info\n    .addArgument(common.hostArgumentM)\n    .addArgument(common.userArgument)\n    .addArgument(common.passwordArgument)\n    .helpOption('-h, --help', 'Help')\n    .addOption(common.deploymentOption)\n    .addOption(common.insecureOption)\n    .addOption(common.verboseOption)\n    .addOption(common.debugOption)\n    .addOption(common.curlirizeOption)\n    .addOption(common.scriptFriendlyOption)\n    .description('Print versions and tokens.')\n    .action(async (host, user, password, options) => {\n      setTenant(host);\n      setUsername(user);\n      setPassword(password);\n      setDeploymentType(options.type);\n      setAllowInsecureConnection(options.insecure);\n      setVerbose(options.verbose);\n      setDebug(options.debug);\n      setCurlirize(options.curlirize);\n      setItem('scriptFriendly', options.scriptFriendly);\n      if (!options.scriptFriendly) {\n        verboseMessage('Printing versions and tokens...');\n        if (await getTokens()) {\n          printMessage(`Cookie name: ${getCookieName()}`);\n          if (getCookieValue()) {\n            printMessage(`Session token: ${getCookieValue()}`);\n          }\n          if (getBearerToken()) {\n            printMessage(`Bearer token: ${getBearerToken()}`);\n          }\n        } else {\n          process.exitCode = 1;\n        }\n      } else if (await getTokens()) {\n        const output = {\n          cookieName: getCookieName(),\n        };\n        if (getCookieValue()) {\n          output['sessionToken'] = getCookieValue();\n        }\n        if (getBearerToken()) {\n          output['bearerToken'] = getBearerToken();\n        }\n        printMessage(JSON.stringify(output, null, 2), 'data');\n      } else {\n        process.exitCode = 1;\n      }\n    });\n  info.showHelpAfterError();\n  return info;\n}\n"],"mappings":"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"}

package/esm/cli/logging/logs-fetch.js

@@ -38,10 +38,10 @@ Cannot be more than 30 days in the past. If not specified, logs from one hour ag
   state.default.session.setCurlirize(options.curlirize);
   const conn = await getConnectionProfile();
   state.default.session.setTenant(conn.tenant);
-  if (conn.key != null && conn.secret != null) {
+  if (conn.logApiKey != null && conn.logApiSecret != null) {
     credsFromParameters = false;
-    state.default.session.setLogApiKey(conn.key);
-    state.default.session.setLogApiSecret(conn.secret);
+    state.default.session.setLogApiKey(conn.logApiKey);
+    state.default.session.setLogApiSecret(conn.logApiSecret);
   } else {
     if (conn.username == null && conn.password == null) {
       if (!state.default.session.getUsername() && !state.default.session.getPassword()) {
@@ -87,7 +87,7 @@ Cannot be more than 30 days in the past. If not specified, logs from one hour ag
   }
   let intermediateEndTs = 0;
   printMessage(`Fetching ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}]...`);
-  if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI
+  if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
 
   do {
     intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;

package/esm/cli/logging/logs-fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"logs-fetch.js","names":["Command","Option","Authenticate","ConnectionProfile","Log","state","common","config","printMessage","provisionCreds","fetchLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","SECONDS_IN_30_DAYS","SECONDS_IN_1_HOUR","LOG_TIME_WINDOW_MAX","LOG_TIME_WINDOW_INCREMENT","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","addOption","insecureOption","verboseOption","debugOption","curlirizeOption","sourcesOptionM","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","credsFromParameters","session","setTenant","setUsername","setPassword","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","conn","tenant","key","secret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","creds","api_key_id","api_key_secret","now","Date","beginTimestamp","tempStartDate","setTime","toISOString","tempEndDate","endTimestamp","beginTs","parse","intermediateEndTs","opts","sources","level","transactionId","searchString","getNoiseFilters","defaults"],"sources":["cli/logging/logs-fetch.ts"],"sourcesContent":["import { Command, Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, fetchLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst SECONDS_IN_30_DAYS = 2592000;\nconst SECONDS_IN_1_HOUR = 3600;\nconst LOG_TIME_WINDOW_MAX = SECONDS_IN_30_DAYS;\nconst LOG_TIME_WINDOW_INCREMENT = SECONDS_IN_1_HOUR;\n\nconst program = new Command('frodo logs fetch');\nprogram\n  .description(\n    'Fetch Identity Cloud logs between a specified begin and end time period.\\\n WARNING: depending on filters and time period specified, this could take substantial time to complete.'\n  )\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(common.sourcesOptionM)\n  .addOption(\n    new Option(\n      '-l, --level <level>',\n      'Set log level filter. You can specify the level as a number or a string. \\\nFollowing values are possible (values on the same line are equivalent): \\\n\\n0, SEVERE, FATAL, or ERROR\\n1, WARNING, WARN or CONFIG\\\n\\n2, INFO or INFORMATION\\n3, DEBUG, FINE, FINER or FINEST\\\n\\n4 or ALL'\n    ).default('ERROR', `${resolveLevel('ERROR')}`)\n  )\n  .addOption(\n    new Option('-t, --transaction-id <txid>', 'Filter by transactionId')\n  )\n  .addOption(\n    new Option(\n      '-b, --begin-timestamp <beginTs>',\n      'Begin timestamp for period (in ISO8601, example: \"2022-10-13T19:06:28Z\", or \"2022-09.30\". \\\nCannot be more than 30 days in the past. If not specified, logs from one hour ago are fetched \\\n(-e is ignored)'\n    )\n  )\n  .addOption(\n    new Option(\n      '-e, --end-timestamp <endTs>',\n      'End timestamp for period. Default: \"now\"'\n    )\n  )\n  .addOption(\n    new Option(\n      '-s, --search-string <ss>',\n      'Filter by a specific string (ANDed with transactionID filter)'\n    )\n  )\n  .addOption(\n    new Option('-d, --defaults', 'Use default logging noise filters').default(\n      false,\n      `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`\n    )\n  )\n  .action(async (host, user, password, options, command) => {\n    let credsFromParameters = true;\n    state.default.session.setTenant(host);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    const conn = await getConnectionProfile();\n    state.default.session.setTenant(conn.tenant);\n    if (conn.key != null && conn.secret != null) {\n      credsFromParameters = false;\n      state.default.session.setLogApiKey(conn.key);\n      state.default.session.setLogApiSecret(conn.secret);\n    } else {\n      if (conn.username == null && conn.password == null) {\n        if (\n          !state.default.session.getUsername() &&\n          !state.default.session.getPassword()\n        ) {\n          credsFromParameters = false;\n          printMessage(\n            'User credentials not specified as parameters and no saved API key and secret found!',\n            'warn'\n          );\n          return;\n        }\n      } else {\n        state.default.session.setUsername(conn.username);\n        state.default.session.setPassword(conn.password);\n      }\n      if (await getTokens()) {\n        const creds = await provisionCreds();\n        state.default.session.setLogApiKey(creds.api_key_id);\n        state.default.session.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n    const now = Date.now() / 1000;\n    if (\n      typeof options.beginTimestamp === 'undefined' ||\n      !options.beginTimestamp\n    ) {\n      // no beginTimestamp value specified, default is 1 hour ago\n      const tempStartDate = new Date();\n      tempStartDate.setTime((now - SECONDS_IN_1_HOUR) * 1000);\n      options.beginTimestamp = tempStartDate.toISOString();\n      // also override endTimestamp to now\n      const tempEndDate = new Date();\n      tempEndDate.setTime(now * 1000);\n      options.endTimestamp = tempEndDate;\n      printMessage(\n        'No timestamps specified, defaulting to logs from 1 hour ago',\n        'info'\n      );\n    }\n    if (typeof options.endTimestamp === 'undefined' || !options.endTimestamp) {\n      // no endTimestamp value specified, default is now\n      options.endTimestamp = now * 1000;\n      printMessage(\n        'No end timestamp specified, defaulting end timestamp to \"now\"',\n        'info'\n      );\n    }\n    let beginTs = Date.parse(options.beginTimestamp) / 1000;\n    if (Date.parse(options.endTimestamp) / 1000 < beginTs) {\n      printMessage('End timestamp can not be before begin timestamp', 'error');\n      return;\n    }\n    if (now - beginTs > LOG_TIME_WINDOW_MAX) {\n      printMessage(\n        'Begin timestamp can not be more than 30 days in the past',\n        'error'\n      );\n      return;\n    }\n    let intermediateEndTs = 0;\n    printMessage(\n      `Fetching ID Cloud logs from the following sources: ${\n        command.opts().sources\n      } and levels [${resolveLevel(command.opts().level)}]...`\n    );\n    if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI\n\n    do {\n      intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;\n      await fetchLogs(\n        command.opts().sources,\n        new Date(beginTs * 1000).toISOString(),\n        new Date(intermediateEndTs * 1000).toISOString(),\n        resolveLevel(command.opts().level),\n        command.opts().transactionId,\n        command.opts().searchString,\n        null,\n        config.getNoiseFilters(options.defaults)\n      );\n      beginTs = intermediateEndTs;\n    } while (intermediateEndTs < Date.parse(options.endTimestamp) / 1000);\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"logs-fetch.js","names":["Command","Option","Authenticate","ConnectionProfile","Log","state","common","config","printMessage","provisionCreds","fetchLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","SECONDS_IN_30_DAYS","SECONDS_IN_1_HOUR","LOG_TIME_WINDOW_MAX","LOG_TIME_WINDOW_INCREMENT","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","addOption","insecureOption","verboseOption","debugOption","curlirizeOption","sourcesOptionM","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","credsFromParameters","session","setTenant","setUsername","setPassword","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","conn","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","creds","api_key_id","api_key_secret","now","Date","beginTimestamp","tempStartDate","setTime","toISOString","tempEndDate","endTimestamp","beginTs","parse","intermediateEndTs","opts","sources","level","transactionId","searchString","getNoiseFilters","defaults"],"sources":["cli/logging/logs-fetch.ts"],"sourcesContent":["import { Command, Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, fetchLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst SECONDS_IN_30_DAYS = 2592000;\nconst SECONDS_IN_1_HOUR = 3600;\nconst LOG_TIME_WINDOW_MAX = SECONDS_IN_30_DAYS;\nconst LOG_TIME_WINDOW_INCREMENT = SECONDS_IN_1_HOUR;\n\nconst program = new Command('frodo logs fetch');\nprogram\n  .description(\n    'Fetch Identity Cloud logs between a specified begin and end time period.\\\n WARNING: depending on filters and time period specified, this could take substantial time to complete.'\n  )\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(common.sourcesOptionM)\n  .addOption(\n    new Option(\n      '-l, --level <level>',\n      'Set log level filter. You can specify the level as a number or a string. \\\nFollowing values are possible (values on the same line are equivalent): \\\n\\n0, SEVERE, FATAL, or ERROR\\n1, WARNING, WARN or CONFIG\\\n\\n2, INFO or INFORMATION\\n3, DEBUG, FINE, FINER or FINEST\\\n\\n4 or ALL'\n    ).default('ERROR', `${resolveLevel('ERROR')}`)\n  )\n  .addOption(\n    new Option('-t, --transaction-id <txid>', 'Filter by transactionId')\n  )\n  .addOption(\n    new Option(\n      '-b, --begin-timestamp <beginTs>',\n      'Begin timestamp for period (in ISO8601, example: \"2022-10-13T19:06:28Z\", or \"2022-09.30\". \\\nCannot be more than 30 days in the past. If not specified, logs from one hour ago are fetched \\\n(-e is ignored)'\n    )\n  )\n  .addOption(\n    new Option(\n      '-e, --end-timestamp <endTs>',\n      'End timestamp for period. Default: \"now\"'\n    )\n  )\n  .addOption(\n    new Option(\n      '-s, --search-string <ss>',\n      'Filter by a specific string (ANDed with transactionID filter)'\n    )\n  )\n  .addOption(\n    new Option('-d, --defaults', 'Use default logging noise filters').default(\n      false,\n      `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`\n    )\n  )\n  .action(async (host, user, password, options, command) => {\n    let credsFromParameters = true;\n    state.default.session.setTenant(host);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    const conn = await getConnectionProfile();\n    state.default.session.setTenant(conn.tenant);\n    if (conn.logApiKey != null && conn.logApiSecret != null) {\n      credsFromParameters = false;\n      state.default.session.setLogApiKey(conn.logApiKey);\n      state.default.session.setLogApiSecret(conn.logApiSecret);\n    } else {\n      if (conn.username == null && conn.password == null) {\n        if (\n          !state.default.session.getUsername() &&\n          !state.default.session.getPassword()\n        ) {\n          credsFromParameters = false;\n          printMessage(\n            'User credentials not specified as parameters and no saved API key and secret found!',\n            'warn'\n          );\n          return;\n        }\n      } else {\n        state.default.session.setUsername(conn.username);\n        state.default.session.setPassword(conn.password);\n      }\n      if (await getTokens()) {\n        const creds = await provisionCreds();\n        state.default.session.setLogApiKey(creds.api_key_id);\n        state.default.session.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n    const now = Date.now() / 1000;\n    if (\n      typeof options.beginTimestamp === 'undefined' ||\n      !options.beginTimestamp\n    ) {\n      // no beginTimestamp value specified, default is 1 hour ago\n      const tempStartDate = new Date();\n      tempStartDate.setTime((now - SECONDS_IN_1_HOUR) * 1000);\n      options.beginTimestamp = tempStartDate.toISOString();\n      // also override endTimestamp to now\n      const tempEndDate = new Date();\n      tempEndDate.setTime(now * 1000);\n      options.endTimestamp = tempEndDate;\n      printMessage(\n        'No timestamps specified, defaulting to logs from 1 hour ago',\n        'info'\n      );\n    }\n    if (typeof options.endTimestamp === 'undefined' || !options.endTimestamp) {\n      // no endTimestamp value specified, default is now\n      options.endTimestamp = now * 1000;\n      printMessage(\n        'No end timestamp specified, defaulting end timestamp to \"now\"',\n        'info'\n      );\n    }\n    let beginTs = Date.parse(options.beginTimestamp) / 1000;\n    if (Date.parse(options.endTimestamp) / 1000 < beginTs) {\n      printMessage('End timestamp can not be before begin timestamp', 'error');\n      return;\n    }\n    if (now - beginTs > LOG_TIME_WINDOW_MAX) {\n      printMessage(\n        'Begin timestamp can not be more than 30 days in the past',\n        'error'\n      );\n      return;\n    }\n    let intermediateEndTs = 0;\n    printMessage(\n      `Fetching ID Cloud logs from the following sources: ${\n        command.opts().sources\n      } and levels [${resolveLevel(command.opts().level)}]...`\n    );\n    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n\n    do {\n      intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;\n      await fetchLogs(\n        command.opts().sources,\n        new Date(beginTs * 1000).toISOString(),\n        new Date(intermediateEndTs * 1000).toISOString(),\n        resolveLevel(command.opts().level),\n        command.opts().transactionId,\n        command.opts().searchString,\n        null,\n        config.getNoiseFilters(options.defaults)\n      );\n      beginTs = intermediateEndTs;\n    } while (intermediateEndTs < Date.parse(options.endTimestamp) / 1000);\n  });\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/logging/logs-list.js

@@ -26,10 +26,10 @@ program.description('List available ID Cloud log sources.').helpOption('-h, --he
   printMessage('Listing available ID Cloud log sources...');
   const conn = await getConnectionProfile();
   state.default.session.setTenant(conn.tenant);
-  if (conn.key != null && conn.secret != null) {
+  if (conn.logApiKey != null && conn.logApiSecret != null) {
     credsFromParameters = false;
-    state.default.session.setLogApiKey(conn.key);
-    state.default.session.setLogApiSecret(conn.secret);
+    state.default.session.setLogApiKey(conn.logApiKey);
+    state.default.session.setLogApiSecret(conn.logApiSecret);
   } else {
     if (conn.username == null && conn.password == null) {
       if (!state.default.session.getUsername() && !state.default.session.getPassword()) {
@@ -51,7 +51,7 @@ program.description('List available ID Cloud log sources.').helpOption('-h, --he
   if (sources.length === 0) {
     printMessage("Can't get sources, possible cause - wrong API key or secret", 'error');
   } else {
-    if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI
+    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
     printMessage('Available log sources:');
     sources.forEach(source => {
       printMessage(`${source}`, 'info');

package/esm/cli/logging/logs-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"logs-list.js","names":["Authenticate","ConnectionProfile","Log","state","Command","printMessage","common","provisionCreds","getLogSources","getConnectionProfile","saveConnectionProfile","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","addOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","user","password","options","credsFromParameters","default","session","setTenant","setUsername","setPassword","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","conn","tenant","key","secret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","creds","api_key_id","api_key_secret","sources","length","forEach","source","parse"],"sources":["cli/logging/logs-list.ts"],"sourcesContent":["import {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport { Command } from 'commander';\nimport { printMessage } from '../../utils/Console';\nimport * as common from '../cmd_common';\n\nconst { provisionCreds, getLogSources } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo logs list');\nprogram\n  .description('List available ID Cloud log sources.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .action(async (host, user, password, options) => {\n    let credsFromParameters = true;\n    state.default.session.setTenant(host);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    printMessage('Listing available ID Cloud log sources...');\n    const conn = await getConnectionProfile();\n    state.default.session.setTenant(conn.tenant);\n    if (conn.key != null && conn.secret != null) {\n      credsFromParameters = false;\n      state.default.session.setLogApiKey(conn.key);\n      state.default.session.setLogApiSecret(conn.secret);\n    } else {\n      if (conn.username == null && conn.password == null) {\n        if (\n          !state.default.session.getUsername() &&\n          !state.default.session.getPassword()\n        ) {\n          credsFromParameters = false;\n          printMessage(\n            'User credentials not specified as parameters and no saved API key and secret found!',\n            'warn'\n          );\n          return;\n        }\n      } else {\n        state.default.session.setUsername(conn.username);\n        state.default.session.setPassword(conn.password);\n      }\n      if (await getTokens()) {\n        const creds = await provisionCreds();\n        state.default.session.setLogApiKey(creds.api_key_id);\n        state.default.session.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n\n    const sources = await getLogSources();\n    if (sources.length === 0) {\n      printMessage(\n        \"Can't get sources, possible cause - wrong API key or secret\",\n        'error'\n      );\n    } else {\n      if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI\n      printMessage('Available log sources:');\n      sources.forEach((source) => {\n        printMessage(`${source}`, 'info');\n      });\n      printMessage('You can use any combination of comma separated sources.');\n      printMessage('For example:');\n      printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'info');\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"logs-list.js","names":["Authenticate","ConnectionProfile","Log","state","Command","printMessage","common","provisionCreds","getLogSources","getConnectionProfile","saveConnectionProfile","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","addOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","user","password","options","credsFromParameters","default","session","setTenant","setUsername","setPassword","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","conn","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","creds","api_key_id","api_key_secret","sources","length","forEach","source","parse"],"sources":["cli/logging/logs-list.ts"],"sourcesContent":["import {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport { Command } from 'commander';\nimport { printMessage } from '../../utils/Console';\nimport * as common from '../cmd_common';\n\nconst { provisionCreds, getLogSources } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo logs list');\nprogram\n  .description('List available ID Cloud log sources.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .action(async (host, user, password, options) => {\n    let credsFromParameters = true;\n    state.default.session.setTenant(host);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    printMessage('Listing available ID Cloud log sources...');\n    const conn = await getConnectionProfile();\n    state.default.session.setTenant(conn.tenant);\n    if (conn.logApiKey != null && conn.logApiSecret != null) {\n      credsFromParameters = false;\n      state.default.session.setLogApiKey(conn.logApiKey);\n      state.default.session.setLogApiSecret(conn.logApiSecret);\n    } else {\n      if (conn.username == null && conn.password == null) {\n        if (\n          !state.default.session.getUsername() &&\n          !state.default.session.getPassword()\n        ) {\n          credsFromParameters = false;\n          printMessage(\n            'User credentials not specified as parameters and no saved API key and secret found!',\n            'warn'\n          );\n          return;\n        }\n      } else {\n        state.default.session.setUsername(conn.username);\n        state.default.session.setPassword(conn.password);\n      }\n      if (await getTokens()) {\n        const creds = await provisionCreds();\n        state.default.session.setLogApiKey(creds.api_key_id);\n        state.default.session.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n\n    const sources = await getLogSources();\n    if (sources.length === 0) {\n      printMessage(\n        \"Can't get sources, possible cause - wrong API key or secret\",\n        'error'\n      );\n    } else {\n      if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n      printMessage('Available log sources:');\n      sources.forEach((source) => {\n        printMessage(`${source}`, 'info');\n      });\n      printMessage('You can use any combination of comma separated sources.');\n      printMessage('For example:');\n      printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'info');\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/logging/logs-tail.js

@@ -31,10 +31,10 @@ Following values are possible (values on the same line are equivalent): \
   state.default.session.setCurlirize(options.curlirize);
   const conn = await getConnectionProfile();
   state.default.session.setTenant(conn.tenant);
-  if (conn.key != null && conn.secret != null) {
+  if (conn.logApiKey != null && conn.logApiSecret != null) {
     credsFromParameters = false;
-    state.default.session.setLogApiKey(conn.key);
-    state.default.session.setLogApiSecret(conn.secret);
+    state.default.session.setLogApiKey(conn.logApiKey);
+    state.default.session.setLogApiSecret(conn.logApiSecret);
   } else {
     if (conn.username == null && conn.password == null) {
       if (!state.default.session.getUsername() && !state.default.session.getPassword()) {
@@ -53,7 +53,7 @@ Following values are possible (values on the same line are equivalent): \
     }
   }
   printMessage(`Tailing ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}]...`);
-  if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI
+  if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
   await tailLogs(command.opts().sources, resolveLevel(command.opts().level), command.opts().transactionId, null, config.getNoiseFilters(options.defaults));
 });
 program.parse();

package/esm/cli/logging/logs-tail.js.map

@@ -1 +1 @@
-{"version":3,"file":"logs-tail.js","names":["Command","Option","Authenticate","ConnectionProfile","Log","state","common","config","printMessage","provisionCreds","tailLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","addOption","insecureOption","verboseOption","debugOption","curlirizeOption","sourcesOptionM","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","credsFromParameters","session","setTenant","setUsername","setPassword","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","conn","tenant","key","secret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","creds","api_key_id","api_key_secret","opts","sources","level","transactionId","getNoiseFilters","defaults","parse"],"sources":["cli/logging/logs-tail.ts"],"sourcesContent":["import { Command, Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, tailLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo logs tail');\nprogram\n  .description('Tail Identity Cloud logs.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(common.sourcesOptionM)\n  .addOption(\n    new Option(\n      '-l, --level <level>',\n      'Set log level filter. You can specify the level as a number or a string. \\\nFollowing values are possible (values on the same line are equivalent): \\\n\\n0, SEVERE, FATAL, or ERROR\\n1, WARNING, WARN or CONFIG\\\n\\n2, INFO or INFORMATION\\n3, DEBUG, FINE, FINER or FINEST\\\n\\n4 or ALL'\n    ).default('ERROR', `${resolveLevel('ERROR')}`)\n  )\n  .addOption(\n    new Option('-t, --transaction-id <txid>', 'Filter by transactionId')\n  )\n  .addOption(\n    new Option('-d, --defaults', 'Use default logging noise filters').default(\n      false,\n      `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`\n    )\n  )\n  .action(async (host, user, password, options, command) => {\n    let credsFromParameters = true;\n    state.default.session.setTenant(host);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    const conn = await getConnectionProfile();\n    state.default.session.setTenant(conn.tenant);\n    if (conn.key != null && conn.secret != null) {\n      credsFromParameters = false;\n      state.default.session.setLogApiKey(conn.key);\n      state.default.session.setLogApiSecret(conn.secret);\n    } else {\n      if (conn.username == null && conn.password == null) {\n        if (\n          !state.default.session.getUsername() &&\n          !state.default.session.getPassword()\n        ) {\n          credsFromParameters = false;\n          printMessage(\n            'User credentials not specified as parameters and no saved API key and secret found!',\n            'warn'\n          );\n          return;\n        }\n      } else {\n        state.default.session.setUsername(conn.username);\n        state.default.session.setPassword(conn.password);\n      }\n      if (await getTokens()) {\n        const creds = await provisionCreds();\n        state.default.session.setLogApiKey(creds.api_key_id);\n        state.default.session.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n    printMessage(\n      `Tailing ID Cloud logs from the following sources: ${\n        command.opts().sources\n      } and levels [${resolveLevel(command.opts().level)}]...`\n    );\n    if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI\n    await tailLogs(\n      command.opts().sources,\n      resolveLevel(command.opts().level),\n      command.opts().transactionId,\n      null,\n      config.getNoiseFilters(options.defaults)\n    );\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"logs-tail.js","names":["Command","Option","Authenticate","ConnectionProfile","Log","state","common","config","printMessage","provisionCreds","tailLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","addOption","insecureOption","verboseOption","debugOption","curlirizeOption","sourcesOptionM","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","credsFromParameters","session","setTenant","setUsername","setPassword","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","conn","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","creds","api_key_id","api_key_secret","opts","sources","level","transactionId","getNoiseFilters","defaults","parse"],"sources":["cli/logging/logs-tail.ts"],"sourcesContent":["import { Command, Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, tailLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo logs tail');\nprogram\n  .description('Tail Identity Cloud logs.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(common.sourcesOptionM)\n  .addOption(\n    new Option(\n      '-l, --level <level>',\n      'Set log level filter. You can specify the level as a number or a string. \\\nFollowing values are possible (values on the same line are equivalent): \\\n\\n0, SEVERE, FATAL, or ERROR\\n1, WARNING, WARN or CONFIG\\\n\\n2, INFO or INFORMATION\\n3, DEBUG, FINE, FINER or FINEST\\\n\\n4 or ALL'\n    ).default('ERROR', `${resolveLevel('ERROR')}`)\n  )\n  .addOption(\n    new Option('-t, --transaction-id <txid>', 'Filter by transactionId')\n  )\n  .addOption(\n    new Option('-d, --defaults', 'Use default logging noise filters').default(\n      false,\n      `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`\n    )\n  )\n  .action(async (host, user, password, options, command) => {\n    let credsFromParameters = true;\n    state.default.session.setTenant(host);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    const conn = await getConnectionProfile();\n    state.default.session.setTenant(conn.tenant);\n    if (conn.logApiKey != null && conn.logApiSecret != null) {\n      credsFromParameters = false;\n      state.default.session.setLogApiKey(conn.logApiKey);\n      state.default.session.setLogApiSecret(conn.logApiSecret);\n    } else {\n      if (conn.username == null && conn.password == null) {\n        if (\n          !state.default.session.getUsername() &&\n          !state.default.session.getPassword()\n        ) {\n          credsFromParameters = false;\n          printMessage(\n            'User credentials not specified as parameters and no saved API key and secret found!',\n            'warn'\n          );\n          return;\n        }\n      } else {\n        state.default.session.setUsername(conn.username);\n        state.default.session.setPassword(conn.password);\n      }\n      if (await getTokens()) {\n        const creds = await provisionCreds();\n        state.default.session.setLogApiKey(creds.api_key_id);\n        state.default.session.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n    printMessage(\n      `Tailing ID Cloud logs from the following sources: ${\n        command.opts().sources\n      } and levels [${resolveLevel(command.opts().level)}]...`\n    );\n    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n    await tailLogs(\n      command.opts().sources,\n      resolveLevel(command.opts().level),\n      command.opts().transactionId,\n      null,\n      config.getNoiseFilters(options.defaults)\n    );\n  });\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/service/service-delete.js

@@ -6,7 +6,7 @@ const {
   getTokens
 } = Authenticate;
 const program = new Command('frodo service delete');
-program.description('Delete AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-i, --id <id>', 'Id of Service to be deleted.')).addOption(new Option('-a, --all', 'Delete all services. Ignored with -i.')).action(async (host, realm, user, password, options) => {
+program.description('Delete AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-i, --id <id>', 'Id of Service to be deleted.')).addOption(new Option('-a, --all', 'Delete all services. Ignored with -i.')).addOption(new Option('-g, --global', 'List global services.')).action(async (host, realm, user, password, options) => {
   state.default.session.setTenant(host);
   state.default.session.setRealm(realm);
   state.default.session.setUsername(user);
@@ -16,10 +16,11 @@ program.description('Delete AM services.').helpOption('-h, --help', 'Help').show
   state.default.session.setVerbose(options.verbose);
   state.default.session.setDebug(options.debug);
   state.default.session.setCurlirize(options.curlirize);
+  const globalConfig = options.global ?? false;
   if (options.id && (await getTokens())) {
-    await deleteService(options.id);
+    await deleteService(options.id, globalConfig);
   } else if (options.all && (await getTokens())) {
-    await deleteServices();
+    await deleteServices(globalConfig);
   } else {
     program.help();
   }

package/esm/cli/service/service-delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-delete.js","names":["Authenticate","state","Command","Option","deleteService","deleteServices","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","realm","user","password","options","default","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","id","all","help","parse"],"sources":["cli/service/service-delete.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport { deleteService, deleteServices } from '../../ops/ServiceOps.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service delete');\n\ninterface ServiceDeleteOptions {\n  id?: string;\n  type?: string;\n  insecure?: boolean;\n  verbose?: boolean;\n  debug?: boolean;\n  curlirize?: boolean;\n  all?: boolean;\n}\n\nprogram\n  .description('Delete AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(new Option('-i, --id <id>', 'Id of Service to be deleted.'))\n  .addOption(new Option('-a, --all', 'Delete all services. Ignored with -i.'))\n  .action(\n    async (\n      host: string,\n      realm: string,\n      user: string,\n      password: string,\n      options: ServiceDeleteOptions\n    ) => {\n      state.default.session.setTenant(host);\n      state.default.session.setRealm(realm);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      if (options.id && (await getTokens())) {\n        await deleteService(options.id);\n      } else if (options.all && (await getTokens())) {\n        await deleteServices();\n      } else {\n        program.help();\n      }\n    }\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,EAAEC,KAAK,QAAQ,uBAAuB;AAC3D,SAASC,OAAO,EAAEC,MAAM,QAAQ,WAAW;AAC3C,SAASC,aAAa,EAAEC,cAAc,QAAQ,yBAAyB;AACvE,OAAO,KAAKC,MAAM,MAAM,kBAAkB;AAE1C,MAAM;EAAEC;AAAU,CAAC,GAAGP,YAAY;AAElC,MAAMQ,OAAO,GAAG,IAAIN,OAAO,CAAC,sBAAsB,CAAC;AAYnDM,OAAO,CACJC,WAAW,CAAC,qBAAqB,CAAC,CAClCC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAChCC,kBAAkB,EAAE,CACpBC,WAAW,CAACN,MAAM,CAACO,aAAa,CAAC,CACjCD,WAAW,CAACN,MAAM,CAACQ,aAAa,CAAC,CACjCF,WAAW,CAACN,MAAM,CAACS,YAAY,CAAC,CAChCH,WAAW,CAACN,MAAM,CAACU,gBAAgB,CAAC,CACpCC,SAAS,CAACX,MAAM,CAACY,gBAAgB,CAAC,CAClCD,SAAS,CAACX,MAAM,CAACa,cAAc,CAAC,CAChCF,SAAS,CAACX,MAAM,CAACc,aAAa,CAAC,CAC/BH,SAAS,CAACX,MAAM,CAACe,WAAW,CAAC,CAC7BJ,SAAS,CAACX,MAAM,CAACgB,eAAe,CAAC,CACjCL,SAAS,CAAC,IAAId,MAAM,CAAC,eAAe,EAAE,8BAA8B,CAAC,CAAC,CACtEc,SAAS,CAAC,IAAId,MAAM,CAAC,WAAW,EAAE,uCAAuC,CAAC,CAAC,CAC3EoB,MAAM,CACL,OACEC,IAAY,EACZC,KAAa,EACbC,IAAY,EACZC,QAAgB,EAChBC,OAA6B,KAC1B;EACH3B,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACC,SAAS,CAACP,IAAI,CAAC;EACrCvB,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACE,QAAQ,CAACP,KAAK,CAAC;EACrCxB,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACG,WAAW,CAACP,IAAI,CAAC;EACvCzB,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACI,WAAW,CAACP,QAAQ,CAAC;EAC3C1B,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACK,iBAAiB,CAACP,OAAO,CAACQ,IAAI,CAAC;EACrDnC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACO,0BAA0B,CAACT,OAAO,CAACU,QAAQ,CAAC;EAClErC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACS,UAAU,CAACX,OAAO,CAACY,OAAO,CAAC;EACjDvC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACW,QAAQ,CAACb,OAAO,CAACc,KAAK,CAAC;EAC7CzC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACa,YAAY,CAACf,OAAO,CAACgB,SAAS,CAAC;EACrD,IAAIhB,OAAO,CAACiB,EAAE,KAAK,MAAMtC,SAAS,EAAE,CAAC,EAAE;IACrC,MAAMH,aAAa,CAACwB,OAAO,CAACiB,EAAE,CAAC;EACjC,CAAC,MAAM,IAAIjB,OAAO,CAACkB,GAAG,KAAK,MAAMvC,SAAS,EAAE,CAAC,EAAE;IAC7C,MAAMF,cAAc,EAAE;EACxB,CAAC,MAAM;IACLG,OAAO,CAACuC,IAAI,EAAE;EAChB;AACF,CAAC,CACF;AAEHvC,OAAO,CAACwC,KAAK,EAAE"}
+{"version":3,"file":"service-delete.js","names":["Authenticate","state","Command","Option","deleteService","deleteServices","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","realm","user","password","options","default","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","globalConfig","global","id","all","help","parse"],"sources":["cli/service/service-delete.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport { deleteService, deleteServices } from '../../ops/ServiceOps.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service delete');\n\ninterface ServiceDeleteOptions {\n  id?: string;\n  type?: string;\n  insecure?: boolean;\n  verbose?: boolean;\n  debug?: boolean;\n  curlirize?: boolean;\n  all?: boolean;\n  global?: boolean;\n}\n\nprogram\n  .description('Delete AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(new Option('-i, --id <id>', 'Id of Service to be deleted.'))\n  .addOption(new Option('-a, --all', 'Delete all services. Ignored with -i.'))\n  .addOption(new Option('-g, --global', 'List global services.'))\n  .action(\n    async (\n      host: string,\n      realm: string,\n      user: string,\n      password: string,\n      options: ServiceDeleteOptions\n    ) => {\n      state.default.session.setTenant(host);\n      state.default.session.setRealm(realm);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n\n      const globalConfig = options.global ?? false;\n\n      if (options.id && (await getTokens())) {\n        await deleteService(options.id, globalConfig);\n      } else if (options.all && (await getTokens())) {\n        await deleteServices(globalConfig);\n      } else {\n        program.help();\n      }\n    }\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,EAAEC,KAAK,QAAQ,uBAAuB;AAC3D,SAASC,OAAO,EAAEC,MAAM,QAAQ,WAAW;AAC3C,SAASC,aAAa,EAAEC,cAAc,QAAQ,yBAAyB;AACvE,OAAO,KAAKC,MAAM,MAAM,kBAAkB;AAE1C,MAAM;EAAEC;AAAU,CAAC,GAAGP,YAAY;AAElC,MAAMQ,OAAO,GAAG,IAAIN,OAAO,CAAC,sBAAsB,CAAC;AAanDM,OAAO,CACJC,WAAW,CAAC,qBAAqB,CAAC,CAClCC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAChCC,kBAAkB,EAAE,CACpBC,WAAW,CAACN,MAAM,CAACO,aAAa,CAAC,CACjCD,WAAW,CAACN,MAAM,CAACQ,aAAa,CAAC,CACjCF,WAAW,CAACN,MAAM,CAACS,YAAY,CAAC,CAChCH,WAAW,CAACN,MAAM,CAACU,gBAAgB,CAAC,CACpCC,SAAS,CAACX,MAAM,CAACY,gBAAgB,CAAC,CAClCD,SAAS,CAACX,MAAM,CAACa,cAAc,CAAC,CAChCF,SAAS,CAACX,MAAM,CAACc,aAAa,CAAC,CAC/BH,SAAS,CAACX,MAAM,CAACe,WAAW,CAAC,CAC7BJ,SAAS,CAACX,MAAM,CAACgB,eAAe,CAAC,CACjCL,SAAS,CAAC,IAAId,MAAM,CAAC,eAAe,EAAE,8BAA8B,CAAC,CAAC,CACtEc,SAAS,CAAC,IAAId,MAAM,CAAC,WAAW,EAAE,uCAAuC,CAAC,CAAC,CAC3Ec,SAAS,CAAC,IAAId,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC,CAC9DoB,MAAM,CACL,OACEC,IAAY,EACZC,KAAa,EACbC,IAAY,EACZC,QAAgB,EAChBC,OAA6B,KAC1B;EACH3B,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACC,SAAS,CAACP,IAAI,CAAC;EACrCvB,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACE,QAAQ,CAACP,KAAK,CAAC;EACrCxB,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACG,WAAW,CAACP,IAAI,CAAC;EACvCzB,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACI,WAAW,CAACP,QAAQ,CAAC;EAC3C1B,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACK,iBAAiB,CAACP,OAAO,CAACQ,IAAI,CAAC;EACrDnC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACO,0BAA0B,CAACT,OAAO,CAACU,QAAQ,CAAC;EAClErC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACS,UAAU,CAACX,OAAO,CAACY,OAAO,CAAC;EACjDvC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACW,QAAQ,CAACb,OAAO,CAACc,KAAK,CAAC;EAC7CzC,KAAK,CAAC4B,OAAO,CAACC,OAAO,CAACa,YAAY,CAACf,OAAO,CAACgB,SAAS,CAAC;EAErD,MAAMC,YAAY,GAAGjB,OAAO,CAACkB,MAAM,IAAI,KAAK;EAE5C,IAAIlB,OAAO,CAACmB,EAAE,KAAK,MAAMxC,SAAS,EAAE,CAAC,EAAE;IACrC,MAAMH,aAAa,CAACwB,OAAO,CAACmB,EAAE,EAAEF,YAAY,CAAC;EAC/C,CAAC,MAAM,IAAIjB,OAAO,CAACoB,GAAG,KAAK,MAAMzC,SAAS,EAAE,CAAC,EAAE;IAC7C,MAAMF,cAAc,CAACwC,YAAY,CAAC;EACpC,CAAC,MAAM;IACLrC,OAAO,CAACyC,IAAI,EAAE;EAChB;AACF,CAAC,CACF;AAEHzC,OAAO,CAAC0C,KAAK,EAAE"}

package/esm/cli/service/service-export.js

@@ -7,7 +7,7 @@ const {
   getTokens
 } = Authenticate;
 const program = new Command('frodo service export');
-program.description('Export AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-i, --service-id <service-id>', 'Service id. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the export file.')).addOption(new Option('-a, --all', 'Export all services to a single file.')).addOption(new Option('-A, --all-separate', 'Export all services to separate files (*.service.json) in the current directory. Ignored with -a.')).action(async (host, realm, user, password, options) => {
+program.description('Export AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-i, --service-id <service-id>', 'Service id. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the export file.')).addOption(new Option('-a, --all', 'Export all services to a single file.')).addOption(new Option('-A, --all-separate', 'Export all services to separate files (*.service.json) in the current directory. Ignored with -a.')).addOption(new Option('-g, --global', 'List global services.')).action(async (host, realm, user, password, options) => {
   state.default.session.setTenant(host);
   state.default.session.setRealm(realm);
   state.default.session.setUsername(user);
@@ -17,20 +17,22 @@ program.description('Export AM services.').helpOption('-h, --help', 'Help').show
   state.default.session.setVerbose(options.verbose);
   state.default.session.setDebug(options.debug);
   state.default.session.setCurlirize(options.curlirize);
+  const globalConfig = options.global ?? false;
+
   // export by name
   if (options.serviceId && (await getTokens())) {
     verboseMessage('Exporting service...');
-    await exportServiceToFile(options.serviceId, options.file);
+    await exportServiceToFile(options.serviceId, options.file, globalConfig);
   }
   // -a / --all
   else if (options.all && (await getTokens())) {
     verboseMessage('Exporting all services to a single file...');
-    await exportServicesToFile(options.file);
+    await exportServicesToFile(options.file, globalConfig);
   }
   // -A / --all-separate
   else if (options.allSeparate && (await getTokens())) {
     verboseMessage('Exporting all services to separate files...');
-    await exportServicesToFiles();
+    await exportServicesToFiles(globalConfig);
   }
   // unrecognized combination of options or no options
   else {

package/esm/cli/service/service-export.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-export.js","names":["Authenticate","state","Command","Option","exportServicesToFile","exportServicesToFiles","exportServiceToFile","printMessage","verboseMessage","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","realm","user","password","options","default","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","serviceId","file","all","allSeparate","help","parse"],"sources":["cli/service/service-export.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport {\n  exportServicesToFile,\n  exportServicesToFiles,\n  exportServiceToFile,\n} from '../../ops/ServiceOps.js';\nimport { printMessage, verboseMessage } from '../../utils/Console.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service export');\n\ninterface ServiceExportOptions {\n  file?: string;\n  all?: boolean;\n  serviceId?: string;\n  allSeparate?: boolean;\n  type?: string;\n  insecure?: boolean;\n  verbose?: boolean;\n  debug?: boolean;\n  curlirize?: boolean;\n}\n\nprogram\n  .description('Export AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option(\n      '-i, --service-id <service-id>',\n      'Service id. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(new Option('-f, --file <file>', 'Name of the export file.'))\n  .addOption(new Option('-a, --all', 'Export all services to a single file.'))\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Export all services to separate files (*.service.json) in the current directory. Ignored with -a.'\n    )\n  )\n  .action(\n    async (\n      host: string,\n      realm: string,\n      user: string,\n      password: string,\n      options: ServiceExportOptions\n    ) => {\n      state.default.session.setTenant(host);\n      state.default.session.setRealm(realm);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      // export by name\n      if (options.serviceId && (await getTokens())) {\n        verboseMessage('Exporting service...');\n        await exportServiceToFile(options.serviceId, options.file);\n      }\n      // -a / --all\n      else if (options.all && (await getTokens())) {\n        verboseMessage('Exporting all services to a single file...');\n        await exportServicesToFile(options.file);\n      }\n      // -A / --all-separate\n      else if (options.allSeparate && (await getTokens())) {\n        verboseMessage('Exporting all services to separate files...');\n        await exportServicesToFiles();\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage(\n          'Unrecognized combination of options or no options...',\n          'error'\n        );\n        program.help();\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"service-export.js","names":["Authenticate","state","Command","Option","exportServicesToFile","exportServicesToFiles","exportServiceToFile","printMessage","verboseMessage","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","realm","user","password","options","default","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","globalConfig","global","serviceId","file","all","allSeparate","help","parse"],"sources":["cli/service/service-export.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport {\n  exportServicesToFile,\n  exportServicesToFiles,\n  exportServiceToFile,\n} from '../../ops/ServiceOps.js';\nimport { printMessage, verboseMessage } from '../../utils/Console.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service export');\n\ninterface ServiceExportOptions {\n  file?: string;\n  all?: boolean;\n  serviceId?: string;\n  allSeparate?: boolean;\n  type?: string;\n  insecure?: boolean;\n  verbose?: boolean;\n  debug?: boolean;\n  curlirize?: boolean;\n  global?: boolean;\n}\n\nprogram\n  .description('Export AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option(\n      '-i, --service-id <service-id>',\n      'Service id. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(new Option('-f, --file <file>', 'Name of the export file.'))\n  .addOption(new Option('-a, --all', 'Export all services to a single file.'))\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Export all services to separate files (*.service.json) in the current directory. Ignored with -a.'\n    )\n  )\n  .addOption(new Option('-g, --global', 'List global services.'))\n  .action(\n    async (\n      host: string,\n      realm: string,\n      user: string,\n      password: string,\n      options: ServiceExportOptions\n    ) => {\n      state.default.session.setTenant(host);\n      state.default.session.setRealm(realm);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n\n      const globalConfig = options.global ?? false;\n\n      // export by name\n      if (options.serviceId && (await getTokens())) {\n        verboseMessage('Exporting service...');\n        await exportServiceToFile(\n          options.serviceId,\n          options.file,\n          globalConfig\n        );\n      }\n      // -a / --all\n      else if (options.all && (await getTokens())) {\n        verboseMessage('Exporting all services to a single file...');\n        await exportServicesToFile(options.file, globalConfig);\n      }\n      // -A / --all-separate\n      else if (options.allSeparate && (await getTokens())) {\n        verboseMessage('Exporting all services to separate files...');\n        await exportServicesToFiles(globalConfig);\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage(\n          'Unrecognized combination of options or no options...',\n          'error'\n        );\n        program.help();\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/service/service-import.js

@@ -7,7 +7,7 @@ const {
   getTokens
 } = Authenticate;
 const program = new Command('frodo service import');
-program.description('Import AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-i, --service-id <service-id>', 'Service id. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the file to import SAML Entity(s) from. Ignored with -A.')).addOption(new Option('-a, --all', 'Import all services from a single file.')).addOption(new Option('-C, --clean', 'Remove existing service(s) before importing.')).addOption(new Option('-A, --all-separate', 'Import all services from separate files <id>.service.json.')).addOption(new Option('-D, --directory <directory>', 'Working directory.')).action(async (host, realm, user, password, options) => {
+program.description('Import AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-i, --service-id <service-id>', 'Service id. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the file to import SAML Entity(s) from. Ignored with -A.')).addOption(new Option('-a, --all', 'Import all services from a single file.')).addOption(new Option('-C, --clean', 'Remove existing service(s) before importing.')).addOption(new Option('-A, --all-separate', 'Import all services from separate files <id>.service.json.')).addOption(new Option('-D, --directory <directory>', 'Working directory.')).addOption(new Option('-g, --global', 'List global services.')).action(async (host, realm, user, password, options) => {
   state.default.session.setTenant(host);
   state.default.session.setRealm(realm);
   state.default.session.setUsername(user);
@@ -19,26 +19,27 @@ program.description('Import AM services.').helpOption('-h, --help', 'Help').show
   state.default.session.setCurlirize(options.curlirize);
   state.default.session.setDirectory(options.directory || '.');
   const clean = options.clean ?? false;
+  const globalConfig = options.global ?? false;
 
   // import by id
   if (options.serviceId && options.file && (await getTokens())) {
     verboseMessage('Importing service...');
-    await importServiceFromFile(options.serviceId, options.file, clean);
+    await importServiceFromFile(options.serviceId, options.file, clean, globalConfig);
   }
   // -a / --all
   else if (options.all && options.file && (await getTokens())) {
     verboseMessage('Importing all services from a single file...');
-    await importServicesFromFile(options.file, clean);
+    await importServicesFromFile(options.file, clean, globalConfig);
   }
   // -A / --all-separate
   else if (options.allSeparate && (await getTokens())) {
     verboseMessage('Importing all services from separate files...');
-    await importServicesFromFiles(clean);
+    await importServicesFromFiles(clean, globalConfig);
   }
   // import file
   else if (options.file && (await getTokens())) {
     verboseMessage('Importing service...');
-    await importFirstServiceFromFile(options.file, clean);
+    await importFirstServiceFromFile(options.file, clean, globalConfig);
   }
   // unrecognized combination of options or no options
   else {

package/esm/cli/service/service-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-import.js","names":["Authenticate","state","Command","Option","importFirstServiceFromFile","importServiceFromFile","importServicesFromFile","importServicesFromFiles","printMessage","verboseMessage","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","realm","user","password","options","default","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","setDirectory","directory","clean","serviceId","file","all","allSeparate","help","parse"],"sources":["cli/service/service-import.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport {\n  importFirstServiceFromFile,\n  importServiceFromFile,\n  importServicesFromFile,\n  importServicesFromFiles,\n} from '../../ops/ServiceOps.js';\nimport { printMessage, verboseMessage } from '../../utils/Console.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service import');\n\ninterface ServiceImportOptions {\n  file?: string;\n  all?: boolean;\n  serviceId?: string;\n  allSeparate?: boolean;\n  type?: string;\n  insecure?: boolean;\n  clean?: boolean;\n  directory?: string;\n  verbose?: boolean;\n  debug?: boolean;\n  curlirize?: boolean;\n}\n\nprogram\n  .description('Import AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option(\n      '-i, --service-id <service-id>',\n      'Service id. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-f, --file <file>',\n      'Name of the file to import SAML Entity(s) from. Ignored with -A.'\n    )\n  )\n  .addOption(new Option('-a, --all', 'Import all services from a single file.'))\n  .addOption(\n    new Option('-C, --clean', 'Remove existing service(s) before importing.')\n  )\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Import all services from separate files <id>.service.json.'\n    )\n  )\n  .addOption(new Option('-D, --directory <directory>', 'Working directory.'))\n  .action(\n    async (\n      host: string,\n      realm: string,\n      user: string,\n      password: string,\n      options: ServiceImportOptions\n    ) => {\n      state.default.session.setTenant(host);\n      state.default.session.setRealm(realm);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      state.default.session.setDirectory(options.directory || '.');\n\n      const clean = options.clean ?? false;\n\n      // import by id\n      if (options.serviceId && options.file && (await getTokens())) {\n        verboseMessage('Importing service...');\n        await importServiceFromFile(options.serviceId, options.file, clean);\n      }\n      // -a / --all\n      else if (options.all && options.file && (await getTokens())) {\n        verboseMessage('Importing all services from a single file...');\n        await importServicesFromFile(options.file, clean);\n      }\n      // -A / --all-separate\n      else if (options.allSeparate && (await getTokens())) {\n        verboseMessage('Importing all services from separate files...');\n        await importServicesFromFiles(clean);\n      }\n      // import file\n      else if (options.file && (await getTokens())) {\n        verboseMessage('Importing service...');\n        await importFirstServiceFromFile(options.file, clean);\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage(\n          'Unrecognized combination of options or no options...',\n          'error'\n        );\n        program.help();\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"service-import.js","names":["Authenticate","state","Command","Option","importFirstServiceFromFile","importServiceFromFile","importServicesFromFile","importServicesFromFiles","printMessage","verboseMessage","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","realm","user","password","options","default","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","setDirectory","directory","clean","globalConfig","global","serviceId","file","all","allSeparate","help","parse"],"sources":["cli/service/service-import.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport {\n  importFirstServiceFromFile,\n  importServiceFromFile,\n  importServicesFromFile,\n  importServicesFromFiles,\n} from '../../ops/ServiceOps.js';\nimport { printMessage, verboseMessage } from '../../utils/Console.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service import');\n\ninterface ServiceImportOptions {\n  file?: string;\n  all?: boolean;\n  serviceId?: string;\n  allSeparate?: boolean;\n  type?: string;\n  insecure?: boolean;\n  clean?: boolean;\n  directory?: string;\n  verbose?: boolean;\n  debug?: boolean;\n  curlirize?: boolean;\n  global?: boolean;\n}\n\nprogram\n  .description('Import AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option(\n      '-i, --service-id <service-id>',\n      'Service id. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-f, --file <file>',\n      'Name of the file to import SAML Entity(s) from. Ignored with -A.'\n    )\n  )\n  .addOption(new Option('-a, --all', 'Import all services from a single file.'))\n  .addOption(\n    new Option('-C, --clean', 'Remove existing service(s) before importing.')\n  )\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Import all services from separate files <id>.service.json.'\n    )\n  )\n  .addOption(new Option('-D, --directory <directory>', 'Working directory.'))\n  .addOption(new Option('-g, --global', 'List global services.'))\n  .action(\n    async (\n      host: string,\n      realm: string,\n      user: string,\n      password: string,\n      options: ServiceImportOptions\n    ) => {\n      state.default.session.setTenant(host);\n      state.default.session.setRealm(realm);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      state.default.session.setDirectory(options.directory || '.');\n\n      const clean = options.clean ?? false;\n      const globalConfig = options.global ?? false;\n\n      // import by id\n      if (options.serviceId && options.file && (await getTokens())) {\n        verboseMessage('Importing service...');\n        await importServiceFromFile(\n          options.serviceId,\n          options.file,\n          clean,\n          globalConfig\n        );\n      }\n      // -a / --all\n      else if (options.all && options.file && (await getTokens())) {\n        verboseMessage('Importing all services from a single file...');\n        await importServicesFromFile(options.file, clean, globalConfig);\n      }\n      // -A / --all-separate\n      else if (options.allSeparate && (await getTokens())) {\n        verboseMessage('Importing all services from separate files...');\n        await importServicesFromFiles(clean, globalConfig);\n      }\n      // import file\n      else if (options.file && (await getTokens())) {\n        verboseMessage('Importing service...');\n        await importFirstServiceFromFile(options.file, clean, globalConfig);\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage(\n          'Unrecognized combination of options or no options...',\n          'error'\n        );\n        program.help();\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/service/service-list.js

@@ -7,7 +7,7 @@ const {
   getTokens
 } = Authenticate;
 const program = new Command('frodo service list');
-program.description('List AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-l, --long', 'Long with all fields.').default(false, 'false')).action(async (host, realm, user, password, options) => {
+program.description('List AM services.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.realmArgument).addArgument(common.userArgument).addArgument(common.passwordArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('-l, --long', 'Long with all fields.').default(false, 'false')).addOption(new Option('-g, --global', 'List global services.')).action(async (host, realm, user, password, options) => {
   state.default.session.setTenant(host);
   state.default.session.setRealm(realm);
   state.default.session.setUsername(user);
@@ -19,7 +19,7 @@ program.description('List AM services.').helpOption('-h, --help', 'Help').showHe
   state.default.session.setCurlirize(options.curlirize);
   if (await getTokens()) {
     verboseMessage(`Listing all AM services for realm: ${realm}`);
-    await listServices(options.long);
+    await listServices(options.long, options.global);
   }
 });
 program.parse();

package/esm/cli/service/service-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-list.js","names":["Authenticate","state","Command","Option","listServices","verboseMessage","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","default","action","host","realm","user","password","options","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","long","parse"],"sources":["cli/service/service-list.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport { listServices } from '../../ops/ServiceOps.js';\nimport { verboseMessage } from '../../utils/Console.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service list');\n\nprogram\n  .description('List AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option('-l, --long', 'Long with all fields.').default(false, 'false')\n  )\n  .action(async (host, realm, user, password, options) => {\n    state.default.session.setTenant(host);\n    state.default.session.setRealm(realm);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setDeploymentType(options.type);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    if (await getTokens()) {\n      verboseMessage(`Listing all AM services for realm: ${realm}`);\n      await listServices(options.long);\n    }\n  });\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,EAAEC,KAAK,QAAQ,uBAAuB;AAC3D,SAASC,OAAO,EAAEC,MAAM,QAAQ,WAAW;AAC3C,SAASC,YAAY,QAAQ,yBAAyB;AACtD,SAASC,cAAc,QAAQ,wBAAwB;AACvD,OAAO,KAAKC,MAAM,MAAM,kBAAkB;AAE1C,MAAM;EAAEC;AAAU,CAAC,GAAGP,YAAY;AAElC,MAAMQ,OAAO,GAAG,IAAIN,OAAO,CAAC,oBAAoB,CAAC;AAEjDM,OAAO,CACJC,WAAW,CAAC,mBAAmB,CAAC,CAChCC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAChCC,kBAAkB,EAAE,CACpBC,WAAW,CAACN,MAAM,CAACO,aAAa,CAAC,CACjCD,WAAW,CAACN,MAAM,CAACQ,aAAa,CAAC,CACjCF,WAAW,CAACN,MAAM,CAACS,YAAY,CAAC,CAChCH,WAAW,CAACN,MAAM,CAACU,gBAAgB,CAAC,CACpCC,SAAS,CAACX,MAAM,CAACY,gBAAgB,CAAC,CAClCD,SAAS,CAACX,MAAM,CAACa,cAAc,CAAC,CAChCF,SAAS,CAACX,MAAM,CAACc,aAAa,CAAC,CAC/BH,SAAS,CAACX,MAAM,CAACe,WAAW,CAAC,CAC7BJ,SAAS,CAACX,MAAM,CAACgB,eAAe,CAAC,CACjCL,SAAS,CACR,IAAId,MAAM,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAACoB,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAC1E,CACAC,MAAM,CAAC,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,KAAK;EACtD5B,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACC,SAAS,CAACN,IAAI,CAAC;EACrCxB,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACE,QAAQ,CAACN,KAAK,CAAC;EACrCzB,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACG,WAAW,CAACN,IAAI,CAAC;EACvC1B,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACI,WAAW,CAACN,QAAQ,CAAC;EAC3C3B,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACK,iBAAiB,CAACN,OAAO,CAACO,IAAI,CAAC;EACrDnC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACO,0BAA0B,CAACR,OAAO,CAACS,QAAQ,CAAC;EAClErC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACS,UAAU,CAACV,OAAO,CAACW,OAAO,CAAC;EACjDvC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACW,QAAQ,CAACZ,OAAO,CAACa,KAAK,CAAC;EAC7CzC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACa,YAAY,CAACd,OAAO,CAACe,SAAS,CAAC;EACrD,IAAI,MAAMrC,SAAS,EAAE,EAAE;IACrBF,cAAc,CAAE,sCAAqCqB,KAAM,EAAC,CAAC;IAC7D,MAAMtB,YAAY,CAACyB,OAAO,CAACgB,IAAI,CAAC;EAClC;AACF,CAAC,CAAC;AAEJrC,OAAO,CAACsC,KAAK,EAAE"}
+{"version":3,"file":"service-list.js","names":["Authenticate","state","Command","Option","listServices","verboseMessage","common","getTokens","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","realmArgument","userArgument","passwordArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","default","action","host","realm","user","password","options","session","setTenant","setRealm","setUsername","setPassword","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","long","global","parse"],"sources":["cli/service/service-list.ts"],"sourcesContent":["import { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { Command, Option } from 'commander';\nimport { listServices } from '../../ops/ServiceOps.js';\nimport { verboseMessage } from '../../utils/Console.js';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\n\nconst program = new Command('frodo service list');\n\nprogram\n  .description('List AM services.')\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.realmArgument)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(\n    new Option('-l, --long', 'Long with all fields.').default(false, 'false')\n  )\n  .addOption(new Option('-g, --global', 'List global services.'))\n  .action(async (host, realm, user, password, options) => {\n    state.default.session.setTenant(host);\n    state.default.session.setRealm(realm);\n    state.default.session.setUsername(user);\n    state.default.session.setPassword(password);\n    state.default.session.setDeploymentType(options.type);\n    state.default.session.setAllowInsecureConnection(options.insecure);\n    state.default.session.setVerbose(options.verbose);\n    state.default.session.setDebug(options.debug);\n    state.default.session.setCurlirize(options.curlirize);\n    if (await getTokens()) {\n      verboseMessage(`Listing all AM services for realm: ${realm}`);\n      await listServices(options.long, options.global);\n    }\n  });\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,EAAEC,KAAK,QAAQ,uBAAuB;AAC3D,SAASC,OAAO,EAAEC,MAAM,QAAQ,WAAW;AAC3C,SAASC,YAAY,QAAQ,yBAAyB;AACtD,SAASC,cAAc,QAAQ,wBAAwB;AACvD,OAAO,KAAKC,MAAM,MAAM,kBAAkB;AAE1C,MAAM;EAAEC;AAAU,CAAC,GAAGP,YAAY;AAElC,MAAMQ,OAAO,GAAG,IAAIN,OAAO,CAAC,oBAAoB,CAAC;AAEjDM,OAAO,CACJC,WAAW,CAAC,mBAAmB,CAAC,CAChCC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAChCC,kBAAkB,EAAE,CACpBC,WAAW,CAACN,MAAM,CAACO,aAAa,CAAC,CACjCD,WAAW,CAACN,MAAM,CAACQ,aAAa,CAAC,CACjCF,WAAW,CAACN,MAAM,CAACS,YAAY,CAAC,CAChCH,WAAW,CAACN,MAAM,CAACU,gBAAgB,CAAC,CACpCC,SAAS,CAACX,MAAM,CAACY,gBAAgB,CAAC,CAClCD,SAAS,CAACX,MAAM,CAACa,cAAc,CAAC,CAChCF,SAAS,CAACX,MAAM,CAACc,aAAa,CAAC,CAC/BH,SAAS,CAACX,MAAM,CAACe,WAAW,CAAC,CAC7BJ,SAAS,CAACX,MAAM,CAACgB,eAAe,CAAC,CACjCL,SAAS,CACR,IAAId,MAAM,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAACoB,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAC1E,CACAN,SAAS,CAAC,IAAId,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC,CAC9DqB,MAAM,CAAC,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,KAAK;EACtD5B,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACC,SAAS,CAACN,IAAI,CAAC;EACrCxB,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACE,QAAQ,CAACN,KAAK,CAAC;EACrCzB,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACG,WAAW,CAACN,IAAI,CAAC;EACvC1B,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACI,WAAW,CAACN,QAAQ,CAAC;EAC3C3B,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACK,iBAAiB,CAACN,OAAO,CAACO,IAAI,CAAC;EACrDnC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACO,0BAA0B,CAACR,OAAO,CAACS,QAAQ,CAAC;EAClErC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACS,UAAU,CAACV,OAAO,CAACW,OAAO,CAAC;EACjDvC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACW,QAAQ,CAACZ,OAAO,CAACa,KAAK,CAAC;EAC7CzC,KAAK,CAACsB,OAAO,CAACO,OAAO,CAACa,YAAY,CAACd,OAAO,CAACe,SAAS,CAAC;EACrD,IAAI,MAAMrC,SAAS,EAAE,EAAE;IACrBF,cAAc,CAAE,sCAAqCqB,KAAM,EAAC,CAAC;IAC7D,MAAMtB,YAAY,CAACyB,OAAO,CAACgB,IAAI,EAAEhB,OAAO,CAACiB,MAAM,CAAC;EAClD;AACF,CAAC,CAAC;AAEJtC,OAAO,CAACuC,KAAK,EAAE"}

package/esm/ops/ConnectionProfileOps.js

@@ -0,0 +1,30 @@
+import fs from 'fs';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
+import { failSpinner, showSpinner, succeedSpinner } from '../utils/Console';
+const {
+  getAccessTokenForServiceAccount
+} = Authenticate;
+export async function addExistingServiceAccount(serviceAccountId, privateKeyFile, validate) {
+  try {
+    const data = fs.readFileSync(privateKeyFile);
+    const jwk = JSON.parse(data.toString());
+    if (validate) {
+      showSpinner(`Validating service account ${serviceAccountId}...`);
+      const token = await getAccessTokenForServiceAccount(serviceAccountId, jwk);
+      if (token === null) {
+        failSpinner(`Failed to validate service account ${serviceAccountId}.`);
+        return false;
+      } else {
+        succeedSpinner(`Successfully validated service account ${serviceAccountId}.`);
+      }
+    }
+    state.default.session.setServiceAccountId(serviceAccountId);
+    state.default.session.setServiceAccountJwk(jwk);
+    return true;
+  } catch (err) {
+    failSpinner(`Failed to validate service account ${serviceAccountId}: ${err}.`);
+    return false;
+  }
+  return false;
+}
+//# sourceMappingURL=ConnectionProfileOps.js.map

package/esm/ops/ConnectionProfileOps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConnectionProfileOps.js","names":["fs","Authenticate","state","failSpinner","showSpinner","succeedSpinner","getAccessTokenForServiceAccount","addExistingServiceAccount","serviceAccountId","privateKeyFile","validate","data","readFileSync","jwk","JSON","parse","toString","token","default","session","setServiceAccountId","setServiceAccountJwk","err"],"sources":["ops/ConnectionProfileOps.ts"],"sourcesContent":["import fs from 'fs';\nimport { Authenticate, state } from '@rockcarver/frodo-lib';\nimport { failSpinner, showSpinner, succeedSpinner } from '../utils/Console';\n\nconst { getAccessTokenForServiceAccount } = Authenticate;\n\nexport async function addExistingServiceAccount(\n  serviceAccountId: string,\n  privateKeyFile: string,\n  validate: boolean\n): Promise<boolean> {\n  try {\n    const data = fs.readFileSync(privateKeyFile);\n    const jwk = JSON.parse(data.toString());\n    if (validate) {\n      showSpinner(`Validating service account ${serviceAccountId}...`);\n      const token = await getAccessTokenForServiceAccount(\n        serviceAccountId,\n        jwk\n      );\n      if (token === null) {\n        failSpinner(`Failed to validate service account ${serviceAccountId}.`);\n        return false;\n      } else {\n        succeedSpinner(\n          `Successfully validated service account ${serviceAccountId}.`\n        );\n      }\n    }\n    state.default.session.setServiceAccountId(serviceAccountId);\n    state.default.session.setServiceAccountJwk(jwk);\n    return true;\n  } catch (err) {\n    failSpinner(\n      `Failed to validate service account ${serviceAccountId}: ${err}.`\n    );\n    return false;\n  }\n  return false;\n}\n"],"mappings":"AAAA,OAAOA,EAAE,MAAM,IAAI;AACnB,SAASC,YAAY,EAAEC,KAAK,QAAQ,uBAAuB;AAC3D,SAASC,WAAW,EAAEC,WAAW,EAAEC,cAAc,QAAQ,kBAAkB;AAE3E,MAAM;EAAEC;AAAgC,CAAC,GAAGL,YAAY;AAExD,OAAO,eAAeM,yBAAyB,CAC7CC,gBAAwB,EACxBC,cAAsB,EACtBC,QAAiB,EACC;EAClB,IAAI;IACF,MAAMC,IAAI,GAAGX,EAAE,CAACY,YAAY,CAACH,cAAc,CAAC;IAC5C,MAAMI,GAAG,GAAGC,IAAI,CAACC,KAAK,CAACJ,IAAI,CAACK,QAAQ,EAAE,CAAC;IACvC,IAAIN,QAAQ,EAAE;MACZN,WAAW,CAAE,8BAA6BI,gBAAiB,KAAI,CAAC;MAChE,MAAMS,KAAK,GAAG,MAAMX,+BAA+B,CACjDE,gBAAgB,EAChBK,GAAG,CACJ;MACD,IAAII,KAAK,KAAK,IAAI,EAAE;QAClBd,WAAW,CAAE,sCAAqCK,gBAAiB,GAAE,CAAC;QACtE,OAAO,KAAK;MACd,CAAC,MAAM;QACLH,cAAc,CACX,0CAAyCG,gBAAiB,GAAE,CAC9D;MACH;IACF;IACAN,KAAK,CAACgB,OAAO,CAACC,OAAO,CAACC,mBAAmB,CAACZ,gBAAgB,CAAC;IAC3DN,KAAK,CAACgB,OAAO,CAACC,OAAO,CAACE,oBAAoB,CAACR,GAAG,CAAC;IAC/C,OAAO,IAAI;EACb,CAAC,CAAC,OAAOS,GAAG,EAAE;IACZnB,WAAW,CACR,sCAAqCK,gBAAiB,KAAIc,GAAI,GAAE,CAClE;IACD,OAAO,KAAK;EACd;EACA,OAAO,KAAK;AACd"}

package/esm/ops/ServiceOps.js

@@ -25,9 +25,9 @@ const {
 /**
  * List services
  */
-export async function listServices(long = false) {
+export async function listServices(long = false, globalConfig = false) {
   try {
-    const services = await getListOfServices();
+    const services = await getListOfServices(globalConfig);
     services.sort((a, b) => a._id.localeCompare(b._id));
     if (long) {
       const table = createTable(['Service Id', 'Service Name']);
@@ -50,8 +50,8 @@ export async function listServices(long = false) {
  * Export all services to file
  * @param {string} file file name
  */
-export async function exportServicesToFile(file) {
-  const exportData = await exportServices();
+export async function exportServicesToFile(file, globalConfig = false) {
+  const exportData = await exportServices(globalConfig);
   let fileName = getTypedFilename(`all${titleCase(getRealmName(state.default.session.getRealm()))}Services`, `service`);
   if (file) {
     fileName = file;
@@ -64,8 +64,8 @@ export async function exportServicesToFile(file) {
  * @param {string} serviceId service id
  * @param {string} file file name
  */
-export async function exportServiceToFile(serviceId, file) {
-  const exportData = await exportService(serviceId);
+export async function exportServiceToFile(serviceId, file, globalConfig = false) {
+  const exportData = await exportService(serviceId, globalConfig);
   let fileName = getTypedFilename(serviceId, `service`);
   if (file) {
     fileName = file;
@@ -76,9 +76,9 @@ export async function exportServiceToFile(serviceId, file) {
 /**
  * Export all services to separate files
  */
-export async function exportServicesToFiles() {
+export async function exportServicesToFiles(globalConfig = false) {
   debugMessage(`cli.ServiceOps.exportServicesToFiles: start`);
-  const services = await getFullServices();
+  const services = await getFullServices(globalConfig);
   for (const service of services) {
     const fileName = getTypedFilename(service._type._id, `service`);
     const exportData = createServiceExportTemplate();
@@ -95,7 +95,7 @@ export async function exportServicesToFiles() {
  * @param {string} file import file name
  * @param {boolean} clean remove existing service
  */
-export async function importServiceFromFile(serviceId, file, clean) {
+export async function importServiceFromFile(serviceId, file, clean, globalConfig = false) {
   debugMessage(`cli.ServiceOps.importServiceFromFile: start [serviceId=${serviceId}, file=${file}]`);
   const verbose = state.default.session.getVerbose();
   fs.readFile(file, 'utf8', async (err, data) => {
@@ -105,7 +105,7 @@ export async function importServiceFromFile(serviceId, file, clean) {
       if (!verbose) showSpinner(`Importing ${serviceId}...`);
       try {
         if (verbose) showSpinner(`Importing ${serviceId}...`);
-        await importService(serviceId, importData, clean);
+        await importService(serviceId, importData, clean, globalConfig);
         succeedSpinner(`Imported ${serviceId}.`);
       } catch (importError) {
         var _importError$response, _importError$response2, _importError$response3, _importError$response4;
@@ -127,7 +127,7 @@ export async function importServiceFromFile(serviceId, file, clean) {
  * @param {string} file import file name
  * @param {boolean} clean remove existing service
  */
-export async function importFirstServiceFromFile(file, clean) {
+export async function importFirstServiceFromFile(file, clean, globalConfig = false) {
   debugMessage(`cli.ServiceOps.importFirstServiceFromFile: start [file=${file}]`);
   const verbose = state.default.session.getVerbose();
   fs.readFile(file, 'utf8', async (err, data) => {
@@ -138,7 +138,7 @@ export async function importFirstServiceFromFile(file, clean) {
       if (!verbose) showSpinner(`Importing ${serviceId}...`);
       try {
         if (verbose) showSpinner(`Importing ${serviceId}...`);
-        await importService(serviceId, importData, clean);
+        await importService(serviceId, importData, clean, globalConfig);
         succeedSpinner(`Imported ${serviceId}.`);
       } catch (importError) {
         var _importError$response5, _importError$response6, _importError$response7, _importError$response8;
@@ -160,14 +160,14 @@ export async function importFirstServiceFromFile(file, clean) {
  * @param {String} file file name
  * @param {boolean} clean remove existing service
  */
-export async function importServicesFromFile(file, clean) {
+export async function importServicesFromFile(file, clean, globalConfig = false) {
   debugMessage(`cli.ServiceOps.importServiceFromFile: start [file=${file}]`);
   fs.readFile(file, 'utf8', async (err, data) => {
     if (err) throw err;
     debugMessage(`cli.ServiceOps.importServiceFromFile: importing ${file}`);
     const importData = JSON.parse(data);
     try {
-      await importServices(importData, clean);
+      await importServices(importData, clean, globalConfig);
     } catch (error) {
       printMessage(`${error.message}`, 'error');
       printMessage(error.response.status, 'error');
@@ -180,12 +180,12 @@ export async function importServicesFromFile(file, clean) {
  * Import all services from separate files
  * @param {boolean} clean remove existing service
  */
-export async function importServicesFromFiles(clean) {
+export async function importServicesFromFiles(clean, globalConfig = false) {
   debugMessage(`cli.ServiceOps.importServicesFromFiles: start`);
   const names = fs.readdirSync(getWorkingDirectory());
   const agentFiles = names.filter(name => name.toLowerCase().endsWith('.service.json'));
   for (const file of agentFiles) {
-    await importServicesFromFile(file, clean);
+    await importServicesFromFile(file, clean, globalConfig);
   }
   debugMessage(`cli.ServiceOps.importServicesFromFiles: end`);
 }
@@ -194,9 +194,9 @@ export async function importServicesFromFiles(clean) {
  * Delete a service by id/name
  * @param {string} serviceId Reference to the service to delete
  */
-export async function deleteService(serviceId) {
+export async function deleteService(serviceId, globalConfig = false) {
   try {
-    await deleteFullService(serviceId);
+    await deleteFullService(serviceId, globalConfig);
   } catch (error) {
     var _error$response, _error$response$data;
     const message = (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.message;
@@ -207,7 +207,7 @@ export async function deleteService(serviceId) {
 /**
  * Delete all services
  */
-export async function deleteServices() {
-  await deleteFullServices();
+export async function deleteServices(globalConfig = false) {
+  await deleteFullServices(globalConfig);
 }
 //# sourceMappingURL=ServiceOps.js.map

package/esm/ops/ServiceOps.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOps.js","names":["fs","printMessage","createTable","debugMessage","showSpinner","succeedSpinner","failSpinner","ExportImportUtils","Service","Utils","state","createServiceExportTemplate","deleteFullServices","deleteFullService","getListOfServices","getFullServices","exportServices","exportService","importServices","importService","getTypedFilename","getWorkingDirectory","saveJsonToFile","titleCase","getRealmName","listServices","long","services","sort","a","b","_id","localeCompare","table","service","push","name","toString","error","stack","exportServicesToFile","file","exportData","fileName","default","session","getRealm","exportServiceToFile","serviceId","exportServicesToFiles","_type","importServiceFromFile","clean","verbose","getVerbose","readFile","err","data","importData","JSON","parse","importError","message","response","detail","importFirstServiceFromFile","Object","keys","length","importServicesFromFile","status","importServicesFromFiles","names","readdirSync","agentFiles","filter","toLowerCase","endsWith","deleteService","deleteServices"],"sources":["ops/ServiceOps.ts"],"sourcesContent":["import fs from 'fs';\nimport {\n  printMessage,\n  createTable,\n  debugMessage,\n  showSpinner,\n  succeedSpinner,\n  failSpinner,\n} from '../utils/Console';\nimport {\n  ExportImportUtils,\n  Service,\n  Utils,\n  state,\n} from '@rockcarver/frodo-lib';\nimport { ServiceExportInterface } from '@rockcarver/frodo-lib/types/ops/OpsTypes';\n\nconst {\n  createServiceExportTemplate,\n  deleteFullServices,\n  deleteFullService,\n  getListOfServices,\n  getFullServices,\n  exportServices,\n  exportService,\n  importServices,\n  importService,\n} = Service;\nconst { getTypedFilename, getWorkingDirectory, saveJsonToFile, titleCase } =\n  ExportImportUtils;\nconst { getRealmName } = Utils;\n\n/**\n * List services\n */\nexport async function listServices(long = false) {\n  try {\n    const services = await getListOfServices();\n    services.sort((a, b) => a._id.localeCompare(b._id));\n    if (long) {\n      const table = createTable(['Service Id', 'Service Name']);\n      for (const service of services) {\n        table.push([service._id, service.name]);\n      }\n      printMessage(table.toString(), 'data');\n    } else {\n      for (const service of services) {\n        printMessage(`${service._id}`, 'data');\n      }\n    }\n  } catch (error) {\n    printMessage(`Error listing agents - ${error}`, 'error');\n    printMessage(error.stack, 'error');\n  }\n}\n\n/**\n * Export all services to file\n * @param {string} file file name\n */\nexport async function exportServicesToFile(file) {\n  const exportData = await exportServices();\n  let fileName = getTypedFilename(\n    `all${titleCase(getRealmName(state.default.session.getRealm()))}Services`,\n    `service`\n  );\n  if (file) {\n    fileName = file;\n  }\n  saveJsonToFile(exportData, fileName);\n}\n\n/**\n * Export service to file\n * @param {string} serviceId service id\n * @param {string} file file name\n */\nexport async function exportServiceToFile(serviceId: string, file: string) {\n  const exportData = await exportService(serviceId);\n  let fileName = getTypedFilename(serviceId, `service`);\n  if (file) {\n    fileName = file;\n  }\n  saveJsonToFile(exportData, fileName);\n}\n\n/**\n * Export all services to separate files\n */\nexport async function exportServicesToFiles() {\n  debugMessage(`cli.ServiceOps.exportServicesToFiles: start`);\n  const services = await getFullServices();\n  for (const service of services) {\n    const fileName = getTypedFilename(service._type._id, `service`);\n    const exportData = createServiceExportTemplate();\n    exportData.service[service._type._id] = service;\n    debugMessage(\n      `cli.ServiceOps.exportServicesToFiles: exporting ${service._type._id} to ${fileName}`\n    );\n    saveJsonToFile(exportData, fileName);\n  }\n  debugMessage(`cli.ServiceOps.exportServicesToFiles: end.`);\n}\n\n/**\n * Import a service from file\n * @param {string} serviceId service id/name\n * @param {string} file import file name\n * @param {boolean} clean remove existing service\n */\nexport async function importServiceFromFile(\n  serviceId: string,\n  file: string,\n  clean: boolean\n) {\n  debugMessage(\n    `cli.ServiceOps.importServiceFromFile: start [serviceId=${serviceId}, file=${file}]`\n  );\n  const verbose = state.default.session.getVerbose();\n  fs.readFile(file, 'utf8', async (err, data) => {\n    if (err) throw err;\n    const importData = JSON.parse(data);\n    if (importData && importData.service[serviceId]) {\n      if (!verbose) showSpinner(`Importing ${serviceId}...`);\n      try {\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        await importService(serviceId, importData, clean);\n        succeedSpinner(`Imported ${serviceId}.`);\n      } catch (importError) {\n        const message = importError.response?.data?.message;\n        const detail = importError.response?.data?.detail;\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        failSpinner(`${detail ? message + ' - ' + detail : message}`);\n      }\n    } else {\n      showSpinner(`Importing ${serviceId}...`);\n      failSpinner(`${serviceId} not found!`);\n    }\n  });\n  debugMessage(\n    `cli.ServiceOps.importServiceFromFile: end [serviceId=${serviceId}, file=${file}]`\n  );\n}\n\n/**\n * Import first service from file\n * @param {string} file import file name\n * @param {boolean} clean remove existing service\n */\nexport async function importFirstServiceFromFile(file: string, clean: boolean) {\n  debugMessage(\n    `cli.ServiceOps.importFirstServiceFromFile: start [file=${file}]`\n  );\n  const verbose = state.default.session.getVerbose();\n  fs.readFile(file, 'utf8', async (err, data) => {\n    if (err) throw err;\n    const importData = JSON.parse(data);\n    if (importData && Object.keys(importData.service).length) {\n      const serviceId = Object.keys(importData.service)[0];\n      if (!verbose) showSpinner(`Importing ${serviceId}...`);\n      try {\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        await importService(serviceId, importData, clean);\n        succeedSpinner(`Imported ${serviceId}.`);\n      } catch (importError) {\n        const message = importError.response?.data?.message;\n        const detail = importError.response?.data?.detail;\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        failSpinner(`${detail ? message + ' - ' + detail : message}`);\n      }\n    } else {\n      showSpinner(`Importing service...`);\n      failSpinner(`No service found in ${file}!`);\n    }\n    debugMessage(\n      `cli.ServiceOps.importFirstServiceFromFile: end [file=${file}]`\n    );\n  });\n}\n\n/**\n * Import services from file\n * @param {String} file file name\n * @param {boolean} clean remove existing service\n */\nexport async function importServicesFromFile(file: string, clean: boolean) {\n  debugMessage(`cli.ServiceOps.importServiceFromFile: start [file=${file}]`);\n  fs.readFile(file, 'utf8', async (err, data) => {\n    if (err) throw err;\n    debugMessage(`cli.ServiceOps.importServiceFromFile: importing ${file}`);\n    const importData = JSON.parse(data) as ServiceExportInterface;\n    try {\n      await importServices(importData, clean);\n    } catch (error) {\n      printMessage(`${error.message}`, 'error');\n      printMessage(error.response.status, 'error');\n    }\n    debugMessage(`cli.ServiceOps.importServiceFromFile: end [file=${file}]`);\n  });\n}\n\n/**\n * Import all services from separate files\n * @param {boolean} clean remove existing service\n */\nexport async function importServicesFromFiles(clean: boolean) {\n  debugMessage(`cli.ServiceOps.importServicesFromFiles: start`);\n  const names = fs.readdirSync(getWorkingDirectory());\n  const agentFiles = names.filter((name) =>\n    name.toLowerCase().endsWith('.service.json')\n  );\n  for (const file of agentFiles) {\n    await importServicesFromFile(file, clean);\n  }\n  debugMessage(`cli.ServiceOps.importServicesFromFiles: end`);\n}\n\n/**\n * Delete a service by id/name\n * @param {string} serviceId Reference to the service to delete\n */\nexport async function deleteService(serviceId: string) {\n  try {\n    await deleteFullService(serviceId);\n  } catch (error) {\n    const message = error.response?.data?.message;\n    printMessage(`Delete service '${serviceId}': ${message}`, 'error');\n  }\n}\n\n/**\n * Delete all services\n */\nexport async function deleteServices() {\n  await deleteFullServices();\n}\n"],"mappings":"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"}
+{"version":3,"file":"ServiceOps.js","names":["fs","printMessage","createTable","debugMessage","showSpinner","succeedSpinner","failSpinner","ExportImportUtils","Service","Utils","state","createServiceExportTemplate","deleteFullServices","deleteFullService","getListOfServices","getFullServices","exportServices","exportService","importServices","importService","getTypedFilename","getWorkingDirectory","saveJsonToFile","titleCase","getRealmName","listServices","long","globalConfig","services","sort","a","b","_id","localeCompare","table","service","push","name","toString","error","stack","exportServicesToFile","file","exportData","fileName","default","session","getRealm","exportServiceToFile","serviceId","exportServicesToFiles","_type","importServiceFromFile","clean","verbose","getVerbose","readFile","err","data","importData","JSON","parse","importError","message","response","detail","importFirstServiceFromFile","Object","keys","length","importServicesFromFile","status","importServicesFromFiles","names","readdirSync","agentFiles","filter","toLowerCase","endsWith","deleteService","deleteServices"],"sources":["ops/ServiceOps.ts"],"sourcesContent":["import fs from 'fs';\nimport {\n  printMessage,\n  createTable,\n  debugMessage,\n  showSpinner,\n  succeedSpinner,\n  failSpinner,\n} from '../utils/Console';\nimport {\n  ExportImportUtils,\n  Service,\n  Utils,\n  state,\n} from '@rockcarver/frodo-lib';\nimport { ServiceExportInterface } from '@rockcarver/frodo-lib/types/ops/OpsTypes';\n\nconst {\n  createServiceExportTemplate,\n  deleteFullServices,\n  deleteFullService,\n  getListOfServices,\n  getFullServices,\n  exportServices,\n  exportService,\n  importServices,\n  importService,\n} = Service;\nconst { getTypedFilename, getWorkingDirectory, saveJsonToFile, titleCase } =\n  ExportImportUtils;\nconst { getRealmName } = Utils;\n\n/**\n * List services\n */\nexport async function listServices(long = false, globalConfig = false) {\n  try {\n    const services = await getListOfServices(globalConfig);\n    services.sort((a, b) => a._id.localeCompare(b._id));\n    if (long) {\n      const table = createTable(['Service Id', 'Service Name']);\n      for (const service of services) {\n        table.push([service._id, service.name]);\n      }\n      printMessage(table.toString(), 'data');\n    } else {\n      for (const service of services) {\n        printMessage(`${service._id}`, 'data');\n      }\n    }\n  } catch (error) {\n    printMessage(`Error listing agents - ${error}`, 'error');\n    printMessage(error.stack, 'error');\n  }\n}\n\n/**\n * Export all services to file\n * @param {string} file file name\n */\nexport async function exportServicesToFile(file, globalConfig = false) {\n  const exportData = await exportServices(globalConfig);\n  let fileName = getTypedFilename(\n    `all${titleCase(getRealmName(state.default.session.getRealm()))}Services`,\n    `service`\n  );\n  if (file) {\n    fileName = file;\n  }\n  saveJsonToFile(exportData, fileName);\n}\n\n/**\n * Export service to file\n * @param {string} serviceId service id\n * @param {string} file file name\n */\nexport async function exportServiceToFile(\n  serviceId: string,\n  file: string,\n  globalConfig = false\n) {\n  const exportData = await exportService(serviceId, globalConfig);\n  let fileName = getTypedFilename(serviceId, `service`);\n  if (file) {\n    fileName = file;\n  }\n  saveJsonToFile(exportData, fileName);\n}\n\n/**\n * Export all services to separate files\n */\nexport async function exportServicesToFiles(globalConfig = false) {\n  debugMessage(`cli.ServiceOps.exportServicesToFiles: start`);\n  const services = await getFullServices(globalConfig);\n  for (const service of services) {\n    const fileName = getTypedFilename(service._type._id, `service`);\n    const exportData = createServiceExportTemplate();\n    exportData.service[service._type._id] = service;\n    debugMessage(\n      `cli.ServiceOps.exportServicesToFiles: exporting ${service._type._id} to ${fileName}`\n    );\n    saveJsonToFile(exportData, fileName);\n  }\n  debugMessage(`cli.ServiceOps.exportServicesToFiles: end.`);\n}\n\n/**\n * Import a service from file\n * @param {string} serviceId service id/name\n * @param {string} file import file name\n * @param {boolean} clean remove existing service\n */\nexport async function importServiceFromFile(\n  serviceId: string,\n  file: string,\n  clean: boolean,\n  globalConfig = false\n) {\n  debugMessage(\n    `cli.ServiceOps.importServiceFromFile: start [serviceId=${serviceId}, file=${file}]`\n  );\n  const verbose = state.default.session.getVerbose();\n  fs.readFile(file, 'utf8', async (err, data) => {\n    if (err) throw err;\n    const importData = JSON.parse(data);\n    if (importData && importData.service[serviceId]) {\n      if (!verbose) showSpinner(`Importing ${serviceId}...`);\n      try {\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        await importService(serviceId, importData, clean, globalConfig);\n        succeedSpinner(`Imported ${serviceId}.`);\n      } catch (importError) {\n        const message = importError.response?.data?.message;\n        const detail = importError.response?.data?.detail;\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        failSpinner(`${detail ? message + ' - ' + detail : message}`);\n      }\n    } else {\n      showSpinner(`Importing ${serviceId}...`);\n      failSpinner(`${serviceId} not found!`);\n    }\n  });\n  debugMessage(\n    `cli.ServiceOps.importServiceFromFile: end [serviceId=${serviceId}, file=${file}]`\n  );\n}\n\n/**\n * Import first service from file\n * @param {string} file import file name\n * @param {boolean} clean remove existing service\n */\nexport async function importFirstServiceFromFile(\n  file: string,\n  clean: boolean,\n  globalConfig = false\n) {\n  debugMessage(\n    `cli.ServiceOps.importFirstServiceFromFile: start [file=${file}]`\n  );\n  const verbose = state.default.session.getVerbose();\n  fs.readFile(file, 'utf8', async (err, data) => {\n    if (err) throw err;\n    const importData = JSON.parse(data);\n    if (importData && Object.keys(importData.service).length) {\n      const serviceId = Object.keys(importData.service)[0];\n      if (!verbose) showSpinner(`Importing ${serviceId}...`);\n      try {\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        await importService(serviceId, importData, clean, globalConfig);\n        succeedSpinner(`Imported ${serviceId}.`);\n      } catch (importError) {\n        const message = importError.response?.data?.message;\n        const detail = importError.response?.data?.detail;\n        if (verbose) showSpinner(`Importing ${serviceId}...`);\n        failSpinner(`${detail ? message + ' - ' + detail : message}`);\n      }\n    } else {\n      showSpinner(`Importing service...`);\n      failSpinner(`No service found in ${file}!`);\n    }\n    debugMessage(\n      `cli.ServiceOps.importFirstServiceFromFile: end [file=${file}]`\n    );\n  });\n}\n\n/**\n * Import services from file\n * @param {String} file file name\n * @param {boolean} clean remove existing service\n */\nexport async function importServicesFromFile(\n  file: string,\n  clean: boolean,\n  globalConfig = false\n) {\n  debugMessage(`cli.ServiceOps.importServiceFromFile: start [file=${file}]`);\n  fs.readFile(file, 'utf8', async (err, data) => {\n    if (err) throw err;\n    debugMessage(`cli.ServiceOps.importServiceFromFile: importing ${file}`);\n    const importData = JSON.parse(data) as ServiceExportInterface;\n    try {\n      await importServices(importData, clean, globalConfig);\n    } catch (error) {\n      printMessage(`${error.message}`, 'error');\n      printMessage(error.response.status, 'error');\n    }\n    debugMessage(`cli.ServiceOps.importServiceFromFile: end [file=${file}]`);\n  });\n}\n\n/**\n * Import all services from separate files\n * @param {boolean} clean remove existing service\n */\nexport async function importServicesFromFiles(\n  clean: boolean,\n  globalConfig = false\n) {\n  debugMessage(`cli.ServiceOps.importServicesFromFiles: start`);\n  const names = fs.readdirSync(getWorkingDirectory());\n  const agentFiles = names.filter((name) =>\n    name.toLowerCase().endsWith('.service.json')\n  );\n  for (const file of agentFiles) {\n    await importServicesFromFile(file, clean, globalConfig);\n  }\n  debugMessage(`cli.ServiceOps.importServicesFromFiles: end`);\n}\n\n/**\n * Delete a service by id/name\n * @param {string} serviceId Reference to the service to delete\n */\nexport async function deleteService(serviceId: string, globalConfig = false) {\n  try {\n    await deleteFullService(serviceId, globalConfig);\n  } catch (error) {\n    const message = error.response?.data?.message;\n    printMessage(`Delete service '${serviceId}': ${message}`, 'error');\n  }\n}\n\n/**\n * Delete all services\n */\nexport async function deleteServices(globalConfig = false) {\n  await deleteFullServices(globalConfig);\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rockcarver/frodo-cli",
-  "version": "0.18.2-13",
+  "version": "0.18.2-14",
   "type": "module",
   "description": "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   "keywords": [
@@ -88,7 +88,7 @@
     ]
   },
   "dependencies": {
-    "@rockcarver/frodo-lib": "0.16.2-14",
+    "@rockcarver/frodo-lib": "0.16.2-15",
     "cli-progress": "^3.11.2",
     "cli-table3": "^0.6.3",
     "colors": "^1.4.0",

package/esm/cli/conn/conn-add.js

@@ -1,40 +0,0 @@
-import { Command, Option } from 'commander';
-import { Authenticate, ConnectionProfile, state } from '@rockcarver/frodo-lib';
-import * as common from '../cmd_common.js';
-const {
-  getTokens
-} = Authenticate;
-const {
-  saveConnectionProfile
-} = ConnectionProfile;
-const program = new Command('frodo conn add');
-program.description('Add a new connection profiles. You have to specify a URL, username and password at a minimum.\nOptionally, for Identity Cloud, you can also add a log API key and secret.').helpOption('-h, --help', 'Help').showHelpAfterError().addArgument(common.hostArgumentM).addArgument(common.userArgument).addArgument(common.passwordArgument).addArgument(common.apiKeyArgument).addArgument(common.apiSecretArgument).addOption(common.deploymentOption).addOption(common.insecureOption).addOption(common.verboseOption).addOption(common.debugOption).addOption(common.curlirizeOption).addOption(new Option('--no-validate', 'Do not validate connection.')).addOption(new Option('--authentication-service [service]', 'Name of the authentication service/tree to use.')).addOption(new Option('--authentication-header-overrides [headers]', 'Map of headers: {"host":"am.example.com:8081"}.')).action(
-// implement command logic inside action handler
-async (host, user, password, key, secret, options) => {
-  state.default.session.setTenant(host);
-  state.default.session.setUsername(user);
-  state.default.session.setPassword(password);
-  state.default.session.setLogApiKey(key);
-  state.default.session.setLogApiSecret(secret);
-  state.default.session.setDeploymentType(options.type);
-  state.default.session.setAllowInsecureConnection(options.insecure);
-  state.default.session.setVerbose(options.verbose);
-  state.default.session.setDebug(options.debug);
-  state.default.session.setCurlirize(options.curlirize);
-  if (options.authenticationService) {
-    state.default.session.setAuthenticationService(options.authenticationService);
-  }
-  if (options.authenticationHeaderOverrides) {
-    state.default.session.setAuthenticationHeaderOverrides(JSON.parse(options.authenticationHeaderOverrides));
-  }
-  if (options.validate && (await getTokens()) || !options.validate) {
-    saveConnectionProfile();
-  } else {
-    process.exitCode = 1;
-  }
-}
-// end command logic inside action handler
-);
-
-program.parse();
-//# sourceMappingURL=conn-add.js.map

package/esm/cli/conn/conn-add.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"conn-add.js","names":["Command","Option","Authenticate","ConnectionProfile","state","common","getTokens","saveConnectionProfile","program","description","helpOption","showHelpAfterError","addArgument","hostArgumentM","userArgument","passwordArgument","apiKeyArgument","apiSecretArgument","addOption","deploymentOption","insecureOption","verboseOption","debugOption","curlirizeOption","action","host","user","password","key","secret","options","default","session","setTenant","setUsername","setPassword","setLogApiKey","setLogApiSecret","setDeploymentType","type","setAllowInsecureConnection","insecure","setVerbose","verbose","setDebug","debug","setCurlirize","curlirize","authenticationService","setAuthenticationService","authenticationHeaderOverrides","setAuthenticationHeaderOverrides","JSON","parse","validate","process","exitCode"],"sources":["cli/conn/conn-add.ts"],"sourcesContent":["import { Command, Option } from 'commander';\nimport { Authenticate, ConnectionProfile, state } from '@rockcarver/frodo-lib';\nimport * as common from '../cmd_common.js';\n\nconst { getTokens } = Authenticate;\nconst { saveConnectionProfile } = ConnectionProfile;\n\nconst program = new Command('frodo conn add');\n\nprogram\n  .description(\n    'Add a new connection profiles. You have to specify a URL, username and password at a minimum.\\nOptionally, for Identity Cloud, you can also add a log API key and secret.'\n  )\n  .helpOption('-h, --help', 'Help')\n  .showHelpAfterError()\n  .addArgument(common.hostArgumentM)\n  .addArgument(common.userArgument)\n  .addArgument(common.passwordArgument)\n  .addArgument(common.apiKeyArgument)\n  .addArgument(common.apiSecretArgument)\n  .addOption(common.deploymentOption)\n  .addOption(common.insecureOption)\n  .addOption(common.verboseOption)\n  .addOption(common.debugOption)\n  .addOption(common.curlirizeOption)\n  .addOption(new Option('--no-validate', 'Do not validate connection.'))\n  .addOption(\n    new Option(\n      '--authentication-service [service]',\n      'Name of the authentication service/tree to use.'\n    )\n  )\n  .addOption(\n    new Option(\n      '--authentication-header-overrides [headers]',\n      'Map of headers: {\"host\":\"am.example.com:8081\"}.'\n    )\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, user, password, key, secret, options) => {\n      state.default.session.setTenant(host);\n      state.default.session.setUsername(user);\n      state.default.session.setPassword(password);\n      state.default.session.setLogApiKey(key);\n      state.default.session.setLogApiSecret(secret);\n      state.default.session.setDeploymentType(options.type);\n      state.default.session.setAllowInsecureConnection(options.insecure);\n      state.default.session.setVerbose(options.verbose);\n      state.default.session.setDebug(options.debug);\n      state.default.session.setCurlirize(options.curlirize);\n      if (options.authenticationService) {\n        state.default.session.setAuthenticationService(\n          options.authenticationService\n        );\n      }\n      if (options.authenticationHeaderOverrides) {\n        state.default.session.setAuthenticationHeaderOverrides(\n          JSON.parse(options.authenticationHeaderOverrides)\n        );\n      }\n      if ((options.validate && (await getTokens())) || !options.validate) {\n        saveConnectionProfile();\n      } else {\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}