@rockcarver/frodo-cli 2.0.0-17 → 2.0.0-19

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0-18] - 2023-10-02
+
+## [2.0.0-17] - 2023-09-29
+
 ## [2.0.0-16] - 2023-09-08
 
 ## [2.0.0-15] - 2023-08-17
@@ -1347,7 +1351,11 @@ 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/v2.0.0-16...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v2.0.0-18...HEAD
+
+[2.0.0-18]: https://github.com/rockcarver/frodo-cli/compare/v2.0.0-17...v2.0.0-18
+
+[2.0.0-17]: https://github.com/rockcarver/frodo-cli/compare/v2.0.0-16...v2.0.0-17
 
 [2.0.0-16]: https://github.com/rockcarver/frodo-cli/compare/v2.0.0-15...v2.0.0-16
 

package/esm/cli/FrodoCommand.js

@@ -110,7 +110,7 @@ export class FrodoCommand extends FrodoStubCommand {
     }
 
     // additional help
-    this.addHelpText('after', `\nEvironment Variables:\n` + `  FRODO_HOST: Access Management base URL. Overrides 'host' argument.\n` + `  FRODO_REALM: Realm. Overrides 'realm' argument.\n` + `  FRODO_USERNAME: Username. Overrides 'username' argument.\n` + `  FRODO_PASSWORD: Password. Overrides 'password' argument.\n` + `  FRODO_SA_ID: Service account uuid. Overrides '--sa-id' option.\n` + `  FRODO_SA_JWK: Service account JWK. Overrides '--sa-jwk-file' option but takes the actual JWK as a value, not a file name.\n` + ('frodo conn save' === this.name() ? `  FRODO_LOG_KEY: Log API key. Overrides '--log-api-key' option.\n` + `  FRODO_LOG_SECRET: Log API secret. Overrides '--log-api-secret' option.\n` : ``) + (this.name().startsWith('frodo logs') ? `  FRODO_LOG_KEY: Log API key. Overrides 'username' argument.\n` + `  FRODO_LOG_SECRET: Log API secret. Overrides 'password' argument.\n` : ``) + `  FRODO_AUTHENTICATION_SERVICE: Name of a login journey to use.\n` + `  FRODO_DEBUG: Set to any value to enable debug output. Same as '--debug'.\n` + `  FRODO_MASTER_KEY_PATH: Use this master key file instead of '~/.frodo/masterkey.key' file.\n` + `  FRODO_MASTER_KEY: Use this master key instead of '~/.frodo/masterkey.key' file. Takes precedence over FRODO_MASTER_KEY_PATH.\n`);
+    this.addHelpText('after', `\nEvironment Variables:\n` + `  FRODO_HOST: Access Management base URL. Overrides 'host' argument.\n` + `  FRODO_REALM: Realm. Overrides 'realm' argument.\n` + `  FRODO_USERNAME: Username. Overrides 'username' argument.\n` + `  FRODO_PASSWORD: Password. Overrides 'password' argument.\n` + `  FRODO_SA_ID: Service account uuid. Overrides '--sa-id' option.\n` + `  FRODO_SA_JWK: Service account JWK. Overrides '--sa-jwk-file' option but takes the actual JWK as a value, not a file name.\n` + ('frodo conn save' === this.name() ? `  FRODO_LOG_KEY: Log API key. Overrides '--log-api-key' option.\n` + `  FRODO_LOG_SECRET: Log API secret. Overrides '--log-api-secret' option.\n` : ``) + (this.name().startsWith('frodo log') ? `  FRODO_LOG_KEY: Log API key. Overrides 'username' argument.\n` + `  FRODO_LOG_SECRET: Log API secret. Overrides 'password' argument.\n` : ``) + `  FRODO_CONNECTION_PROFILES_PATH: Use this connection profiles file instead of '~/.frodo/Connections.json'.\n` + `  FRODO_AUTHENTICATION_SERVICE: Name of a login journey to use.\n` + `  FRODO_DEBUG: Set to any value to enable debug output. Same as '--debug'.\n` + `  FRODO_MASTER_KEY_PATH: Use this master key file instead of '~/.frodo/masterkey.key' file.\n` + `  FRODO_MASTER_KEY: Use this master key instead of '~/.frodo/masterkey.key' file. Takes precedence over FRODO_MASTER_KEY_PATH.\n`);
   }
 
   /**

package/esm/cli/FrodoCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"FrodoCommand.js","names":["state","Argument","Command","Option","fs","globalConfig","createProgressIndicator","curlirizeMessage","debugMessage","printMessage","stopProgressIndicator","updateProgressIndicator","verboseMessage","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","host","setHost","realm","setRealm","username","setUsername","password","setPassword","attributeName","saId","setServiceAccountId","file","data","readFileSync","jwk","JSON","parse","toString","setServiceAccountJwk","error","message","type","setDeploymentType","insecure","setAllowInsecureConnection","verbose","setVerbose","debug","setDebug","curlirize","setCurlirize","FrodoStubCommand","constructor","on","_error$config","_error$config2","_error$response","config","method","url","response","stack","exitCode","helpOption","showHelpAfterError","configureHelp","sortSubcommands","sortOptions","setPrintHandler","setVerboseHandler","setDebugHandler","setCurlirizeHandler","setCreateProgressHandler","setUpdateProgressHandler","setStopProgressHandler","FrodoCommand","omits","arg","includes","addArgument","opt","addOption","addHelpText","startsWith","handleDefaultArgsAndOpts","args","command","pop","options","i","v","entries","_args","length","Object","keys","handler","k"],"sources":["../../src/cli/FrodoCommand.ts"],"sourcesContent":["import { state } from '@rockcarver/frodo-lib';\nimport { Argument, Command, Option } from 'commander';\nimport fs from 'fs';\n\nimport * as globalConfig from '../storage/StaticStorage';\nimport {\n  createProgressIndicator,\n  curlirizeMessage,\n  debugMessage,\n  printMessage,\n  stopProgressIndicator,\n  updateProgressIndicator,\n  verboseMessage,\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()]: (host: string) => state.setHost(host),\n  [realmArgument.name()]: (realm: string) => state.setRealm(realm),\n  [usernameArgument.name()]: (username: string) => state.setUsername(username),\n  [passwordArgument.name()]: (password: string) => state.setPassword(password),\n  [serviceAccountIdOption.attributeName()]: (saId: string) =>\n    state.setServiceAccountId(saId),\n  [serviceAccountJwkFileOption.attributeName()]: (file: string) => {\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()]: (type: string) =>\n    state.setDeploymentType(type),\n  [insecureOption.attributeName()]: (insecure: boolean) =>\n    state.setAllowInsecureConnection(insecure),\n  [verboseOption.attributeName()]: (verbose: boolean) =>\n    state.setVerbose(verbose),\n  [debugOption.attributeName()]: (debug: boolean) => state.setDebug(debug),\n  [curlirizeOption.attributeName()]: (curlirize: boolean) =>\n    state.setCurlirize(curlirize),\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    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    process.on('unhandledRejection', (error: any) => {\n      printMessage(\n        `${error.config?.method ? error.config.method + ' ' : ''}${\n          error.config?.url ? error.config.url : ''\n        }`,\n        'error'\n      );\n      printMessage(error.response?.data, 'error');\n      printMessage(error.stack, 'error');\n      printMessage(\n        `Please report this unhandled error here: https://github.com/rockcarver/frodo-cli/issues`,\n        'error'\n      );\n      process.exitCode = 1;\n    });\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    // additional help\n    this.addHelpText(\n      'after',\n      `\\nEvironment Variables:\\n` +\n        `  FRODO_HOST: Access Management base URL. Overrides 'host' argument.\\n` +\n        `  FRODO_REALM: Realm. Overrides 'realm' argument.\\n` +\n        `  FRODO_USERNAME: Username. Overrides 'username' argument.\\n` +\n        `  FRODO_PASSWORD: Password. Overrides 'password' argument.\\n` +\n        `  FRODO_SA_ID: Service account uuid. Overrides '--sa-id' option.\\n` +\n        `  FRODO_SA_JWK: Service account JWK. Overrides '--sa-jwk-file' option but takes the actual JWK as a value, not a file name.\\n` +\n        ('frodo conn save' === this.name()\n          ? `  FRODO_LOG_KEY: Log API key. Overrides '--log-api-key' option.\\n` +\n            `  FRODO_LOG_SECRET: Log API secret. Overrides '--log-api-secret' option.\\n`\n          : ``) +\n        (this.name().startsWith('frodo logs')\n          ? `  FRODO_LOG_KEY: Log API key. Overrides 'username' argument.\\n` +\n            `  FRODO_LOG_SECRET: Log API secret. Overrides 'password' argument.\\n`\n          : ``) +\n        `  FRODO_AUTHENTICATION_SERVICE: Name of a login journey to use.\\n` +\n        `  FRODO_DEBUG: Set to any value to enable debug output. Same as '--debug'.\\n` +\n        `  FRODO_MASTER_KEY_PATH: Use this master key file instead of '~/.frodo/masterkey.key' file.\\n` +\n        `  FRODO_MASTER_KEY: Use this master key instead of '~/.frodo/masterkey.key' file. Takes precedence over FRODO_MASTER_KEY_PATH.\\n`\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":"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"}
+{"version":3,"file":"FrodoCommand.js","names":["state","Argument","Command","Option","fs","globalConfig","createProgressIndicator","curlirizeMessage","debugMessage","printMessage","stopProgressIndicator","updateProgressIndicator","verboseMessage","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","host","setHost","realm","setRealm","username","setUsername","password","setPassword","attributeName","saId","setServiceAccountId","file","data","readFileSync","jwk","JSON","parse","toString","setServiceAccountJwk","error","message","type","setDeploymentType","insecure","setAllowInsecureConnection","verbose","setVerbose","debug","setDebug","curlirize","setCurlirize","FrodoStubCommand","constructor","on","_error$config","_error$config2","_error$response","config","method","url","response","stack","exitCode","helpOption","showHelpAfterError","configureHelp","sortSubcommands","sortOptions","setPrintHandler","setVerboseHandler","setDebugHandler","setCurlirizeHandler","setCreateProgressHandler","setUpdateProgressHandler","setStopProgressHandler","FrodoCommand","omits","arg","includes","addArgument","opt","addOption","addHelpText","startsWith","handleDefaultArgsAndOpts","args","command","pop","options","i","v","entries","_args","length","Object","keys","handler","k"],"sources":["../../src/cli/FrodoCommand.ts"],"sourcesContent":["import { state } from '@rockcarver/frodo-lib';\nimport { Argument, Command, Option } from 'commander';\nimport fs from 'fs';\n\nimport * as globalConfig from '../storage/StaticStorage';\nimport {\n  createProgressIndicator,\n  curlirizeMessage,\n  debugMessage,\n  printMessage,\n  stopProgressIndicator,\n  updateProgressIndicator,\n  verboseMessage,\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()]: (host: string) => state.setHost(host),\n  [realmArgument.name()]: (realm: string) => state.setRealm(realm),\n  [usernameArgument.name()]: (username: string) => state.setUsername(username),\n  [passwordArgument.name()]: (password: string) => state.setPassword(password),\n  [serviceAccountIdOption.attributeName()]: (saId: string) =>\n    state.setServiceAccountId(saId),\n  [serviceAccountJwkFileOption.attributeName()]: (file: string) => {\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()]: (type: string) =>\n    state.setDeploymentType(type),\n  [insecureOption.attributeName()]: (insecure: boolean) =>\n    state.setAllowInsecureConnection(insecure),\n  [verboseOption.attributeName()]: (verbose: boolean) =>\n    state.setVerbose(verbose),\n  [debugOption.attributeName()]: (debug: boolean) => state.setDebug(debug),\n  [curlirizeOption.attributeName()]: (curlirize: boolean) =>\n    state.setCurlirize(curlirize),\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    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    process.on('unhandledRejection', (error: any) => {\n      printMessage(\n        `${error.config?.method ? error.config.method + ' ' : ''}${\n          error.config?.url ? error.config.url : ''\n        }`,\n        'error'\n      );\n      printMessage(error.response?.data, 'error');\n      printMessage(error.stack, 'error');\n      printMessage(\n        `Please report this unhandled error here: https://github.com/rockcarver/frodo-cli/issues`,\n        'error'\n      );\n      process.exitCode = 1;\n    });\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    // additional help\n    this.addHelpText(\n      'after',\n      `\\nEvironment Variables:\\n` +\n        `  FRODO_HOST: Access Management base URL. Overrides 'host' argument.\\n` +\n        `  FRODO_REALM: Realm. Overrides 'realm' argument.\\n` +\n        `  FRODO_USERNAME: Username. Overrides 'username' argument.\\n` +\n        `  FRODO_PASSWORD: Password. Overrides 'password' argument.\\n` +\n        `  FRODO_SA_ID: Service account uuid. Overrides '--sa-id' option.\\n` +\n        `  FRODO_SA_JWK: Service account JWK. Overrides '--sa-jwk-file' option but takes the actual JWK as a value, not a file name.\\n` +\n        ('frodo conn save' === this.name()\n          ? `  FRODO_LOG_KEY: Log API key. Overrides '--log-api-key' option.\\n` +\n            `  FRODO_LOG_SECRET: Log API secret. Overrides '--log-api-secret' option.\\n`\n          : ``) +\n        (this.name().startsWith('frodo log')\n          ? `  FRODO_LOG_KEY: Log API key. Overrides 'username' argument.\\n` +\n            `  FRODO_LOG_SECRET: Log API secret. Overrides 'password' argument.\\n`\n          : ``) +\n        `  FRODO_CONNECTION_PROFILES_PATH: Use this connection profiles file instead of '~/.frodo/Connections.json'.\\n` +\n        `  FRODO_AUTHENTICATION_SERVICE: Name of a login journey to use.\\n` +\n        `  FRODO_DEBUG: Set to any value to enable debug output. Same as '--debug'.\\n` +\n        `  FRODO_MASTER_KEY_PATH: Use this master key file instead of '~/.frodo/masterkey.key' file.\\n` +\n        `  FRODO_MASTER_KEY: Use this master key instead of '~/.frodo/masterkey.key' file. Takes precedence over FRODO_MASTER_KEY_PATH.\\n`\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":"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"}

package/esm/cli/log/log-fetch.js

@@ -2,7 +2,7 @@ import { frodo, state } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 import { fetchLogs, provisionCreds } from '../../ops/LogOps';
 import * as config from '../../utils/Config';
-import { printMessage } from '../../utils/Console';
+import { printMessage, verboseMessage } from '../../utils/Console';
 import { FrodoCommand } from '../FrodoCommand';
 import { sourcesOptionM } from './log';
 const {
@@ -29,31 +29,47 @@ Following values are possible (values on the same line are equivalent): \
 Cannot be more than 30 days in the past. If not specified, logs from one hour ago are fetched \
 (-e is ignored)')).addOption(new Option('-e, --end-timestamp <endTs>', 'End timestamp for period. Default: "now"')).addOption(new Option('-s, --search-string <ss>', 'Filter by a specific string (ANDed with transactionID filter)')).addOption(new Option('-d, --defaults', 'Use default logging noise filters').default(false, `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`)).action(async (host, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, user, password, options, command);
-  let credsFromParameters = true;
+  let foundCredentials = false;
   const conn = await getConnectionProfile();
-  if (conn) {
-    state.setHost(conn.tenant);
-    if (conn.logApiKey != null && conn.logApiSecret != null) {
-      credsFromParameters = false;
-      state.setLogApiKey(conn.logApiKey);
-      state.setLogApiSecret(conn.logApiSecret);
-    } else {
-      if (conn.username == null && conn.password == null) {
-        if (!state.getUsername() && !state.getPassword()) {
-          credsFromParameters = false;
-          printMessage('User credentials not specified as parameters and no saved API key and secret found!', 'warn');
-          return;
-        }
-      } else {
-        state.setUsername(conn.username);
-        state.setPassword(conn.password);
-      }
-      if (await getTokens(true)) {
-        const creds = await provisionCreds();
-        state.setLogApiKey(creds.api_key_id);
-        state.setLogApiSecret(creds.api_key_secret);
-      }
+  if (conn) state.setHost(conn.tenant);
+
+  // log api creds have been supplied as username and password arguments
+  if (state.getUsername() && state.getPassword()) {
+    verboseMessage(`Using log api credentials from command line.`);
+    state.setLogApiKey(state.getUsername());
+    state.setLogApiSecret(state.getPassword());
+    foundCredentials = true;
+  }
+  // log api creds from connection profile
+  else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {
+    verboseMessage(`Using log api credentials from connection profile.`);
+    state.setLogApiKey(conn.logApiKey);
+    state.setLogApiSecret(conn.logApiSecret);
+    foundCredentials = true;
+  }
+  // log api creds have been supplied via env variables
+  else if (state.getLogApiKey() && state.getLogApiSecret()) {
+    verboseMessage(`Using log api credentials from environment variables.`);
+    foundCredentials = true;
+  }
+  // no log api creds but got username and password, so can try to create them
+  else if (conn && conn.username && conn.password) {
+    printMessage(`Found admin credentials in connection profile, attempting to create log api credentials...`);
+    state.setUsername(conn.username);
+    state.setPassword(conn.password);
+    if (await getTokens(true)) {
+      const creds = await provisionCreds();
+      state.setLogApiKey(creds.api_key_id);
+      state.setLogApiSecret(creds.api_key_secret);
+      await saveConnectionProfile(state.getHost());
+      foundCredentials = true;
     }
+    // unable to create credentials
+    else {
+      printMessage(`Unable to create log api credentials.`);
+    }
+  }
+  if (foundCredentials) {
     const now = Date.now() / 1000;
     const nowString = new Date(now * 1000).toISOString();
     if (typeof options.beginTimestamp === 'undefined' || !options.beginTimestamp) {
@@ -76,16 +92,16 @@ Cannot be more than 30 days in the past. If not specified, logs from one hour ag
     const endTs = Date.parse(options.endTimestamp) / 1000;
     if (endTs < beginTs) {
       printMessage('End timestamp can not be before begin timestamp', 'error');
+      process.exitCode = 1;
       return;
     }
     if (now - beginTs > LOG_TIME_WINDOW_MAX) {
       printMessage('Begin timestamp can not be more than 30 days in the past', 'error');
+      process.exitCode = 1;
       return;
     }
     let intermediateEndTs = 0;
     printMessage(`Fetching ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}] of ${conn.tenant}...`);
-    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
-
     let timeIncrement = LOG_TIME_WINDOW_INCREMENT;
     if (endTs - beginTs > 30) {
       timeIncrement = timeIncrement * 30;
@@ -96,6 +112,12 @@ Cannot be more than 30 days in the past. If not specified, logs from one hour ag
       beginTs = intermediateEndTs;
     } while (intermediateEndTs < endTs);
   }
+  // no log api credentials
+  else {
+    printMessage('No log api credentials found!');
+    program.help();
+    process.exitCode = 1;
+  }
 });
 program.parse();
 //# sourceMappingURL=log-fetch.js.map

package/esm/cli/log/log-fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-fetch.js","names":["frodo","state","Option","fetchLogs","provisionCreds","config","printMessage","FrodoCommand","sourcesOptionM","getTokens","login","resolveLevel","cloud","log","getConnectionProfile","saveConnectionProfile","conn","SECONDS_IN_30_DAYS","SECONDS_IN_1_HOUR","LOG_TIME_WINDOW_MAX","LOG_TIME_WINDOW_INCREMENT","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","setHost","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","setUsername","setPassword","creds","api_key_id","api_key_secret","now","Date","nowString","toISOString","beginTimestamp","tempStartDate","setTime","tempEndDate","endTimestamp","beginTs","parse","endTs","intermediateEndTs","opts","sources","level","timeIncrement","transactionId","searchString","getNoiseFilters","defaults"],"sources":["../../../src/cli/log/log-fetch.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport { fetchLogs, provisionCreds } from '../../ops/LogOps';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './log';\n\nconst { getTokens } = frodo.login;\nconst { resolveLevel } = frodo.cloud.log;\nconst { getConnectionProfile, saveConnectionProfile } = frodo.conn;\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 = 1;\n\nconst program = new FrodoCommand('frodo log fetch', ['realm', 'type']);\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  .addOption(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    command.handleDefaultArgsAndOpts(host, user, password, options, command);\n    let credsFromParameters = true;\n    const conn = await getConnectionProfile();\n    if (conn) {\n      state.setHost(conn.tenant);\n      if (conn.logApiKey != null && conn.logApiSecret != null) {\n        credsFromParameters = false;\n        state.setLogApiKey(conn.logApiKey);\n        state.setLogApiSecret(conn.logApiSecret);\n      } else {\n        if (conn.username == null && conn.password == null) {\n          if (!state.getUsername() && !state.getPassword()) {\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.setUsername(conn.username);\n          state.setPassword(conn.password);\n        }\n        if (await getTokens(true)) {\n          const creds = await provisionCreds();\n          state.setLogApiKey(creds.api_key_id as string);\n          state.setLogApiSecret(creds.api_key_secret as string);\n        }\n      }\n      const now = Date.now() / 1000;\n      const nowString = new Date(now * 1000).toISOString();\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 (\n        typeof options.endTimestamp === 'undefined' ||\n        !options.endTimestamp\n      ) {\n        // no endTimestamp value specified, default is now\n        options.endTimestamp = nowString;\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      const endTs = Date.parse(options.endTimestamp) / 1000;\n      if (endTs < beginTs) {\n        printMessage(\n          'End timestamp can not be before begin timestamp',\n          'error'\n        );\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)}] of ${\n          conn.tenant\n        }...`\n      );\n      if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n\n      let timeIncrement = LOG_TIME_WINDOW_INCREMENT;\n      if (endTs - beginTs > 30) {\n        timeIncrement = timeIncrement * 30;\n      }\n      do {\n        intermediateEndTs = beginTs + timeIncrement;\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 < endTs);\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"log-fetch.js","names":["frodo","state","Option","fetchLogs","provisionCreds","config","printMessage","verboseMessage","FrodoCommand","sourcesOptionM","getTokens","login","resolveLevel","cloud","log","getConnectionProfile","saveConnectionProfile","conn","SECONDS_IN_30_DAYS","SECONDS_IN_1_HOUR","LOG_TIME_WINDOW_MAX","LOG_TIME_WINDOW_INCREMENT","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","foundCredentials","setHost","tenant","getUsername","getPassword","setLogApiKey","setLogApiSecret","logApiKey","logApiSecret","getLogApiKey","getLogApiSecret","username","setUsername","setPassword","creds","api_key_id","api_key_secret","getHost","now","Date","nowString","toISOString","beginTimestamp","tempStartDate","setTime","tempEndDate","endTimestamp","beginTs","parse","endTs","process","exitCode","intermediateEndTs","opts","sources","level","timeIncrement","transactionId","searchString","getNoiseFilters","defaults","help"],"sources":["../../../src/cli/log/log-fetch.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport { fetchLogs, provisionCreds } from '../../ops/LogOps';\nimport * as config from '../../utils/Config';\nimport { printMessage, verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './log';\n\nconst { getTokens } = frodo.login;\nconst { resolveLevel } = frodo.cloud.log;\nconst { getConnectionProfile, saveConnectionProfile } = frodo.conn;\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 = 1;\n\nconst program = new FrodoCommand('frodo log fetch', ['realm', 'type']);\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  .addOption(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    command.handleDefaultArgsAndOpts(host, user, password, options, command);\n\n    let foundCredentials = false;\n\n    const conn = await getConnectionProfile();\n    if (conn) state.setHost(conn.tenant);\n\n    // log api creds have been supplied as username and password arguments\n    if (state.getUsername() && state.getPassword()) {\n      verboseMessage(`Using log api credentials from command line.`);\n      state.setLogApiKey(state.getUsername());\n      state.setLogApiSecret(state.getPassword());\n      foundCredentials = true;\n    }\n    // log api creds from connection profile\n    else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {\n      verboseMessage(`Using log api credentials from connection profile.`);\n      state.setLogApiKey(conn.logApiKey);\n      state.setLogApiSecret(conn.logApiSecret);\n      foundCredentials = true;\n    }\n    // log api creds have been supplied via env variables\n    else if (state.getLogApiKey() && state.getLogApiSecret()) {\n      verboseMessage(`Using log api credentials from environment variables.`);\n      foundCredentials = true;\n    }\n    // no log api creds but got username and password, so can try to create them\n    else if (conn && conn.username && conn.password) {\n      printMessage(\n        `Found admin credentials in connection profile, attempting to create log api credentials...`\n      );\n      state.setUsername(conn.username);\n      state.setPassword(conn.password);\n      if (await getTokens(true)) {\n        const creds = await provisionCreds();\n        state.setLogApiKey(creds.api_key_id as string);\n        state.setLogApiSecret(creds.api_key_secret as string);\n        await saveConnectionProfile(state.getHost());\n        foundCredentials = true;\n      }\n      // unable to create credentials\n      else {\n        printMessage(`Unable to create log api credentials.`);\n      }\n    }\n\n    if (foundCredentials) {\n      const now = Date.now() / 1000;\n      const nowString = new Date(now * 1000).toISOString();\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 (\n        typeof options.endTimestamp === 'undefined' ||\n        !options.endTimestamp\n      ) {\n        // no endTimestamp value specified, default is now\n        options.endTimestamp = nowString;\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      const endTs = Date.parse(options.endTimestamp) / 1000;\n      if (endTs < beginTs) {\n        printMessage(\n          'End timestamp can not be before begin timestamp',\n          'error'\n        );\n        process.exitCode = 1;\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        process.exitCode = 1;\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)}] of ${\n          conn.tenant\n        }...`\n      );\n\n      let timeIncrement = LOG_TIME_WINDOW_INCREMENT;\n      if (endTs - beginTs > 30) {\n        timeIncrement = timeIncrement * 30;\n      }\n      do {\n        intermediateEndTs = beginTs + timeIncrement;\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 < endTs);\n    }\n    // no log api credentials\n    else {\n      printMessage('No log api credentials found!');\n      program.help();\n      process.exitCode = 1;\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}

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

@@ -15,45 +15,66 @@ const {
 const program = new FrodoCommand('frodo log list', ['realm', 'type']);
 program.description('List available ID Cloud log sources.').action(async (host, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, user, password, options, command);
-  let credsFromParameters = true;
   verboseMessage('Listing available ID Cloud log sources...');
+  let foundCredentials = false;
   const conn = await getConnectionProfile();
-  if (conn) {
-    state.setHost(conn.tenant);
-    if (conn.logApiKey != null && conn.logApiSecret != null) {
-      credsFromParameters = false;
-      state.setLogApiKey(conn.logApiKey);
-      state.setLogApiSecret(conn.logApiSecret);
-    } else {
-      if (conn.username == null && conn.password == null) {
-        if (!state.getUsername() && !state.getPassword()) {
-          credsFromParameters = false;
-          printMessage('User credentials not specified as parameters and no saved API key and secret found!', 'warn');
-          return;
-        }
-      } else {
-        state.setUsername(conn.username);
-        state.setPassword(conn.password);
-      }
-      if (await getTokens(true)) {
-        const creds = await provisionCreds();
-        state.setLogApiKey(creds.api_key_id);
-        state.setLogApiSecret(creds.api_key_secret);
-      }
+  if (conn) state.setHost(conn.tenant);
+
+  // log api creds have been supplied as username and password arguments
+  if (state.getUsername() && state.getPassword()) {
+    verboseMessage(`Using log api credentials from command line.`);
+    state.setLogApiKey(state.getUsername());
+    state.setLogApiSecret(state.getPassword());
+    foundCredentials = true;
+  }
+  // log api creds from connection profile
+  else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {
+    verboseMessage(`Using log api credentials from connection profile.`);
+    state.setLogApiKey(conn.logApiKey);
+    state.setLogApiSecret(conn.logApiSecret);
+    foundCredentials = true;
+  }
+  // log api creds have been supplied via env variables
+  else if (state.getLogApiKey() && state.getLogApiSecret()) {
+    verboseMessage(`Using log api credentials from environment variables.`);
+    foundCredentials = true;
+  }
+  // no log api creds but got username and password, so can try to create them
+  else if (conn && conn.username && conn.password) {
+    printMessage(`Found admin credentials in connection profile, attempting to create log api credentials...`);
+    state.setUsername(conn.username);
+    state.setPassword(conn.password);
+    if (await getTokens(true)) {
+      const creds = await provisionCreds();
+      state.setLogApiKey(creds.api_key_id);
+      state.setLogApiSecret(creds.api_key_secret);
+      await saveConnectionProfile(state.getHost());
+      foundCredentials = true;
+    }
+    // unable to create credentials
+    else {
+      printMessage(`Unable to create log api credentials.`);
     }
+  }
+  if (foundCredentials) {
     const sources = await getLogSources();
     if (sources.length === 0) {
       printMessage("Can't get sources, possible cause - wrong API key or secret", 'error');
     } else {
-      if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
-      printMessage(`Log sources from ${conn.tenant}`);
-      sources.forEach(source => {
+      printMessage(`Log sources from ${state.getHost()}`);
+      for (const source of sources) {
         printMessage(`${source}`, 'data');
-      });
+      }
       printMessage('Use any combination of comma separated sources, example:', 'info');
-      printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'text');
+      printMessage(`$ frodo logs tail -c am-core,idm-core ${state.getHost()}`, 'text');
     }
   }
+  // no log api credentials
+  else {
+    printMessage('No log api credentials found!');
+    program.help();
+    process.exitCode = 1;
+  }
 });
 program.parse();
 //# sourceMappingURL=log-list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"log-list.js","names":["frodo","state","provisionCreds","printMessage","verboseMessage","FrodoCommand","getTokens","login","getConnectionProfile","saveConnectionProfile","conn","getLogSources","cloud","log","program","description","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","setHost","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","setUsername","setPassword","creds","api_key_id","api_key_secret","sources","length","forEach","source","parse"],"sources":["../../../src/cli/log/log-list.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\n\nimport { provisionCreds } from '../../ops/LogOps';\nimport { printMessage, verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\nconst { getConnectionProfile, saveConnectionProfile } = frodo.conn;\nconst { getLogSources } = frodo.cloud.log;\n\nconst program = new FrodoCommand('frodo log list', ['realm', 'type']);\nprogram\n  .description('List available ID Cloud log sources.')\n  .action(async (host, user, password, options, command) => {\n    command.handleDefaultArgsAndOpts(host, user, password, options, command);\n    let credsFromParameters = true;\n    verboseMessage('Listing available ID Cloud log sources...');\n    const conn = await getConnectionProfile();\n    if (conn) {\n      state.setHost(conn.tenant);\n      if (conn.logApiKey != null && conn.logApiSecret != null) {\n        credsFromParameters = false;\n        state.setLogApiKey(conn.logApiKey);\n        state.setLogApiSecret(conn.logApiSecret);\n      } else {\n        if (conn.username == null && conn.password == null) {\n          if (!state.getUsername() && !state.getPassword()) {\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.setUsername(conn.username);\n          state.setPassword(conn.password);\n        }\n        if (await getTokens(true)) {\n          const creds = await provisionCreds();\n          state.setLogApiKey(creds.api_key_id as string);\n          state.setLogApiSecret(creds.api_key_secret as string);\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(`Log sources from ${conn.tenant}`);\n        sources.forEach((source) => {\n          printMessage(`${source}`, 'data');\n        });\n        printMessage(\n          'Use any combination of comma separated sources, example:',\n          'info'\n        );\n        printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'text');\n      }\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"log-list.js","names":["frodo","state","provisionCreds","printMessage","verboseMessage","FrodoCommand","getTokens","login","getConnectionProfile","saveConnectionProfile","conn","getLogSources","cloud","log","program","description","action","host","user","password","options","command","handleDefaultArgsAndOpts","foundCredentials","setHost","tenant","getUsername","getPassword","setLogApiKey","setLogApiSecret","logApiKey","logApiSecret","getLogApiKey","getLogApiSecret","username","setUsername","setPassword","creds","api_key_id","api_key_secret","getHost","sources","length","source","help","process","exitCode","parse"],"sources":["../../../src/cli/log/log-list.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\n\nimport { provisionCreds } from '../../ops/LogOps';\nimport { printMessage, verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\nconst { getConnectionProfile, saveConnectionProfile } = frodo.conn;\nconst { getLogSources } = frodo.cloud.log;\n\nconst program = new FrodoCommand('frodo log list', ['realm', 'type']);\nprogram\n  .description('List available ID Cloud log sources.')\n  .action(async (host, user, password, options, command) => {\n    command.handleDefaultArgsAndOpts(host, user, password, options, command);\n\n    verboseMessage('Listing available ID Cloud log sources...');\n\n    let foundCredentials = false;\n\n    const conn = await getConnectionProfile();\n    if (conn) state.setHost(conn.tenant);\n\n    // log api creds have been supplied as username and password arguments\n    if (state.getUsername() && state.getPassword()) {\n      verboseMessage(`Using log api credentials from command line.`);\n      state.setLogApiKey(state.getUsername());\n      state.setLogApiSecret(state.getPassword());\n      foundCredentials = true;\n    }\n    // log api creds from connection profile\n    else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {\n      verboseMessage(`Using log api credentials from connection profile.`);\n      state.setLogApiKey(conn.logApiKey);\n      state.setLogApiSecret(conn.logApiSecret);\n      foundCredentials = true;\n    }\n    // log api creds have been supplied via env variables\n    else if (state.getLogApiKey() && state.getLogApiSecret()) {\n      verboseMessage(`Using log api credentials from environment variables.`);\n      foundCredentials = true;\n    }\n    // no log api creds but got username and password, so can try to create them\n    else if (conn && conn.username && conn.password) {\n      printMessage(\n        `Found admin credentials in connection profile, attempting to create log api credentials...`\n      );\n      state.setUsername(conn.username);\n      state.setPassword(conn.password);\n      if (await getTokens(true)) {\n        const creds = await provisionCreds();\n        state.setLogApiKey(creds.api_key_id as string);\n        state.setLogApiSecret(creds.api_key_secret as string);\n        await saveConnectionProfile(state.getHost());\n        foundCredentials = true;\n      }\n      // unable to create credentials\n      else {\n        printMessage(`Unable to create log api credentials.`);\n      }\n    }\n\n    if (foundCredentials) {\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        printMessage(`Log sources from ${state.getHost()}`);\n        for (const source of sources) {\n          printMessage(`${source}`, 'data');\n        }\n        printMessage(\n          'Use any combination of comma separated sources, example:',\n          'info'\n        );\n        printMessage(\n          `$ frodo logs tail -c am-core,idm-core ${state.getHost()}`,\n          'text'\n        );\n      }\n    }\n    // no log api credentials\n    else {\n      printMessage('No log api credentials found!');\n      program.help();\n      process.exitCode = 1;\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/log/log-tail.js

@@ -2,7 +2,7 @@ import { frodo, state } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
 import { provisionCreds, tailLogs } from '../../ops/LogOps';
 import * as config from '../../utils/Config';
-import { printMessage } from '../../utils/Console';
+import { printMessage, verboseMessage } from '../../utils/Console';
 import { FrodoCommand } from '../FrodoCommand';
 import { sourcesOptionM } from './log';
 const {
@@ -22,35 +22,56 @@ Following values are possible (values on the same line are equivalent): \
 \n2, INFO or INFORMATION\n3, DEBUG, FINE, FINER or FINEST\
 \n4 or ALL').default('ERROR', `${resolveLevel('ERROR')}`)).addOption(new Option('-t, --transaction-id <txid>', 'Filter by transactionId')).addOption(new Option('-d, --defaults', 'Use default logging noise filters').default(false, `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`)).action(async (host, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, user, password, options, command);
-  let credsFromParameters = true;
+  let foundCredentials = false;
   const conn = await getConnectionProfile();
-  if (conn) {
-    state.setHost(conn.tenant);
-    if (conn.logApiKey != null && conn.logApiSecret != null) {
-      credsFromParameters = false;
-      state.setLogApiKey(conn.logApiKey);
-      state.setLogApiSecret(conn.logApiSecret);
-    } else {
-      if (conn.username == null && conn.password == null) {
-        if (!state.getUsername() && !state.getPassword()) {
-          credsFromParameters = false;
-          printMessage('User credentials not specified as parameters and no saved API key and secret found!', 'warn');
-          return;
-        }
-      } else {
-        state.setUsername(conn.username);
-        state.setPassword(conn.password);
-      }
-      if (await getTokens(true)) {
-        const creds = await provisionCreds();
-        state.setLogApiKey(creds.api_key_id);
-        state.setLogApiSecret(creds.api_key_secret);
-      }
+  if (conn) state.setHost(conn.tenant);
+
+  // log api creds have been supplied as username and password arguments
+  if (state.getUsername() && state.getPassword()) {
+    verboseMessage(`Using log api credentials from command line.`);
+    state.setLogApiKey(state.getUsername());
+    state.setLogApiSecret(state.getPassword());
+    foundCredentials = true;
+  }
+  // log api creds from connection profile
+  else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {
+    verboseMessage(`Using log api credentials from connection profile.`);
+    state.setLogApiKey(conn.logApiKey);
+    state.setLogApiSecret(conn.logApiSecret);
+    foundCredentials = true;
+  }
+  // log api creds have been supplied via env variables
+  else if (state.getLogApiKey() && state.getLogApiSecret()) {
+    verboseMessage(`Using log api credentials from environment variables.`);
+    foundCredentials = true;
+  }
+  // no log api creds but got username and password, so can try to create them
+  else if (conn && conn.username && conn.password) {
+    printMessage(`Found admin credentials in connection profile, attempting to create log api credentials...`);
+    state.setUsername(conn.username);
+    state.setPassword(conn.password);
+    if (await getTokens(true)) {
+      const creds = await provisionCreds();
+      state.setLogApiKey(creds.api_key_id);
+      state.setLogApiSecret(creds.api_key_secret);
+      await saveConnectionProfile(state.getHost());
+      foundCredentials = true;
     }
-    printMessage(`Tailing ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}] of ${conn.tenant}...`);
-    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
+    // unable to create credentials
+    else {
+      printMessage(`Unable to create log api credentials.`);
+    }
+  }
+  if (foundCredentials) {
+    printMessage(`Tailing ID Cloud logs from the following sources: ${options.sources} and levels [${resolveLevel(options.level)}] of ${state.getHost()}...`);
     await tailLogs(command.opts().sources, resolveLevel(command.opts().level), command.opts().transactionId, null, config.getNoiseFilters(options.defaults));
   }
+  // no log api credentials
+  else {
+    printMessage('No log api credentials found!');
+    program.help();
+    process.exitCode = 1;
+  }
 });
 program.parse();
 //# sourceMappingURL=log-tail.js.map

package/esm/cli/log/log-tail.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-tail.js","names":["frodo","state","Option","provisionCreds","tailLogs","config","printMessage","FrodoCommand","sourcesOptionM","getTokens","login","resolveLevel","cloud","log","getConnectionProfile","saveConnectionProfile","conn","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","setHost","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","setUsername","setPassword","creds","api_key_id","api_key_secret","opts","sources","level","transactionId","getNoiseFilters","defaults","parse"],"sources":["../../../src/cli/log/log-tail.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport { provisionCreds, tailLogs } from '../../ops/LogOps';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './log';\n\nconst { getTokens } = frodo.login;\nconst { resolveLevel } = frodo.cloud.log;\nconst { getConnectionProfile, saveConnectionProfile } = frodo.conn;\n\nconst program = new FrodoCommand('frodo log tail', ['realm', 'type']);\nprogram\n  .description('Tail Identity Cloud logs.')\n  .addOption(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    command.handleDefaultArgsAndOpts(host, user, password, options, command);\n    let credsFromParameters = true;\n    const conn = await getConnectionProfile();\n    if (conn) {\n      state.setHost(conn.tenant);\n      if (conn.logApiKey != null && conn.logApiSecret != null) {\n        credsFromParameters = false;\n        state.setLogApiKey(conn.logApiKey);\n        state.setLogApiSecret(conn.logApiSecret);\n      } else {\n        if (conn.username == null && conn.password == null) {\n          if (!state.getUsername() && !state.getPassword()) {\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.setUsername(conn.username);\n          state.setPassword(conn.password);\n        }\n        if (await getTokens(true)) {\n          const creds = await provisionCreds();\n          state.setLogApiKey(creds.api_key_id as string);\n          state.setLogApiSecret(creds.api_key_secret as string);\n        }\n      }\n      printMessage(\n        `Tailing ID Cloud logs from the following sources: ${\n          command.opts().sources\n        } and levels [${resolveLevel(command.opts().level)}] of ${\n          conn.tenant\n        }...`\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  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"log-tail.js","names":["frodo","state","Option","provisionCreds","tailLogs","config","printMessage","verboseMessage","FrodoCommand","sourcesOptionM","getTokens","login","resolveLevel","cloud","log","getConnectionProfile","saveConnectionProfile","conn","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","foundCredentials","setHost","tenant","getUsername","getPassword","setLogApiKey","setLogApiSecret","logApiKey","logApiSecret","getLogApiKey","getLogApiSecret","username","setUsername","setPassword","creds","api_key_id","api_key_secret","getHost","sources","level","opts","transactionId","getNoiseFilters","defaults","help","process","exitCode","parse"],"sources":["../../../src/cli/log/log-tail.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport { provisionCreds, tailLogs } from '../../ops/LogOps';\nimport * as config from '../../utils/Config';\nimport { printMessage, verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './log';\n\nconst { getTokens } = frodo.login;\nconst { resolveLevel } = frodo.cloud.log;\nconst { getConnectionProfile, saveConnectionProfile } = frodo.conn;\n\nconst program = new FrodoCommand('frodo log tail', ['realm', 'type']);\nprogram\n  .description('Tail Identity Cloud logs.')\n  .addOption(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    command.handleDefaultArgsAndOpts(host, user, password, options, command);\n\n    let foundCredentials = false;\n\n    const conn = await getConnectionProfile();\n    if (conn) state.setHost(conn.tenant);\n\n    // log api creds have been supplied as username and password arguments\n    if (state.getUsername() && state.getPassword()) {\n      verboseMessage(`Using log api credentials from command line.`);\n      state.setLogApiKey(state.getUsername());\n      state.setLogApiSecret(state.getPassword());\n      foundCredentials = true;\n    }\n    // log api creds from connection profile\n    else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {\n      verboseMessage(`Using log api credentials from connection profile.`);\n      state.setLogApiKey(conn.logApiKey);\n      state.setLogApiSecret(conn.logApiSecret);\n      foundCredentials = true;\n    }\n    // log api creds have been supplied via env variables\n    else if (state.getLogApiKey() && state.getLogApiSecret()) {\n      verboseMessage(`Using log api credentials from environment variables.`);\n      foundCredentials = true;\n    }\n    // no log api creds but got username and password, so can try to create them\n    else if (conn && conn.username && conn.password) {\n      printMessage(\n        `Found admin credentials in connection profile, attempting to create log api credentials...`\n      );\n      state.setUsername(conn.username);\n      state.setPassword(conn.password);\n      if (await getTokens(true)) {\n        const creds = await provisionCreds();\n        state.setLogApiKey(creds.api_key_id as string);\n        state.setLogApiSecret(creds.api_key_secret as string);\n        await saveConnectionProfile(state.getHost());\n        foundCredentials = true;\n      }\n      // unable to create credentials\n      else {\n        printMessage(`Unable to create log api credentials.`);\n      }\n    }\n\n    if (foundCredentials) {\n      printMessage(\n        `Tailing ID Cloud logs from the following sources: ${\n          options.sources\n        } and levels [${resolveLevel(options.level)}] of ${state.getHost()}...`\n      );\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    // no log api credentials\n    else {\n      printMessage('No log api credentials found!');\n      program.help();\n      process.exitCode = 1;\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}

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

@@ -21,7 +21,7 @@ async (host, realm, user, password, options, command) => {
     return;
   }
   verboseMessage(`Importing script(s) into realm "${state.getRealm()}"...`);
-  if (options.scriptName) {
+  if (options.file) {
     const outcome = await importScriptsFromFile(options.scriptName || options.script, options.file, options.reUuid);
     if (!outcome) process.exitCode = 1;
   } else if (options.allSeparate) {