@rockcarver/frodo-cli 0.20.1-0 → 0.20.1

package/CHANGELOG.md

@@ -7,6 +7,21 @@ 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
 
 ### Fixed
@@ -107,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
 
@@ -116,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
@@ -960,7 +976,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/v0.20.1-0...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
 
 [0.20.1-0]: https://github.com/rockcarver/frodo-cli/compare/v0.20.0...v0.20.1-0
 

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":"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"}

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

@@ -32,64 +32,66 @@ Cannot be more than 30 days in the past. If not specified, logs from one hour ag
   command.handleDefaultArgsAndOpts(host, user, password, options, command);
   let credsFromParameters = true;
   const conn = await getConnectionProfile();
-  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;
-      }
+  if (conn) {
+    state.setHost(conn.tenant);
+    if (conn.logApiKey != null && conn.logApiSecret != null) {
+      credsFromParameters = false;
+      state.setLogApiKey(conn.logApiKey);
+      state.setLogApiSecret(conn.logApiSecret);
     } else {
-      state.setUsername(conn.username);
-      state.setPassword(conn.password);
+      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()) {
+        const creds = await provisionCreds();
+        state.setLogApiKey(creds.api_key_id);
+        state.setLogApiSecret(creds.api_key_secret);
+      }
     }
-    if (await getTokens()) {
-      const creds = await provisionCreds();
-      state.setLogApiKey(creds.api_key_id);
-      state.setLogApiSecret(creds.api_key_secret);
+    const now = Date.now() / 1000;
+    const nowString = new Date(now * 1000).toISOString();
+    if (typeof options.beginTimestamp === 'undefined' || !options.beginTimestamp) {
+      // no beginTimestamp value specified, default is 1 hour ago
+      const tempStartDate = new Date();
+      tempStartDate.setTime((now - SECONDS_IN_1_HOUR) * 1000);
+      options.beginTimestamp = tempStartDate.toISOString();
+      // also override endTimestamp to now
+      const tempEndDate = new Date();
+      tempEndDate.setTime(now * 1000);
+      options.endTimestamp = tempEndDate;
+      printMessage('No timestamps specified, defaulting to logs from 1 hour ago', 'info');
     }
-  }
-  const now = Date.now() / 1000;
-  const nowString = new Date(now * 1000).toISOString();
-  if (typeof options.beginTimestamp === 'undefined' || !options.beginTimestamp) {
-    // no beginTimestamp value specified, default is 1 hour ago
-    const tempStartDate = new Date();
-    tempStartDate.setTime((now - SECONDS_IN_1_HOUR) * 1000);
-    options.beginTimestamp = tempStartDate.toISOString();
-    // also override endTimestamp to now
-    const tempEndDate = new Date();
-    tempEndDate.setTime(now * 1000);
-    options.endTimestamp = tempEndDate;
-    printMessage('No timestamps specified, defaulting to logs from 1 hour ago', 'info');
-  }
-  if (typeof options.endTimestamp === 'undefined' || !options.endTimestamp) {
-    // no endTimestamp value specified, default is now
-    options.endTimestamp = nowString;
-    printMessage('No end timestamp specified, defaulting end timestamp to "now"', 'info');
-  }
-  let beginTs = Date.parse(options.beginTimestamp) / 1000;
-  if (Date.parse(options.endTimestamp) / 1000 < beginTs) {
-    printMessage('End timestamp can not be before begin timestamp', 'error');
-    return;
-  }
-  if (now - beginTs > LOG_TIME_WINDOW_MAX) {
-    printMessage('Begin timestamp can not be more than 30 days in the past', 'error');
-    return;
-  }
-  let intermediateEndTs = 0;
-  printMessage(`Fetching ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}]...`);
-  if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
+    if (typeof options.endTimestamp === 'undefined' || !options.endTimestamp) {
+      // no endTimestamp value specified, default is now
+      options.endTimestamp = nowString;
+      printMessage('No end timestamp specified, defaulting end timestamp to "now"', 'info');
+    }
+    let beginTs = Date.parse(options.beginTimestamp) / 1000;
+    if (Date.parse(options.endTimestamp) / 1000 < beginTs) {
+      printMessage('End timestamp can not be before begin timestamp', 'error');
+      return;
+    }
+    if (now - beginTs > LOG_TIME_WINDOW_MAX) {
+      printMessage('Begin timestamp can not be more than 30 days in the past', 'error');
+      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
 
-  do {
-    intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;
-    await fetchLogs(command.opts().sources, new Date(beginTs * 1000).toISOString(), new Date(intermediateEndTs * 1000).toISOString(), resolveLevel(command.opts().level), command.opts().transactionId, command.opts().searchString, null, config.getNoiseFilters(options.defaults));
-    beginTs = intermediateEndTs;
-  } while (intermediateEndTs < Date.parse(options.endTimestamp) / 1000);
+    do {
+      intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;
+      await fetchLogs(command.opts().sources, new Date(beginTs * 1000).toISOString(), new Date(intermediateEndTs * 1000).toISOString(), resolveLevel(command.opts().level), command.opts().transactionId, command.opts().searchString, null, config.getNoiseFilters(options.defaults));
+      beginTs = intermediateEndTs;
+    } while (intermediateEndTs < Date.parse(options.endTimestamp) / 1000);
+  }
 });
 program.parse();
 //# sourceMappingURL=logs-fetch.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"logs-fetch.js","names":["FrodoCommand","sourcesOptionM","Option","Authenticate","ConnectionProfile","Log","state","config","printMessage","provisionCreds","fetchLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","SECONDS_IN_30_DAYS","SECONDS_IN_1_HOUR","LOG_TIME_WINDOW_MAX","LOG_TIME_WINDOW_INCREMENT","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","conn","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","intermediateEndTs","opts","sources","level","transactionId","searchString","getNoiseFilters","defaults"],"sources":["cli/logging/logs-fetch.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './logs';\nimport { Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, fetchLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst SECONDS_IN_30_DAYS = 2592000;\nconst SECONDS_IN_1_HOUR = 3600;\nconst LOG_TIME_WINDOW_MAX = SECONDS_IN_30_DAYS;\nconst LOG_TIME_WINDOW_INCREMENT = 1;\n\nconst program = new FrodoCommand('frodo logs 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    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()) {\n        const creds = await provisionCreds();\n        state.setLogApiKey(creds.api_key_id);\n        state.setLogApiSecret(creds.api_key_secret);\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 (typeof options.endTimestamp === 'undefined' || !options.endTimestamp) {\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    if (Date.parse(options.endTimestamp) / 1000 < beginTs) {\n      printMessage('End timestamp can not be before begin timestamp', 'error');\n      return;\n    }\n    if (now - beginTs > LOG_TIME_WINDOW_MAX) {\n      printMessage(\n        'Begin timestamp can not be more than 30 days in the past',\n        'error'\n      );\n      return;\n    }\n    let intermediateEndTs = 0;\n    printMessage(\n      `Fetching ID Cloud logs from the following sources: ${\n        command.opts().sources\n      } and levels [${resolveLevel(command.opts().level)}]...`\n    );\n    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n\n    do {\n      intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;\n      await fetchLogs(\n        command.opts().sources,\n        new Date(beginTs * 1000).toISOString(),\n        new Date(intermediateEndTs * 1000).toISOString(),\n        resolveLevel(command.opts().level),\n        command.opts().transactionId,\n        command.opts().searchString,\n        null,\n        config.getNoiseFilters(options.defaults)\n      );\n      beginTs = intermediateEndTs;\n    } while (intermediateEndTs < Date.parse(options.endTimestamp) / 1000);\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"logs-fetch.js","names":["FrodoCommand","sourcesOptionM","Option","Authenticate","ConnectionProfile","Log","state","config","printMessage","provisionCreds","fetchLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","SECONDS_IN_30_DAYS","SECONDS_IN_1_HOUR","LOG_TIME_WINDOW_MAX","LOG_TIME_WINDOW_INCREMENT","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","conn","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","intermediateEndTs","opts","sources","level","transactionId","searchString","getNoiseFilters","defaults"],"sources":["cli/logging/logs-fetch.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './logs';\nimport { Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, fetchLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst SECONDS_IN_30_DAYS = 2592000;\nconst SECONDS_IN_1_HOUR = 3600;\nconst LOG_TIME_WINDOW_MAX = SECONDS_IN_30_DAYS;\nconst LOG_TIME_WINDOW_INCREMENT = 1;\n\nconst program = new FrodoCommand('frodo logs 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()) {\n          const creds = await provisionCreds();\n          state.setLogApiKey(creds.api_key_id);\n          state.setLogApiSecret(creds.api_key_secret);\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      if (Date.parse(options.endTimestamp) / 1000 < 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      do {\n        intermediateEndTs = beginTs + LOG_TIME_WINDOW_INCREMENT;\n        await fetchLogs(\n          command.opts().sources,\n          new Date(beginTs * 1000).toISOString(),\n          new Date(intermediateEndTs * 1000).toISOString(),\n          resolveLevel(command.opts().level),\n          command.opts().transactionId,\n          command.opts().searchString,\n          null,\n          config.getNoiseFilters(options.defaults)\n        );\n        beginTs = intermediateEndTs;\n      } while (intermediateEndTs < Date.parse(options.endTimestamp) / 1000);\n    }\n  });\n\nprogram.parse();\n"],"mappings":"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"}

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

