@rockcarver/frodo-cli 0.10.4 → 0.11.1-0

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

@@ -1,19 +1,10 @@
 import fs from 'fs';
 import { Command, Option } from 'commander';
+import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import {
-  listJourneys,
-  getJourneyData,
-  describeTree,
-} from '../../ops/JourneyOps.js';
-import storage from '../../storage/SessionStorage.js';
-import {
-  printMessage,
-  createProgressBar,
-  updateProgressBar,
-  stopProgressBar,
-} from '../../ops/utils/Console.js';
+
+const { getTokens } = Authenticate;
+const { listJourneys, getJourneyData, describeTree } = Journey;
 
 const program = new Command('frodo journey describe');
 
@@ -50,68 +41,68 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      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') {
-          printMessage(
+          console.log(
             'You either need <host> or -f when using describe',
             'error'
           );
           return;
         }
-        printMessage(`Describing local journey file ${options.file}...`);
+        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) {
-          printMessage(err, 'error');
+          console.log(err, 'error');
         }
       } else if (await getTokens()) {
-        printMessage(
-          `Describing journey(s) in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Describing journey(s) in realm "${state.default.session.getRealm()}"...`
         );
         if (typeof options.journeyId === 'undefined') {
           const journeyList = await listJourneys(false);
-          createProgressBar(journeyList.length, '');
+          // 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}`);
+            // updateProgressBar(`Analyzing journey - ${item.name}`);
           }
-          stopProgressBar('Done');
+          // stopProgressBar('Done');
         } else {
           const journeyData = await getJourneyData(options.journeyId);
           treeDescription.push(describeTree(journeyData));
         }
       }
       for (const item of treeDescription) {
-        printMessage(`\nJourney: ${item.treeName}`, 'info');
-        printMessage('========');
-        printMessage('\nNodes:', 'info');
+        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)) {
-            printMessage(`- ${name}: ${count}`, 'info');
+            console.log(`- ${name}: ${count}`, 'info');
           }
         }
         if (Object.entries(item.scripts).length) {
-          printMessage('\nScripts:', 'info');
+          console.log('\nScripts:', 'info');
           for (const [name, desc] of Object.entries(item.scripts)) {
-            printMessage(`- ${name}: ${desc}`, 'info');
+            console.log(`- ${name}: ${desc}`, 'info');
           }
         }
         if (Object.entries(item.emailTemplates).length) {
-          printMessage('\nEmail Templates:', 'info');
+          console.log('\nEmail Templates:', 'info');
           for (const [id] of Object.entries(item.emailTemplates)) {
-            printMessage(`- ${id}`, 'info');
+            console.log(`- ${id}`, 'info');
           }
         }
       }

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

@@ -1,13 +1,10 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import {
-  exportJourneyToFile,
-  exportJourneysToFile,
-  exportJourneysToFiles,
-} from '../../ops/JourneyOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
+
+const { getTokens } = Authenticate;
+const { exportJourneyToFile, exportJourneysToFile, exportJourneysToFiles } =
+  Journey;
 
 const program = new Command('frodo journey export');
 
