@rockcarver/frodo-cli 0.12.3-1 → 0.12.4-1

package/CHANGELOG.md

@@ -7,9 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.12.3-1] - 2022-09-01
+## [0.12.4-1] - 2022-09-08
 
-## [0.12.3-0] - 2022-09-01
+## [0.12.4-0] - 2022-09-02
+
+## [0.12.3] - 2022-09-01
+
+### Fixed
+
+-   \#24 - `frodo conn list` now showing the expected output
+-   \#25 - `npm run build` now running properly
 
 ## [0.12.2] - 2022-08-27
 
@@ -21,12 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   \#16: 2nd-level commands in binary builds are working properly again (they were broken in all 0.11.x and 0.12.x builds)
 
-## [0.12.2-2] - 2022-08-27 [YANKED]
-
-## [0.12.2-1] - 2022-08-27 [YANKED]
-
-## [0.12.2-0] - 2022-08-27 [YANKED]
-
 ## [0.12.1] - 2022-08-27 [YANKED]
 
 ## [0.12.0] - 2022-08-27 [YANKED]
@@ -453,7 +454,13 @@ 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.12.3-1...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v0.12.4-1...HEAD
+
+[0.12.4-1]: https://github.com/rockcarver/frodo-cli/compare/v0.12.4-0...v0.12.4-1
+
+[0.12.4-0]: https://github.com/rockcarver/frodo-cli/compare/v0.12.3...v0.12.4-0
+
+[0.12.3]: https://github.com/rockcarver/frodo-cli/compare/v0.12.3-1...v0.12.3
 
 [0.12.3-1]: https://github.com/rockcarver/frodo-cli/compare/v0.12.3-0...v0.12.3-1
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rockcarver/frodo-cli",
-  "version": "0.12.3-1",
+  "version": "0.12.4-1",
   "type": "module",
   "description": "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   "keywords": [
@@ -85,12 +85,13 @@
   },
   "dependencies": {
     "@colors/colors": "^1.5.0",
-    "@rockcarver/frodo-lib": "~0.12.1",
+    "@rockcarver/frodo-lib": "0.12.2-1",
     "cli-progress": "^3.11.2",
     "cli-table3": "^0.6.2",
     "commander": "^9.4.0",
     "nanospinner": "^1.1.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "yesno": "^0.4.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.9",

package/src/cli/esv/esv-apply.js

@@ -1,9 +1,17 @@
 import { Command, Option } from 'commander';
-import { Authenticate, Startup, state } from '@rockcarver/frodo-lib';
+import {
+  Authenticate,
+  Startup,
+  ManagedObject,
+  state,
+} from '@rockcarver/frodo-lib';
+import yesno from 'yesno';
 import * as common from '../cmd_common.js';
+import { createTable, printMessage } from '../../utils/Console.js';
 
 const { getTokens } = Authenticate;
 const { applyUpdates, checkForUpdates } = Startup;
+const { resolveUserName } = ManagedObject;
 
 const program = new Command('frodo esv apply');
 
@@ -37,6 +45,12 @@ program
       'Verbose output during command execution. If specified, may or may not produce additional output.'
     ).default(false, 'off')
   )
+  .addOption(
+    new Option(
+      '--timeout <seconds>',
+      'Specify a timeout in seconds how long the tool should wait for the apply command to finish. Only effective without --no-wait.'
+    ).default(600, '600 secs (10 mins)')
+  )
   .addOption(new Option('-y, --yes', 'Answer y/yes to all prompts.'))
   .action(
     // implement command logic inside action handler
@@ -48,15 +62,55 @@ program
       state.default.session.setDeploymentType(options.type);
       state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        // check for updates only
-        if (options.checkOnly) {
-          console.log(`Checking for updates...`);
-          await checkForUpdates();
+        const updates = await checkForUpdates();
+        const updatesTable = createTable([
+          'Type',
+          'Name',
+          'Modified',
+          'Modifier',
+        ]);
+        for (const secret of updates.secrets) {
+          if (!secret.loaded) {
+            updatesTable.push([
+              'secret',
+              secret._id,
+              new Date(secret.lastChangeDate).toLocaleString(),
+              // eslint-disable-next-line no-await-in-loop
+              await resolveUserName('teammember', secret.lastChangedBy),
+            ]);
+          }
+        }
+        for (const variable of updates.variables) {
+          if (!variable.loaded) {
+            updatesTable.push([
+              'variable',
+              variable._id,
+              new Date(variable.lastChangeDate).toLocaleString(),
+              // eslint-disable-next-line no-await-in-loop
+              await resolveUserName('teammember', variable.lastChangedBy),
+            ]);
+          }
+        }
+        if (updatesTable.length > 0) {
+          printMessage(updatesTable.toString(), 'data');
         }
-        // apply updates
-        else {
-          console.log(`Applying updates...`);
-          await applyUpdates(options.force, options.wait, options.yes);
+        if (!options.checkOnly) {
+          if (
+            updates.secrets?.length ||
+            updates.variables?.length ||
+            options.force
+          ) {
+            const ok =
+              options.yes ||
+              (await yesno({
+                question: `\nChanges may take up to 10 minutes to propagate, during which time you will not be able to make further updates.\n\nApply updates? (y|n):`,
+              }));
+            if (ok) {
+              if (!(await applyUpdates(options.wait, options.timeout * 1000))) {
+                process.exitCode = 1;
+              }
+            }
+          }
         }
       }
     }

package/src/cli/journey/journey-describe.js

@@ -4,7 +4,7 @@ import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
 
 const { getTokens } = Authenticate;
-const { listJourneys, getJourneyData, describeTree } = Journey;
+const { getJourneys, exportTree, describeTree } = Journey;
 
 const program = new Command('frodo journey describe');
 
@@ -14,7 +14,7 @@ program
   )
   .helpOption('-h, --help', 'Help')
   .showHelpAfterError()