@@ -18,39 +18,42 @@ program.description('List available ID Cloud log sources.').action(async (host,
   let credsFromParameters = true;
   verboseMessage('Listing available ID Cloud log sources...');
   const conn = await getConnectionProfile();
-  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;
-      }
+  if (conn) {
+    state.setHost(conn.tenant);
+    if (conn.logApiKey != null && conn.logApiSecret != null) {
+      credsFromParameters = false;
+      state.setLogApiKey(conn.logApiKey);
+      state.setLogApiSecret(conn.logApiSecret);
     } else {
-      state.setUsername(conn.username);
-      state.setPassword(conn.password);
+      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()) {
+        const creds = await provisionCreds();
+        state.setLogApiKey(creds.api_key_id);
+        state.setLogApiSecret(creds.api_key_secret);
+      }
     }
-    if (await getTokens()) {
-      const creds = await provisionCreds();
-      state.setLogApiKey(creds.api_key_id);
-      state.setLogApiSecret(creds.api_key_secret);
+    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(`${source}`, 'data');
+      });
+      printMessage('Use any combination of comma separated sources, example:', 'info');
+      printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'text');
     }
   }
-  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
-    sources.forEach(source => {
-      printMessage(`${source}`, 'data');
-    });
-    printMessage('Use any combination of comma separated sources:', 'info');
-    printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'text');
-  }
 });
 program.parse();
 //# sourceMappingURL=logs-list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"logs-list.js","names":["FrodoCommand","Authenticate","ConnectionProfile","Log","state","printMessage","verboseMessage","provisionCreds","getLogSources","getConnectionProfile","saveConnectionProfile","getTokens","program","description","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","conn","setHost","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","setUsername","setPassword","creds","api_key_id","api_key_secret","sources","length","forEach","source","parse"],"sources":["cli/logging/logs-list.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport { printMessage, verboseMessage } from '../../utils/Console';\n\nconst { provisionCreds, getLogSources } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new FrodoCommand('frodo logs 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    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()) {\n        const creds = await provisionCreds();\n        state.setLogApiKey(creds.api_key_id);\n        state.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n\n    const sources = await getLogSources();\n    if (sources.length === 0) {\n      printMessage(\n        \"Can't get sources, possible cause - wrong API key or secret\",\n        'error'\n      );\n    } else {\n      if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n      sources.forEach((source) => {\n        printMessage(`${source}`, 'data');\n      });\n      printMessage('Use any combination of comma separated sources:', 'info');\n      printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'text');\n    }\n  });\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,QAAQ,iBAAiB;AAC9C,SACEC,YAAY,EACZC,iBAAiB,EACjBC,GAAG,EACHC,KAAK,QACA,uBAAuB;AAC9B,SAASC,YAAY,EAAEC,cAAc,QAAQ,qBAAqB;AAElE,MAAM;EAAEC,cAAc;EAAEC;AAAc,CAAC,GAAGL,GAAG;AAC7C,MAAM;EAAEM,oBAAoB;EAAEC;AAAsB,CAAC,GAAGR,iBAAiB;AACzE,MAAM;EAAES;AAAU,CAAC,GAAGV,YAAY;AAElC,MAAMW,OAAO,GAAG,IAAIZ,YAAY,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACtEY,OAAO,CACJC,WAAW,CAAC,sCAAsC,CAAC,CACnDC,MAAM,CAAC,OAAOC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACxDA,OAAO,CAACC,wBAAwB,CAACL,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,CAAC;EACxE,IAAIE,mBAAmB,GAAG,IAAI;EAC9Bf,cAAc,CAAC,2CAA2C,CAAC;EAC3D,MAAMgB,IAAI,GAAG,MAAMb,oBAAoB,EAAE;EACzCL,KAAK,CAACmB,OAAO,CAACD,IAAI,CAACE,MAAM,CAAC;EAC1B,IAAIF,IAAI,CAACG,SAAS,IAAI,IAAI,IAAIH,IAAI,CAACI,YAAY,IAAI,IAAI,EAAE;IACvDL,mBAAmB,GAAG,KAAK;IAC3BjB,KAAK,CAACuB,YAAY,CAACL,IAAI,CAACG,SAAS,CAAC;IAClCrB,KAAK,CAACwB,eAAe,CAACN,IAAI,CAACI,YAAY,CAAC;EAC1C,CAAC,MAAM;IACL,IAAIJ,IAAI,CAACO,QAAQ,IAAI,IAAI,IAAIP,IAAI,CAACL,QAAQ,IAAI,IAAI,EAAE;MAClD,IAAI,CAACb,KAAK,CAAC0B,WAAW,EAAE,IAAI,CAAC1B,KAAK,CAAC2B,WAAW,EAAE,EAAE;QAChDV,mBAAmB,GAAG,KAAK;QAC3BhB,YAAY,CACV,qFAAqF,EACrF,MAAM,CACP;QACD;MACF;IACF,CAAC,MAAM;MACLD,KAAK,CAAC4B,WAAW,CAACV,IAAI,CAACO,QAAQ,CAAC;MAChCzB,KAAK,CAAC6B,WAAW,CAACX,IAAI,CAACL,QAAQ,CAAC;IAClC;IACA,IAAI,MAAMN,SAAS,EAAE,EAAE;MACrB,MAAMuB,KAAK,GAAG,MAAM3B,cAAc,EAAE;MACpCH,KAAK,CAACuB,YAAY,CAACO,KAAK,CAACC,UAAU,CAAC;MACpC/B,KAAK,CAACwB,eAAe,CAACM,KAAK,CAACE,cAAc,CAAC;IAC7C;EACF;EAEA,MAAMC,OAAO,GAAG,MAAM7B,aAAa,EAAE;EACrC,IAAI6B,OAAO,CAACC,MAAM,KAAK,CAAC,EAAE;IACxBjC,YAAY,CACV,6DAA6D,EAC7D,OAAO,CACR;EACH,CAAC,MAAM;IACL,IAAIgB,mBAAmB,EAAE,MAAMX,qBAAqB,CAACK,IAAI,CAAC,CAAC,CAAC;IAC5DsB,OAAO,CAACE,OAAO,CAAEC,MAAM,IAAK;MAC1BnC,YAAY,CAAE,GAAEmC,MAAO,EAAC,EAAE,MAAM,CAAC;IACnC,CAAC,CAAC;IACFnC,YAAY,CAAC,iDAAiD,EAAE,MAAM,CAAC;IACvEA,YAAY,CAAE,yCAAwCU,IAAK,EAAC,EAAE,MAAM,CAAC;EACvE;AACF,CAAC,CAAC;AAEJH,OAAO,CAAC6B,KAAK,EAAE"}
