@rockcarver/frodo-cli 0.20.1-1 → 0.20.1

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.20.1] - 2023-01-20
+
+### Changed
+
+-   Updated to frodo-lib 0.18.1
+-   Include service account name in `frodo conn list -l` and `frodo conn describe <host>` output.
+-   Add missing service account name when running `frodo conn save <host>`.
+-   Add tenant name to beginning of output of all `frodo logs` sub-commands: `fetch`, `list`, `tail`.
+
+### Fixed
+
+-   \#176: frodo logs fetch end timestamp ignored
+
 ## [0.20.1-1] - 2023-01-16
 
 ## [0.20.1-0] - 2023-01-15
@@ -109,7 +122,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   Updated list of contributors in package.json
 
--   Add linux arm64 binary builds
+-   \#166: Add linux arm64 binary builds
 
 ### Changed
 
@@ -118,6 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+-   \#164: Frodo now properly exports scripts with special chars in name
 -   \#161: Frodo now properly adds connection profiles with log credentials
 
 ## [0.19.5-2] - 2023-01-13
@@ -962,7 +976,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.20.1-1...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v0.20.1...HEAD
+
+[0.20.1]: https://github.com/rockcarver/frodo-cli/compare/v0.20.1-1...v0.20.1
 
 [0.20.1-1]: https://github.com/rockcarver/frodo-cli/compare/v0.20.1-0...v0.20.1-1
 

package/esm/cli/FrodoCommand.js

@@ -10,7 +10,7 @@ process.env.FRODO_REALM || globalConfig.DEFAULT_REALM_KEY, '"alpha" for Identity
 const usernameArgument = new Argument('[username]', 'Username to login with. Must be an admin user with appropriate rights to manage authentication journeys/trees.');
 const passwordArgument = new Argument('[password]', 'Password.');
 const serviceAccountIdOption = new Option('--sa-id <sa-id>', 'Service account id.');