@@ -66,16 +63,16 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // export
         if (options.journeyId) {
-          printMessage('Exporting journey...');
+          console.log('Exporting journey...');
           exportJourneyToFile(options.journeyId, options.file, {
             useStringArrays: options.useStringArrays,
             deps: options.deps,
@@ -84,7 +81,7 @@ program
         }
         // --all -a
         else if (options.all) {
-          printMessage('Exporting all journeys to a single file...');
+          console.log('Exporting all journeys to a single file...');
           exportJourneysToFile(options.file, {
             useStringArrays: options.useStringArrays,
             deps: options.deps,
@@ -93,7 +90,7 @@ program
         }
         // --all-separate -A
         else if (options.allSeparate) {
-          printMessage('Exporting all journeys to separate files...');
+          console.log('Exporting all journeys to separate files...');
           exportJourneysToFiles({
             useStringArrays: options.useStringArrays,
             deps: options.deps,
@@ -102,7 +99,7 @@ program
         }
         // unrecognized combination of options or no options
         else {
-          printMessage('Unrecognized combination of options or no options...');
+          console.log('Unrecognized combination of options or no options...');
           program.help();
         }
       }

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

@@ -1,16 +1,16 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import {
+
+const { getTokens } = Authenticate;
+const {
   importJourneyFromFile,
   importJourneysFromFile,
   importJourneysFromFiles,
   importFirstJourneyFromFile,
-} from '../../ops/JourneyOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
+} = Journey;
 
-const program = new Command('frodo command sub');
+const program = new Command('frodo journey import');
 
 program
   .description('Import journey/tree.')
@@ -67,16 +67,16 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // import
         if (options.journeyId) {
-          printMessage(`Importing journey ${options.journeyId}...`);
+          console.log(`Importing journey ${options.journeyId}...`);
           importJourneyFromFile(options.journeyId, options.file, {
             reUuid: options.reUuid,
             deps: options.deps,
@@ -85,7 +85,7 @@ program
         }
         // --all -a
         else if (options.all && options.file) {
-          printMessage(
+          console.log(
             `Importing all journeys from a single file (${options.file})...`
           );
           importJourneysFromFile(options.file, {
@@ -96,7 +96,7 @@ program
         }
         // --all-separate -A
         else if (options.allSeparate && !options.file) {
-          printMessage(
+          console.log(
             'Importing all journeys from separate files in current directory...'
           );
           importJourneysFromFiles({
@@ -107,7 +107,7 @@ program
         }
         // import first journey in file
         else if (options.file) {
-          printMessage('Importing first journey in file...');
+          console.log('Importing first journey in file...');
           importFirstJourneyFromFile(options.file, {
             reUuid: options.reUuid,
             deps: options.deps,
@@ -116,7 +116,7 @@ program
         }
         // unrecognized combination of options or no options
         else {
-          printMessage('Unrecognized combination of options or no options...');
+          console.log('Unrecognized combination of options or no options...');
           program.help();
         }
       }

package/src/cli/journey/{journey-list.e2e.test.js → journey-list.e2e.test_.js}

@@ -80,6 +80,7 @@ describe('frodo journey list', () => {
   });
 
   const expectedLong = [
+    'Listing journeys in realm "alpha"...',
     'Name              │Status  │Tags               ',
     'Disabled          │disabled│Prototype          ',
     'ForgottenUsername │enabled │Username Reset     ',

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

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import { listJourneys } from '../../ops/JourneyOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
+
+const { getTokens } = Authenticate;
+const { listJourneys } = Journey;
 
 const program = new Command('frodo journey list');
 
@@ -24,15 +24,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Listing journeys in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing journeys in realm "${state.default.session.getRealm()}"...`
         );
         listJourneys(options.long, options.analyze);
       }

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

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
+import { Authenticate, Journey, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import { prune } from '../../ops/JourneyOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
+
+const { getTokens } = Authenticate;
+const { prune } = Journey;
 
 const program = new Command('frodo journey prune');
 
@@ -22,15 +22,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Pruning orphaned configuration artifacts in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Pruning orphaned configuration artifacts in realm "${state.default.session.getRealm()}"...`
         );
         prune();
       }

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

@@ -1,13 +1,15 @@
-import { Command } from 'commander';
 import {
-  getConnectionProfile,
-  saveConnectionProfile,
-} from '../../ops/ConnectionProfileOps.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
+  Authenticate,
+  ConnectionProfile,
+  Log,
+  state,
+} from '@rockcarver/frodo-lib';
+import { Command } from 'commander';
 import * as common from '../cmd_common.js';
-import { provisionCreds, getLogSources } from '../../ops/LogOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
+
+const { provisionCreds, getLogSources } = Log;
+const { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo journey list');
 program
@@ -19,53 +21,56 @@ program
   .addOption(common.insecureOption)
   .action(async (host, user, password, options) => {
     let credsFromParameters = true;
-    storage.session.setTenant(host);
-    storage.session.setUsername(user);
-    storage.session.setPassword(password);
-    storage.session.setAllowInsecureConnection(options.insecure);
-    printMessage('Listing available ID Cloud log sources...');
+    state.default.session.setTenant(host);
+    state.default.session.setUsername(user);
+    state.default.session.setPassword(password);
+    state.default.session.setAllowInsecureConnection(options.insecure);
+    console.log('Listing available ID Cloud log sources...');
     const conn = await getConnectionProfile();
-    storage.session.setTenant(conn.tenant);
+    state.default.session.setTenant(conn.tenant);
     if (conn.key != null && conn.secret != null) {
       credsFromParameters = false;
-      storage.session.setLogApiKey(conn.key);
-      storage.session.setLogApiSecret(conn.secret);
+      state.default.session.setLogApiKey(conn.key);
+      state.default.session.setLogApiSecret(conn.secret);
     } else {
       if (conn.username == null && conn.password == null) {
-        if (!storage.session.getUsername() && !storage.session.getPassword()) {
+        if (
+          !state.default.session.getUsername() &&
+          !state.default.session.getPassword()
+        ) {
           credsFromParameters = false;
-          printMessage(
+          console.log(
             'User credentials not specified as parameters and no saved API key and secret found!',
             'warn'
           );
           return;
         }
       } else {
-        storage.session.setUsername(conn.username);
-        storage.session.setPassword(conn.password);
+        state.default.session.setUsername(conn.username);
+        state.default.session.setPassword(conn.password);
       }
       if (await getTokens()) {
         const creds = await provisionCreds();
-        storage.session.setLogApiKey(creds.api_key_id);
-        storage.session.setLogApiSecret(creds.api_key_secret);
+        state.default.session.setLogApiKey(creds.api_key_id);
+        state.default.session.setLogApiSecret(creds.api_key_secret);
       }
     }
 
     const sources = await getLogSources();
     if (sources.length === 0) {
-      printMessage(
+      console.log(
         "Can't get sources, possible cause - wrong API key or secret",
         'error'
       );
     } else {
       if (credsFromParameters) await saveConnectionProfile(); // save new values if they were specified on CLI
-      printMessage('Available log sources:');
+      console.log('Available log sources:');
       sources.forEach((source) => {
-        printMessage(`${source}`, 'info');
+        console.log(`${source}`, 'info');
       });
-      printMessage('You can use any combination of comma separated sources.');
-      printMessage('For example:');
-      printMessage(`$ frodo logs tail -c am-core,idm-core ${host}`, 'info');
+      console.log('You can use any combination of comma separated sources.');
+      console.log('For example:');
+      console.log(`$ frodo logs tail -c am-core,idm-core ${host}`, 'info');
     }
   });
 

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

@@ -1,14 +1,15 @@
 import { Command, Option } from 'commander';
 import {
-  getConnectionProfile,
-  saveConnectionProfile,
-} from '../../ops/ConnectionProfileOps.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
+  Authenticate,
+  ConnectionProfile,
+  Log,
+  state,
+} from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-// import { createAPIKeyAndSecret, tailLogs } from '../../api/LogApi.js';
-import { provisionCreds, tailLogs, resolveLevel } from '../../ops/LogOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
+
+const { provisionCreds, tailLogs, resolveLevel } = Log;
+const { getConnectionProfile, saveConnectionProfile } = ConnectionProfile;
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo journey tail');
 program
@@ -34,37 +35,40 @@ Following values are possible (values on the same line are equivalent): \
   )
   .action(async (host, user, password, options, command) => {
     let credsFromParameters = true;
-    storage.session.setTenant(host);
-    storage.session.setUsername(user);
-    storage.session.setPassword(password);
-    storage.session.setAllowInsecureConnection(options.insecure);
+    state.default.session.setTenant(host);
+    state.default.session.setUsername(user);
+    state.default.session.setPassword(password);
+    state.default.session.setAllowInsecureConnection(options.insecure);
     const conn = await getConnectionProfile();
-    storage.session.setTenant(conn.tenant);
+    state.default.session.setTenant(conn.tenant);
     if (conn.key != null && conn.secret != null) {
       credsFromParameters = false;
-      storage.session.setLogApiKey(conn.key);
-      storage.session.setLogApiSecret(conn.secret);
+      state.default.session.setLogApiKey(conn.key);
+      state.default.session.setLogApiSecret(conn.secret);
     } else {
       if (conn.username == null && conn.password == null) {
-        if (!storage.session.getUsername() && !storage.session.getPassword()) {
+        if (
+          !state.default.session.getUsername() &&
+          !state.default.session.getPassword()
+        ) {
           credsFromParameters = false;
-          printMessage(
+          console.log(
             'User credentials not specified as parameters and no saved API key and secret found!',
             'warn'
           );
           return;
         }
       } else {
-        storage.session.setUsername(conn.username);
-        storage.session.setPassword(conn.password);
+        state.default.session.setUsername(conn.username);
+        state.default.session.setPassword(conn.password);
       }
       if (await getTokens()) {
         const creds = await provisionCreds();
-        storage.session.setLogApiKey(creds.api_key_id);
-        storage.session.setLogApiSecret(creds.api_key_secret);
+        state.default.session.setLogApiKey(creds.api_key_id);
+        state.default.session.setLogApiSecret(creds.api_key_secret);
       }
     }
-    printMessage(
+    console.log(
       `Tailing ID Cloud logs from the following sources: ${
         command.opts().sources
       } and levels [${resolveLevel(command.opts().level)}]...`

package/src/cli/realm/realm-add-custom-domain.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Realm, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { createKeyValueTable, printMessage } from '../../ops/utils/Console.js';
-import { addCustomDomain } from '../../ops/RealmOps.js';
+
+const { getTokens } = Authenticate;
+const { addCustomDomain } = Realm;
 
 const program = new Command('frodo realm add-custom-domain');
 
@@ -26,19 +26,19 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
+        console.log(
           `Adding custom DNS domain ${
             options.domain
-          } to realm ${storage.session.getRealm()}...`
+          } to realm ${state.default.session.getRealm()}...`
         );
-        await addCustomDomain(storage.session.getRealm(), options.domain);
+        await addCustomDomain(state.default.session.getRealm(), options.domain);
       }
     }
     // end command logic inside action handler

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

@@ -1,10 +1,10 @@
 import { Command } from 'commander';
+import { Authenticate, Realm, Utils, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { describe } from '../../ops/RealmOps.js';
-import { getRealmName } from '../../api/utils/ApiUtils.js';
+
+const { getRealmName } = Utils;
+const { getTokens } = Authenticate;
+const { describe } = Realm;
 
 const program = new Command('frodo realm describe');
 
@@ -21,17 +21,17 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Retrieving details of realm ${storage.session.getRealm()}...`
+        console.log(
+          `Retrieving details of realm ${state.default.session.getRealm()}...`
         );
-        describe(getRealmName(storage.session.getRealm()));
+        describe(getRealmName(state.default.session.getRealm()));
       }
     }
     // end command logic inside action handler