+{"version":3,"file":"logs-list.js","names":["FrodoCommand","Authenticate","ConnectionProfile","Log","state","printMessage","verboseMessage","provisionCreds","getLogSources","getConnectionProfile","saveConnectionProfile","getTokens","program","description","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","conn","setHost","tenant","logApiKey","logApiSecret","setLogApiKey","setLogApiSecret","username","getUsername","getPassword","setUsername","setPassword","creds","api_key_id","api_key_secret","sources","length","forEach","source","parse"],"sources":["cli/logging/logs-list.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport { printMessage, verboseMessage } from '../../utils/Console';\n\nconst { provisionCreds, getLogSources } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new FrodoCommand('frodo logs 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()) {\n          const creds = await provisionCreds();\n          state.setLogApiKey(creds.api_key_id);\n          state.setLogApiSecret(creds.api_key_secret);\n        }\n      }\n\n      const sources = await getLogSources();\n      if (sources.length === 0) {\n        printMessage(\n          \"Can't get sources, possible cause - wrong API key or secret\",\n          'error'\n        );\n      } else {\n        if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n        printMessage(`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":"AAAA,SAASA,YAAY,QAAQ,iBAAiB;AAC9C,SACEC,YAAY,EACZC,iBAAiB,EACjBC,GAAG,EACHC,KAAK,QACA,uBAAuB;AAC9B,SAASC,YAAY,EAAEC,cAAc,QAAQ,qBAAqB;AAElE,MAAM;EAAEC,cAAc;EAAEC;AAAc,CAAC,GAAGL,GAAG;AAC7C,MAAM;EAAEM,oBAAoB;EAAEC;AAAsB,CAAC,GAAGR,iBAAiB;AACzE,MAAM;EAAES;AAAU,CAAC,GAAGV,YAAY;AAElC,MAAMW,OAAO,GAAG,IAAIZ,YAAY,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACtEY,OAAO,CACJC,WAAW,CAAC,sCAAsC,CAAC,CACnDC,MAAM,CAAC,OAAOC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACxDA,OAAO,CAACC,wBAAwB,CAACL,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,CAAC;EACxE,IAAIE,mBAAmB,GAAG,IAAI;EAC9Bf,cAAc,CAAC,2CAA2C,CAAC;EAC3D,MAAMgB,IAAI,GAAG,MAAMb,oBAAoB,EAAE;EACzC,IAAIa,IAAI,EAAE;IACRlB,KAAK,CAACmB,OAAO,CAACD,IAAI,CAACE,MAAM,CAAC;IAC1B,IAAIF,IAAI,CAACG,SAAS,IAAI,IAAI,IAAIH,IAAI,CAACI,YAAY,IAAI,IAAI,EAAE;MACvDL,mBAAmB,GAAG,KAAK;MAC3BjB,KAAK,CAACuB,YAAY,CAACL,IAAI,CAACG,SAAS,CAAC;MAClCrB,KAAK,CAACwB,eAAe,CAACN,IAAI,CAACI,YAAY,CAAC;IAC1C,CAAC,MAAM;MACL,IAAIJ,IAAI,CAACO,QAAQ,IAAI,IAAI,IAAIP,IAAI,CAACL,QAAQ,IAAI,IAAI,EAAE;QAClD,IAAI,CAACb,KAAK,CAAC0B,WAAW,EAAE,IAAI,CAAC1B,KAAK,CAAC2B,WAAW,EAAE,EAAE;UAChDV,mBAAmB,GAAG,KAAK;UAC3BhB,YAAY,CACV,qFAAqF,EACrF,MAAM,CACP;UACD;QACF;MACF,CAAC,MAAM;QACLD,KAAK,CAAC4B,WAAW,CAACV,IAAI,CAACO,QAAQ,CAAC;QAChCzB,KAAK,CAAC6B,WAAW,CAACX,IAAI,CAACL,QAAQ,CAAC;MAClC;MACA,IAAI,MAAMN,SAAS,EAAE,EAAE;QACrB,MAAMuB,KAAK,GAAG,MAAM3B,cAAc,EAAE;QACpCH,KAAK,CAACuB,YAAY,CAACO,KAAK,CAACC,UAAU,CAAC;QACpC/B,KAAK,CAACwB,eAAe,CAACM,KAAK,CAACE,cAAc,CAAC;MAC7C;IACF;IAEA,MAAMC,OAAO,GAAG,MAAM7B,aAAa,EAAE;IACrC,IAAI6B,OAAO,CAACC,MAAM,KAAK,CAAC,EAAE;MACxBjC,YAAY,CACV,6DAA6D,EAC7D,OAAO,CACR;IACH,CAAC,MAAM;MACL,IAAIgB,mBAAmB,EAAE,MAAMX,qBAAqB,CAACK,IAAI,CAAC,CAAC,CAAC;MAC5DV,YAAY,CAAE,oBAAmBiB,IAAI,CAACE,MAAO,EAAC,CAAC;MAC/Ca,OAAO,CAACE,OAAO,CAAEC,MAAM,IAAK;QAC1BnC,YAAY,CAAE,GAAEmC,MAAO,EAAC,EAAE,MAAM,CAAC;MACnC,CAAC,CAAC;MACFnC,YAAY,CACV,0DAA0D,EAC1D,MAAM,CACP;MACDA,YAAY,CAAE,yCAAwCU,IAAK,EAAC,EAAE,MAAM,CAAC;IACvE;EACF;AACF,CAAC,CAAC;AAEJH,OAAO,CAAC6B,KAAK,EAAE"}

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

@@ -25,31 +25,33 @@ Following values are possible (values on the same line are equivalent): \
   command.handleDefaultArgsAndOpts(host, user, password, options, command);
   let credsFromParameters = true;
   const conn = await getConnectionProfile();
-  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;
-      }
+  if (conn) {
+    state.setHost(conn.tenant);
+    if (conn.logApiKey != null && conn.logApiSecret != null) {
+      credsFromParameters = false;
+      state.setLogApiKey(conn.logApiKey);
+      state.setLogApiSecret(conn.logApiSecret);
     } else {
-      state.setUsername(conn.username);
-      state.setPassword(conn.password);
-    }
-    if (await getTokens()) {
-      const creds = await provisionCreds();
-      state.setLogApiKey(creds.api_key_id);
-      state.setLogApiSecret(creds.api_key_secret);
+      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()) {
+        const creds = await provisionCreds();
+        state.setLogApiKey(creds.api_key_id);
+        state.setLogApiSecret(creds.api_key_secret);
+      }
     }