-const serviceAccountJwkFileOption = new Option('--sa-jwk-file <file>', 'File containing the java web key (jwk) associated with the the service account.');
+const serviceAccountJwkFileOption = new Option('--sa-jwk-file <file>', 'File containing the JSON Web Key (JWK) associated with the the service account.');
 const deploymentOption = new Option('-m, --type <type>', 'Override auto-detected deployment type. Valid values for type: \n\
 classic:  A classic Access Management-only deployment with custom layout and configuration. \n\
 cloud:    A ForgeRock Identity Cloud environment. \n\
@@ -111,6 +111,10 @@ export class FrodoCommand extends FrodoStubCommand {
 
     // handle arguments first
     for (const [i, v] of command.args.entries()) {
+      if (!command._args[i]) {
+        printMessage(`${command.args.length} arguments supplied but command only supports ${command._args.length}.`, 'warn');
+        break;
+      }
       const arg = command._args[i].name();
       // handle only default arguments
       if (Object.keys(stateMap).includes(arg)) {

package/esm/cli/FrodoCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"FrodoCommand.js","names":["Argument","Command","Option","globalConfig","state","fs","printMessage","createProgressIndicator","updateProgressIndicator","stopProgressIndicator","verboseMessage","debugMessage","curlirizeMessage","hostArgument","realmArgument","default","process","env","FRODO_REALM","DEFAULT_REALM_KEY","usernameArgument","passwordArgument","serviceAccountIdOption","serviceAccountJwkFileOption","deploymentOption","choices","DEPLOYMENT_TYPES","insecureOption","verboseOption","debugOption","curlirizeOption","defaultArgs","defaultOpts","stateMap","name","setHost","setRealm","setUsername","setPassword","attributeName","setServiceAccountId","file","data","readFileSync","jwk","JSON","parse","toString","setServiceAccountJwk","error","message","setDeploymentType","setAllowInsecureConnection","setVerbose","setDebug","setCurlirize","FrodoStubCommand","constructor","helpOption","showHelpAfterError","configureHelp","sortSubcommands","sortOptions","setPrintHandler","setVerboseHandler","setDebugHandler","setCurlirizeHandler","setCreateProgressHandler","setUpdateProgressHandler","setStopProgressHandler","FrodoCommand","omits","arg","includes","addArgument","opt","addOption","handleDefaultArgsAndOpts","args","command","pop","options","i","v","entries","_args","Object","keys","handler","k"],"sources":["cli/FrodoCommand.ts"],"sourcesContent":["import { Argument, Command, Option } from 'commander';\nimport * as globalConfig from '../storage/StaticStorage';\nimport { state } from '@rockcarver/frodo-lib';\nimport fs from 'fs';\nimport {\n  printMessage,\n  createProgressIndicator,\n  updateProgressIndicator,\n  stopProgressIndicator,\n  verboseMessage,\n  debugMessage,\n  curlirizeMessage,\n} from '../utils/Console.js';\n\nconst hostArgument = new Argument(\n  '[host]',\n  'Access Management base URL, e.g.: https://cdk.iam.example.com/am. To use a connection profile, just specify a unique substring.'\n);\n\nconst realmArgument = new Argument(\n  '[realm]',\n  \"Realm. Specify realm as '/' for the root realm or 'realm' or '/parent/child' otherwise.\"\n).default(\n  // must check for FRODO_REALM env variable here because otherwise cli will overwrite realm with default value\n  process.env.FRODO_REALM || globalConfig.DEFAULT_REALM_KEY,\n  '\"alpha\" for Identity Cloud tenants, \"/\" otherwise.'\n);\n\nconst usernameArgument = new Argument(\n  '[username]',\n  'Username to login with. Must be an admin user with appropriate rights to manage authentication journeys/trees.'\n);\n\nconst passwordArgument = new Argument('[password]', 'Password.');\n\nconst serviceAccountIdOption = new Option(\n  '--sa-id <sa-id>',\n  'Service account id.'\n);\n\nconst serviceAccountJwkFileOption = new Option(\n  '--sa-jwk-file <file>',\n  'File containing the java web key (jwk) associated with the the service account.'\n);\n\nconst deploymentOption = new Option(\n  '-m, --type <type>',\n  'Override auto-detected deployment type. Valid values for type: \\n\\\nclassic:  A classic Access Management-only deployment with custom layout and configuration. \\n\\\ncloud:    A ForgeRock Identity Cloud environment. \\n\\\nforgeops: A ForgeOps CDK or CDM deployment. \\n\\\nThe detected or provided deployment type controls certain behavior like obtaining an Identity \\\nManagement admin token or not and whether to export/import referenced email templates or how \\\nto walk through the tenant admin login flow of Identity Cloud and handle MFA'\n).choices(globalConfig.DEPLOYMENT_TYPES);\n\nconst insecureOption = new Option(\n  '-k, --insecure',\n  'Allow insecure connections when using SSL/TLS. Has no effect when using a network proxy for https (HTTPS_PROXY=http://<host>:<port>), in that case the proxy must provide this capability.'\n).default(false, \"Don't allow insecure connections\");\n\nconst verboseOption = new Option(\n  '--verbose',\n  'Verbose output during command execution. If specified, may or may not produce additional output.'\n);\n\nconst debugOption = new Option(\n  '--debug',\n  'Debug output during command execution. If specified, may or may not produce additional output helpful for troubleshooting.'\n);\n\nconst curlirizeOption = new Option(\n  '--curlirize',\n  'Output all network calls in curl format.'\n);\n\nconst defaultArgs = [\n  hostArgument,\n  realmArgument,\n  usernameArgument,\n  passwordArgument,\n];\n\nconst defaultOpts = [\n  serviceAccountIdOption,\n  serviceAccountJwkFileOption,\n  deploymentOption,\n  insecureOption,\n  verboseOption,\n  debugOption,\n  curlirizeOption,\n];\n\nconst stateMap = {\n  [hostArgument.name()]: state.setHost,\n  [realmArgument.name()]: state.setRealm,\n  [usernameArgument.name()]: state.setUsername,\n  [passwordArgument.name()]: state.setPassword,\n  [serviceAccountIdOption.attributeName()]: state.setServiceAccountId,\n  [serviceAccountJwkFileOption.attributeName()]: (file) => {\n    try {\n      const data = fs.readFileSync(file);\n      const jwk = JSON.parse(data.toString());\n      state.setServiceAccountJwk(jwk);\n    } catch (error) {\n      printMessage(\n        `Error parsing JWK from file ${file}: ${error.message}`,\n        'error'\n      );\n    }\n  },\n  [deploymentOption.attributeName()]: state.setDeploymentType,\n  [insecureOption.attributeName()]: state.setAllowInsecureConnection,\n  [verboseOption.attributeName()]: state.setVerbose,\n  [debugOption.attributeName()]: state.setDebug,\n  [curlirizeOption.attributeName()]: state.setCurlirize,\n};\n\n/**\n * Command with default options\n */\nexport class FrodoStubCommand extends Command {\n  /**\n   * Creates a new FrodoCommand instance\n   * @param name Name of the command\n   * @param omits Array of default argument names and default option names that should not be added to this command\n   */\n  constructor(name: string) {\n    super(name);\n\n    // other default settings\n    this.helpOption('-h, --help', 'Help');\n    this.showHelpAfterError();\n    this.configureHelp({\n      sortSubcommands: true,\n      sortOptions: true,\n    });\n\n    // register default handlers\n    state.setPrintHandler(printMessage);\n    state.setVerboseHandler(verboseMessage);\n    state.setDebugHandler(debugMessage);\n    state.setCurlirizeHandler(curlirizeMessage);\n    state.setCreateProgressHandler(createProgressIndicator);\n    state.setUpdateProgressHandler(updateProgressIndicator);\n    state.setStopProgressHandler(stopProgressIndicator);\n  }\n}\n\n/**\n * Command with default options\n */\nexport class FrodoCommand extends FrodoStubCommand {\n  /**\n   * Creates a new FrodoCommand instance\n   * @param name Name of the command\n   * @param omits Array of default argument names and default option names that should not be added to this command\n   */\n  constructor(name: string, omits: string[] = []) {\n    super(name);\n\n    // register default arguments\n    for (const arg of defaultArgs) {\n      if (!omits.includes(arg.name())) this.addArgument(arg);\n    }\n\n    // register default options\n    for (const opt of defaultOpts) {\n      if (!omits.includes(opt.name())) this.addOption(opt);\n    }\n  }\n\n  /**\n   *\n   * @param args\n   */\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  handleDefaultArgsAndOpts(...args: any) {\n    const command = args.pop();\n    const options = args.pop();\n\n    // handle arguments first\n    for (const [i, v] of command.args.entries()) {\n      const arg = command._args[i].name();\n      // handle only default arguments\n      if (Object.keys(stateMap).includes(arg)) {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Handling default argument '${arg}'.`\n        );\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const handler: any = stateMap[arg];\n        handler(v);\n      } else {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Ignoring non-default argument '${arg}'.`\n        );\n      }\n    }\n\n    // handle options\n    for (const [k, v] of Object.entries(options)) {\n      // handle only default options\n      if (Object.keys(stateMap).includes(k)) {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Handling default option '${k}'.`\n        );\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const handler: any = stateMap[k];\n        handler(v);\n      } else {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Ignoring non-default option '${k}'.`\n        );\n      }\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"FrodoCommand.js","names":["Argument","Command","Option","globalConfig","state","fs","printMessage","createProgressIndicator","updateProgressIndicator","stopProgressIndicator","verboseMessage","debugMessage","curlirizeMessage","hostArgument","realmArgument","default","process","env","FRODO_REALM","DEFAULT_REALM_KEY","usernameArgument","passwordArgument","serviceAccountIdOption","serviceAccountJwkFileOption","deploymentOption","choices","DEPLOYMENT_TYPES","insecureOption","verboseOption","debugOption","curlirizeOption","defaultArgs","defaultOpts","stateMap","name","setHost","setRealm","setUsername","setPassword","attributeName","setServiceAccountId","file","data","readFileSync","jwk","JSON","parse","toString","setServiceAccountJwk","error","message","setDeploymentType","setAllowInsecureConnection","setVerbose","setDebug","setCurlirize","FrodoStubCommand","constructor","helpOption","showHelpAfterError","configureHelp","sortSubcommands","sortOptions","setPrintHandler","setVerboseHandler","setDebugHandler","setCurlirizeHandler","setCreateProgressHandler","setUpdateProgressHandler","setStopProgressHandler","FrodoCommand","omits","arg","includes","addArgument","opt","addOption","handleDefaultArgsAndOpts","args","command","pop","options","i","v","entries","_args","length","Object","keys","handler","k"],"sources":["cli/FrodoCommand.ts"],"sourcesContent":["import { Argument, Command, Option } from 'commander';\nimport * as globalConfig from '../storage/StaticStorage';\nimport { state } from '@rockcarver/frodo-lib';\nimport fs from 'fs';\nimport {\n  printMessage,\n  createProgressIndicator,\n  updateProgressIndicator,\n  stopProgressIndicator,\n  verboseMessage,\n  debugMessage,\n  curlirizeMessage,\n} from '../utils/Console.js';\n\nconst hostArgument = new Argument(\n  '[host]',\n  'Access Management base URL, e.g.: https://cdk.iam.example.com/am. To use a connection profile, just specify a unique substring.'\n);\n\nconst realmArgument = new Argument(\n  '[realm]',\n  \"Realm. Specify realm as '/' for the root realm or 'realm' or '/parent/child' otherwise.\"\n).default(\n  // must check for FRODO_REALM env variable here because otherwise cli will overwrite realm with default value\n  process.env.FRODO_REALM || globalConfig.DEFAULT_REALM_KEY,\n  '\"alpha\" for Identity Cloud tenants, \"/\" otherwise.'\n);\n\nconst usernameArgument = new Argument(\n  '[username]',\n  'Username to login with. Must be an admin user with appropriate rights to manage authentication journeys/trees.'\n);\n\nconst passwordArgument = new Argument('[password]', 'Password.');\n\nconst serviceAccountIdOption = new Option(\n  '--sa-id <sa-id>',\n  'Service account id.'\n);\n\nconst serviceAccountJwkFileOption = new Option(\n  '--sa-jwk-file <file>',\n  'File containing the JSON Web Key (JWK) associated with the the service account.'\n);\n\nconst deploymentOption = new Option(\n  '-m, --type <type>',\n  'Override auto-detected deployment type. Valid values for type: \\n\\\nclassic:  A classic Access Management-only deployment with custom layout and configuration. \\n\\\ncloud:    A ForgeRock Identity Cloud environment. \\n\\\nforgeops: A ForgeOps CDK or CDM deployment. \\n\\\nThe detected or provided deployment type controls certain behavior like obtaining an Identity \\\nManagement admin token or not and whether to export/import referenced email templates or how \\\nto walk through the tenant admin login flow of Identity Cloud and handle MFA'\n).choices(globalConfig.DEPLOYMENT_TYPES);\n\nconst insecureOption = new Option(\n  '-k, --insecure',\n  'Allow insecure connections when using SSL/TLS. Has no effect when using a network proxy for https (HTTPS_PROXY=http://<host>:<port>), in that case the proxy must provide this capability.'\n).default(false, \"Don't allow insecure connections\");\n\nconst verboseOption = new Option(\n  '--verbose',\n  'Verbose output during command execution. If specified, may or may not produce additional output.'\n);\n\nconst debugOption = new Option(\n  '--debug',\n  'Debug output during command execution. If specified, may or may not produce additional output helpful for troubleshooting.'\n);\n\nconst curlirizeOption = new Option(\n  '--curlirize',\n  'Output all network calls in curl format.'\n);\n\nconst defaultArgs = [\n  hostArgument,\n  realmArgument,\n  usernameArgument,\n  passwordArgument,\n];\n\nconst defaultOpts = [\n  serviceAccountIdOption,\n  serviceAccountJwkFileOption,\n  deploymentOption,\n  insecureOption,\n  verboseOption,\n  debugOption,\n  curlirizeOption,\n];\n\nconst stateMap = {\n  [hostArgument.name()]: state.setHost,\n  [realmArgument.name()]: state.setRealm,\n  [usernameArgument.name()]: state.setUsername,\n  [passwordArgument.name()]: state.setPassword,\n  [serviceAccountIdOption.attributeName()]: state.setServiceAccountId,\n  [serviceAccountJwkFileOption.attributeName()]: (file) => {\n    try {\n      const data = fs.readFileSync(file);\n      const jwk = JSON.parse(data.toString());\n      state.setServiceAccountJwk(jwk);\n    } catch (error) {\n      printMessage(\n        `Error parsing JWK from file ${file}: ${error.message}`,\n        'error'\n      );\n    }\n  },\n  [deploymentOption.attributeName()]: state.setDeploymentType,\n  [insecureOption.attributeName()]: state.setAllowInsecureConnection,\n  [verboseOption.attributeName()]: state.setVerbose,\n  [debugOption.attributeName()]: state.setDebug,\n  [curlirizeOption.attributeName()]: state.setCurlirize,\n};\n\n/**\n * Command with default options\n */\nexport class FrodoStubCommand extends Command {\n  /**\n   * Creates a new FrodoCommand instance\n   * @param name Name of the command\n   * @param omits Array of default argument names and default option names that should not be added to this command\n   */\n  constructor(name: string) {\n    super(name);\n\n    // other default settings\n    this.helpOption('-h, --help', 'Help');\n    this.showHelpAfterError();\n    this.configureHelp({\n      sortSubcommands: true,\n      sortOptions: true,\n    });\n\n    // register default handlers\n    state.setPrintHandler(printMessage);\n    state.setVerboseHandler(verboseMessage);\n    state.setDebugHandler(debugMessage);\n    state.setCurlirizeHandler(curlirizeMessage);\n    state.setCreateProgressHandler(createProgressIndicator);\n    state.setUpdateProgressHandler(updateProgressIndicator);\n    state.setStopProgressHandler(stopProgressIndicator);\n  }\n}\n\n/**\n * Command with default options\n */\nexport class FrodoCommand extends FrodoStubCommand {\n  /**\n   * Creates a new FrodoCommand instance\n   * @param name Name of the command\n   * @param omits Array of default argument names and default option names that should not be added to this command\n   */\n  constructor(name: string, omits: string[] = []) {\n    super(name);\n\n    // register default arguments\n    for (const arg of defaultArgs) {\n      if (!omits.includes(arg.name())) this.addArgument(arg);\n    }\n\n    // register default options\n    for (const opt of defaultOpts) {\n      if (!omits.includes(opt.name())) this.addOption(opt);\n    }\n  }\n\n  /**\n   *\n   * @param args\n   */\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  handleDefaultArgsAndOpts(...args: any) {\n    const command = args.pop();\n    const options = args.pop();\n\n    // handle arguments first\n    for (const [i, v] of command.args.entries()) {\n      if (!command._args[i]) {\n        printMessage(\n          `${command.args.length} arguments supplied but command only supports ${command._args.length}.`,\n          'warn'\n        );\n        break;\n      }\n      const arg = command._args[i].name();\n      // handle only default arguments\n      if (Object.keys(stateMap).includes(arg)) {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Handling default argument '${arg}'.`\n        );\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const handler: any = stateMap[arg];\n        handler(v);\n      } else {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Ignoring non-default argument '${arg}'.`\n        );\n      }\n    }\n\n    // handle options\n    for (const [k, v] of Object.entries(options)) {\n      // handle only default options\n      if (Object.keys(stateMap).includes(k)) {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Handling default option '${k}'.`\n        );\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const handler: any = stateMap[k];\n        handler(v);\n      } else {\n        debugMessage(\n          `FrodoCommand.handleDefaultArgsAndOpts: Ignoring non-default option '${k}'.`\n        );\n      }\n    }\n  }\n}\n"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,OAAO,EAAEC,MAAM,QAAQ,WAAW;AACrD,OAAO,KAAKC,YAAY,MAAM,0BAA0B;AACxD,SAASC,KAAK,QAAQ,uBAAuB;AAC7C,OAAOC,EAAE,MAAM,IAAI;AACnB,SACEC,YAAY,EACZC,uBAAuB,EACvBC,uBAAuB,EACvBC,qBAAqB,EACrBC,cAAc,EACdC,YAAY,EACZC,gBAAgB,QACX,qBAAqB;AAE5B,MAAMC,YAAY,GAAG,IAAIb,QAAQ,CAC/B,QAAQ,EACR,iIAAiI,CAClI;AAED,MAAMc,aAAa,GAAG,IAAId,QAAQ,CAChC,SAAS,EACT,yFAAyF,CAC1F,CAACe,OAAO;AACP;AACAC,OAAO,CAACC,GAAG,CAACC,WAAW,IAAIf,YAAY,CAACgB,iBAAiB,EACzD,oDAAoD,CACrD;AAED,MAAMC,gBAAgB,GAAG,IAAIpB,QAAQ,CACnC,YAAY,EACZ,gHAAgH,CACjH;AAED,MAAMqB,gBAAgB,GAAG,IAAIrB,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC;AAEhE,MAAMsB,sBAAsB,GAAG,IAAIpB,MAAM,CACvC,iBAAiB,EACjB,qBAAqB,CACtB;AAED,MAAMqB,2BAA2B,GAAG,IAAIrB,MAAM,CAC5C,sBAAsB,EACtB,iFAAiF,CAClF;AAED,MAAMsB,gBAAgB,GAAG,IAAItB,MAAM,CACjC,mBAAmB,EACnB;AACF;AACA;AACA;AACA;AACA;AACA,6EAA6E,CAC5E,CAACuB,OAAO,CAACtB,YAAY,CAACuB,gBAAgB,CAAC;AAExC,MAAMC,cAAc,GAAG,IAAIzB,MAAM,CAC/B,gBAAgB,EAChB,4LAA4L,CAC7L,CAACa,OAAO,CAAC,KAAK,EAAE,kCAAkC,CAAC;AAEpD,MAAMa,aAAa,GAAG,IAAI1B,MAAM,CAC9B,WAAW,EACX,kGAAkG,CACnG;AAED,MAAM2B,WAAW,GAAG,IAAI3B,MAAM,CAC5B,SAAS,EACT,4HAA4H,CAC7H;AAED,MAAM4B,eAAe,GAAG,IAAI5B,MAAM,CAChC,aAAa,EACb,0CAA0C,CAC3C;AAED,MAAM6B,WAAW,GAAG,CAClBlB,YAAY,EACZC,aAAa,EACbM,gBAAgB,EAChBC,gBAAgB,CACjB;AAED,MAAMW,WAAW,GAAG,CAClBV,sBAAsB,EACtBC,2BAA2B,EAC3BC,gBAAgB,EAChBG,cAAc,EACdC,aAAa,EACbC,WAAW,EACXC,eAAe,CAChB;AAED,MAAMG,QAAQ,GAAG;EACf,CAACpB,YAAY,CAACqB,IAAI,EAAE,GAAG9B,KAAK,CAAC+B,OAAO;EACpC,CAACrB,aAAa,CAACoB,IAAI,EAAE,GAAG9B,KAAK,CAACgC,QAAQ;EACtC,CAAChB,gBAAgB,CAACc,IAAI,EAAE,GAAG9B,KAAK,CAACiC,WAAW;EAC5C,CAAChB,gBAAgB,CAACa,IAAI,EAAE,GAAG9B,KAAK,CAACkC,WAAW;EAC5C,CAAChB,sBAAsB,CAACiB,aAAa,EAAE,GAAGnC,KAAK,CAACoC,mBAAmB;EACnE,CAACjB,2BAA2B,CAACgB,aAAa,EAAE,GAAIE,IAAI,IAAK;IACvD,IAAI;MACF,MAAMC,IAAI,GAAGrC,EAAE,CAACsC,YAAY,CAACF,IAAI,CAAC;MAClC,MAAMG,GAAG,GAAGC,IAAI,CAACC,KAAK,CAACJ,IAAI,CAACK,QAAQ,EAAE,CAAC;MACvC3C,KAAK,CAAC4C,oBAAoB,CAACJ,GAAG,CAAC;IACjC,CAAC,CAAC,OAAOK,KAAK,EAAE;MACd3C,YAAY,CACT,+BAA8BmC,IAAK,KAAIQ,KAAK,CAACC,OAAQ,EAAC,EACvD,OAAO,CACR;IACH;EACF,CAAC;EACD,CAAC1B,gBAAgB,CAACe,aAAa,EAAE,GAAGnC,KAAK,CAAC+C,iBAAiB;EAC3D,CAACxB,cAAc,CAACY,aAAa,EAAE,GAAGnC,KAAK,CAACgD,0BAA0B;EAClE,CAACxB,aAAa,CAACW,aAAa,EAAE,GAAGnC,KAAK,CAACiD,UAAU;EACjD,CAACxB,WAAW,CAACU,aAAa,EAAE,GAAGnC,KAAK,CAACkD,QAAQ;EAC7C,CAACxB,eAAe,CAACS,aAAa,EAAE,GAAGnC,KAAK,CAACmD;AAC3C,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,SAASvD,OAAO,CAAC;EAC5C;AACF;AACA;AACA;AACA;EACEwD,WAAW,CAACvB,IAAY,EAAE;IACxB,KAAK,CAACA,IAAI,CAAC;;IAEX;IACA,IAAI,CAACwB,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC;IACrC,IAAI,CAACC,kBAAkB,EAAE;IACzB,IAAI,CAACC,aAAa,CAAC;MACjBC,eAAe,EAAE,IAAI;MACrBC,WAAW,EAAE;IACf,CAAC,CAAC;;IAEF;IACA1D,KAAK,CAAC2D,eAAe,CAACzD,YAAY,CAAC;IACnCF,KAAK,CAAC4D,iBAAiB,CAACtD,cAAc,CAAC;IACvCN,KAAK,CAAC6D,eAAe,CAACtD,YAAY,CAAC;IACnCP,KAAK,CAAC8D,mBAAmB,CAACtD,gBAAgB,CAAC;IAC3CR,KAAK,CAAC+D,wBAAwB,CAAC5D,uBAAuB,CAAC;IACvDH,KAAK,CAACgE,wBAAwB,CAAC5D,uBAAuB,CAAC;IACvDJ,KAAK,CAACiE,sBAAsB,CAAC5D,qBAAqB,CAAC;EACrD;AACF;;AAEA;AACA;AACA;AACA,OAAO,MAAM6D,YAAY,SAASd,gBAAgB,CAAC;EACjD;AACF;AACA;AACA;AACA;EACEC,WAAW,CAACvB,IAAY,EAAEqC,KAAe,GAAG,EAAE,EAAE;IAC9C,KAAK,CAACrC,IAAI,CAAC;;IAEX;IACA,KAAK,MAAMsC,GAAG,IAAIzC,WAAW,EAAE;MAC7B,IAAI,CAACwC,KAAK,CAACE,QAAQ,CAACD,GAAG,CAACtC,IAAI,EAAE,CAAC,EAAE,IAAI,CAACwC,WAAW,CAACF,GAAG,CAAC;IACxD;;IAEA;IACA,KAAK,MAAMG,GAAG,IAAI3C,WAAW,EAAE;MAC7B,IAAI,CAACuC,KAAK,CAACE,QAAQ,CAACE,GAAG,CAACzC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC0C,SAAS,CAACD,GAAG,CAAC;IACtD;EACF;;EAEA;AACF;AACA;AACA;EACE;EACAE,wBAAwB,CAAC,GAAGC,IAAS,EAAE;IACrC,MAAMC,OAAO,GAAGD,IAAI,CAACE,GAAG,EAAE;IAC1B,MAAMC,OAAO,GAAGH,IAAI,CAACE,GAAG,EAAE;;IAE1B;IACA,KAAK,MAAM,CAACE,CAAC,EAAEC,CAAC,CAAC,IAAIJ,OAAO,CAACD,IAAI,CAACM,OAAO,EAAE,EAAE;MAC3C,IAAI,CAACL,OAAO,CAACM,KAAK,CAACH,CAAC,CAAC,EAAE;QACrB5E,YAAY,CACT,GAAEyE,OAAO,CAACD,IAAI,CAACQ,MAAO,iDAAgDP,OAAO,CAACM,KAAK,CAACC,MAAO,GAAE,EAC9F,MAAM,CACP;QACD;MACF;MACA,MAAMd,GAAG,GAAGO,OAAO,CAACM,KAAK,CAACH,CAAC,CAAC,CAAChD,IAAI,EAAE;MACnC;MACA,IAAIqD,MAAM,CAACC,IAAI,CAACvD,QAAQ,CAAC,CAACwC,QAAQ,CAACD,GAAG,CAAC,EAAE;QACvC7D,YAAY,CACT,qEAAoE6D,GAAI,IAAG,CAC7E;QACD;QACA,MAAMiB,OAAY,GAAGxD,QAAQ,CAACuC,GAAG,CAAC;QAClCiB,OAAO,CAACN,CAAC,CAAC;MACZ,CAAC,MAAM;QACLxE,YAAY,CACT,yEAAwE6D,GAAI,IAAG,CACjF;MACH;IACF;;IAEA;IACA,KAAK,MAAM,CAACkB,CAAC,EAAEP,CAAC,CAAC,IAAII,MAAM,CAACH,OAAO,CAACH,OAAO,CAAC,EAAE;MAC5C;MACA,IAAIM,MAAM,CAACC,IAAI,CAACvD,QAAQ,CAAC,CAACwC,QAAQ,CAACiB,CAAC,CAAC,EAAE;QACrC/E,YAAY,CACT,mEAAkE+E,CAAE,IAAG,CACzE;QACD;QACA,MAAMD,OAAY,GAAGxD,QAAQ,CAACyD,CAAC,CAAC;QAChCD,OAAO,CAACN,CAAC,CAAC;MACZ,CAAC,MAAM;QACLxE,YAAY,CACT,uEAAsE+E,CAAE,IAAG,CAC7E;MACH;IACF;EACF;AACF"}

package/package.json

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