-  .addArgument(common.hostArgumentM)
+  .addArgument(common.hostArgument)
   .addArgument(common.realmArgument)
   .addArgument(common.userArgument)
   .addArgument(common.passwordArgument)
@@ -47,62 +47,49 @@ program
       state.default.session.setPassword(password);
       state.default.session.setDeploymentType(options.type);
       state.default.session.setAllowInsecureConnection(options.insecure);
-      const treeDescription = [];
       // TODO: review checks for arguments
       if (typeof host === 'undefined' || typeof options.file !== 'undefined') {
-        if (typeof options.file === 'undefined') {
-          console.log(
-            'You either need <host> or -f when using describe',
-            'error'
-          );
+        if (
+          typeof host === 'undefined' &&
+          typeof options.file === 'undefined'
+        ) {
+          console.log('Need either [host] or -f.');
+          process.exitCode = 1;
           return;
         }
         console.log(`Describing local journey file ${options.file}...`);
         try {
           const data = fs.readFileSync(options.file, 'utf8');
           const journeyData = JSON.parse(data);
-          treeDescription.push(describeTree(journeyData));
-        } catch (err) {
-          console.log(err, 'error');
+          describeTree(journeyData);
+        } catch (error) {
+          console.log(error.message);
+          process.exitCode = 1;
         }
       } else if (await getTokens()) {
         console.log(
           `Describing journey(s) in realm "${state.default.session.getRealm()}"...`
         );
         if (typeof options.journeyId === 'undefined') {
-          const journeyList = await listJourneys(false);
-          // createProgressBar(journeyList.length, '');
-          for (const item of journeyList) {
-            // eslint-disable-next-line no-await-in-loop
-            const journeyData = await getJourneyData(item.name);
-            treeDescription.push(describeTree(journeyData));
-            // updateProgressBar(`Analyzing journey - ${item.name}`);
+          let journeys = [];
+          journeys = await getJourneys();
+          for (const journey of journeys) {
+            try {
+              // eslint-disable-next-line no-await-in-loop
+              const treeData = await exportTree(journey._id);
+              describeTree(treeData);
+            } catch (error) {
+              console.log(error.message);
+              process.exitCode = 1;
+            }
           }
-          // stopProgressBar('Done');
         } else {
-          const journeyData = await getJourneyData(options.journeyId);
-          treeDescription.push(describeTree(journeyData));
-        }
-      }
-      for (const item of treeDescription) {
-        console.log(`\nJourney: ${item.treeName}`, 'info');
-        console.log('========');
-        console.log('\nNodes:', 'info');
-        if (Object.entries(item.nodeTypes).length) {
-          for (const [name, count] of Object.entries(item.nodeTypes)) {
-            console.log(`- ${name}: ${count}`, 'info');
-          }
-        }
-        if (Object.entries(item.scripts).length) {
-          console.log('\nScripts:', 'info');
-          for (const [name, desc] of Object.entries(item.scripts)) {
-            console.log(`- ${name}: ${desc}`, 'info');
-          }
-        }
-        if (Object.entries(item.emailTemplates).length) {
-          console.log('\nEmail Templates:', 'info');
-          for (const [id] of Object.entries(item.emailTemplates)) {
-            console.log(`- ${id}`, 'info');
+          try {
+            const treeData = await exportTree(options.journeyId);
+            describeTree(treeData);
+          } catch (error) {
+            console.log(error.message);
+            process.exitCode = 1;
           }
         }
       }

package/src/cli/journey/journey-prune.js

@@ -1,9 +1,10 @@
 import { Command } from 'commander';
 import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
+import yesno from 'yesno';
 import * as common from '../cmd_common.js';
 
 const { getTokens } = Authenticate;
-const { prune } = Journey;
+const { findOrphanedNodes, removeOrphanedNodes } = Journey;
 
 const program = new Command('frodo journey prune');
 
@@ -32,7 +33,17 @@ program
         console.log(
           `Pruning orphaned configuration artifacts in realm "${state.default.session.getRealm()}"...`
         );
-        prune();
+        const orphanedNodes = await findOrphanedNodes();
+        if (orphanedNodes.length > 0) {
+          const ok = await yesno({
+            question: 'Prune (permanently delete) orphaned nodes? (y|n):',
+          });
+          if (ok) {
+            await removeOrphanedNodes(orphanedNodes);
+          }
+        } else {
+          console.log('No orphaned nodes found.');
+        }
       }
     }
     // end command logic inside action handler