+    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
+    await tailLogs(command.opts().sources, resolveLevel(command.opts().level), command.opts().transactionId, null, config.getNoiseFilters(options.defaults));
   }
-  printMessage(`Tailing ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}]...`);
-  if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI
-  await tailLogs(command.opts().sources, resolveLevel(command.opts().level), command.opts().transactionId, null, config.getNoiseFilters(options.defaults));
 });
 program.parse();
 //# sourceMappingURL=logs-tail.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"logs-tail.js","names":["FrodoCommand","sourcesOptionM","Option","Authenticate","ConnectionProfile","Log","state","config","printMessage","provisionCreds","tailLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","conn","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":["cli/logging/logs-tail.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './logs';\nimport { Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, tailLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new FrodoCommand('frodo logs 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    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()) {\n        const creds = await provisionCreds();\n        state.setLogApiKey(creds.api_key_id);\n        state.setLogApiSecret(creds.api_key_secret);\n      }\n    }\n    printMessage(\n      `Tailing ID Cloud logs from the following sources: ${\n        command.opts().sources\n      } and levels [${resolveLevel(command.opts().level)}]...`\n    );\n    if (credsFromParameters) await saveConnectionProfile(host); // save new values if they were specified on CLI\n    await tailLogs(\n      command.opts().sources,\n      resolveLevel(command.opts().level),\n      command.opts().transactionId,\n      null,\n      config.getNoiseFilters(options.defaults)\n    );\n  });\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"logs-tail.js","names":["FrodoCommand","sourcesOptionM","Option","Authenticate","ConnectionProfile","Log","state","config","printMessage","provisionCreds","tailLogs","resolveLevel","getConnectionProfile","saveConnectionProfile","getTokens","program","description","addOption","default","FRODO_LOG_NOISEFILTER_FILENAME","action","host","user","password","options","command","handleDefaultArgsAndOpts","credsFromParameters","conn","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":["cli/logging/logs-tail.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { sourcesOptionM } from './logs';\nimport { Option } from 'commander';\nimport {\n  Authenticate,\n  ConnectionProfile,\n  Log,\n  state,\n} from '@rockcarver/frodo-lib';\nimport * as config from '../../utils/Config';\nimport { printMessage } from '../../utils/Console';\n\nconst { provisionCreds, tailLogs, resolveLevel } = Log;\nconst { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;\nconst { getTokens } = Authenticate;\n\nconst program = new FrodoCommand('frodo logs 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()) {\n          const creds = await provisionCreds();\n          state.setLogApiKey(creds.api_key_id);\n          state.setLogApiSecret(creds.api_key_secret);\n        }\n      }\n      printMessage(\n        `Tailing ID Cloud logs from the following sources: ${\n          command.opts().sources\n        } and levels [${resolveLevel(command.opts().level)}] 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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rockcarver/frodo-cli",
-  "version": "0.20.1-0",
+  "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.0",
+    "@rockcarver/frodo-lib": "0.18.1",
     "cli-progress": "^3.11.2",
     "cli-table3": "^0.6.3",
     "colors": "^1.4.0",