@rockcarver/frodo-cli 0.10.4 → 0.11.1-2

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.1-2] - 2022-08-21
+
+## [0.11.1-1] - 2022-08-21
+
+## [0.11.1-0] - 2022-08-19
+
 ## [0.10.4] - 2022-08-13
 
 ### Added
@@ -402,7 +408,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/compare/v0.10.4...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v0.11.1-2...HEAD
+
+[0.11.1-2]: https://github.com/rockcarver/frodo-cli/compare/v0.11.1-1...v0.11.1-2
+
+[0.11.1-1]: https://github.com/rockcarver/frodo-cli/compare/v0.11.1-0...v0.11.1-1
+
+[0.11.1-0]: https://github.com/rockcarver/frodo-cli/compare/v0.10.4...v0.11.1-0
 
 [0.10.4]: https://github.com/rockcarver/frodo/compare/v0.10.3...v0.10.4
 

package/README.md

@@ -1,8 +1,8 @@
 <!-- README.md for NPM; the one for GitHub is .github/README.md. -->
-# Frodo - ForgeROck DO
+# Frodo Command Line Interface
 
-This is the ForgeROck DO - or short frodo - command line interface, a CLI to manage ForgeRock platform deployments. Frodo supports Identity Cloud tenants, ForgeOps deployments, and classic deployments.
+ForgeROck DO Command Line Interface, frodo-cli, a CLI to manage ForgeRock platform deployments supporting Identity Cloud tenants, ForgeOps deployments, and classic deployments.
 
 Frodo is the successor to field tools like [amtree.sh](https://github.com/vscheuber/AM-treetool), [fidc-debug-tools](https://github.com/vscheuber/fidc-debug-tools), and ForgeRock-internal utilities.
 
-Please refer to the [GitHub README](https://github.com/rockcarver/frodo#readme) for full documentation.
+Please refer to the [GitHub README](https://github.com/rockcarver/frodo-cli#readme) for full documentation.

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@rockcarver/frodo-cli",
-  "version": "0.10.4",
+  "version": "0.11.1-2",
   "type": "module",
-  "description": "This is the ForgeROck DO (FRODO) command line interface, a CLI to manage the ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
+  "description": "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   "keywords": [
     "forgerock",
     "cli",
     "am",
+    "openam",
     "idm",
+    "openidm",
     "forgeops",
     "identity cloud",
     "export",
@@ -20,20 +22,19 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/rockcarver/frodo.git"
+    "url": "https://github.com/rockcarver/frodo-cli.git"
   },
   "bugs": {
-    "url": "https://github.com/rockcarver/frodo/issues"
+    "url": "https://github.com/rockcarver/frodo-cli/issues"
   },
   "main": "src/app.js",
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "test:list": "node --experimental-vm-modules node_modules/jest/bin/jest.js --listTests",
     "test:e2e": "node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand e2e",
-    "test:e2e:list": "node --experimental-vm-modules node_modules/jest/bin/jest.js --listTests e2e"
-  },
-  "jest": {
-    "globalSetup": "<rootDir>/test/global/setup.js"
+    "test:e2e:list": "node --experimental-vm-modules node_modules/jest/bin/jest.js --listTests e2e",
+    "lint": "npx eslint --ext .js --ignore-path .gitignore .",
+    "build": "npx gulp"
   },
   "contributors": [
     {
@@ -68,19 +69,18 @@
   },
   "pkg": {
     "options": [
-      "experimental-json-modules",
+      "experimental-specifier-resolution=node",
       "enable-source-maps",
       "no-warnings"
     ],
-    "scripts": [
-      "src/api/**/*.js",
-      "src/cli/**/*.js",
-      "src/ops/**/*.js",
-      "src/storage/**/*.js"
+    "assets": [
+      "node_modules/@rockcarver/frodo-lib/cjs/ops/templates/*.json",
+      "node_modules/@rockcarver/frodo-lib/cjs/ops/templates/**/*.json"
     ]
   },
   "dependencies": {
     "@colors/colors": "^1.5.0",
+    "@rockcarver/frodo-lib": "^0.11.1-7",
     "axios": "^0.27.2",
     "axios-retry": "^3.3.1",
     "cli-progress": "^3.11.2",
@@ -116,9 +116,11 @@
     "eslint-plugin-react-hooks": "^4.3.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
+    "gulp-install": "^1.1.0",
     "gulp-sourcemaps": "^3.0.0",
     "jest": "^28.1.3",
     "map-stream": "^0.0.7",
-    "pkg": "^5.8.0"
+    "pkg": "^5.8.0",
+    "prettier": "^2.7.1"
   }
 }

package/src/app.js

@@ -1,10 +1,9 @@
-#!/usr/bin/env -S node --no-warnings --enable-source-maps
+#!/usr/bin/env -S node --no-warnings --enable-source-maps --experimental-specifier-resolution=node
 
+import { getVersion, ConnectionProfile } from '@rockcarver/frodo-lib';
 import fs from 'fs';
 import { Command } from 'commander';
-import { initConnectionProfiles } from './ops/ConnectionProfileOps.js';
 // import pkg from '../package.json' assert { type: 'json' };
-import { printMessage } from './ops/utils/Console.js';
 
 // commands
 import admin from './cli/admin/admin.js';
@@ -26,8 +25,10 @@ const pkg = JSON.parse(
   fs.readFileSync(new URL('../package.json', import.meta.url))
 );
 
-const program = new Command(pkg.name).version(
-  `v${pkg.version} [${process.version}]`,
+const { initConnectionProfiles } = ConnectionProfile;
+
+const program = new Command('frodo').version(
+  `cli: v${pkg.version}\nlib: ${getVersion()}\nnode: ${process.version}`,
   '-v, --version'
 );
 
@@ -54,6 +55,6 @@ const program = new Command(pkg.name).version(
     program.enablePositionalOptions();
     program.parse();
   } catch (e) {
-    printMessage(`ERROR: exception running frodo - ${e}`, 'error');
+    console.log(`ERROR: exception running frodo - ${e}`, 'error');
   }
 })();

package/src/cli/_template/cmd-delete.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd delete');
 
@@ -39,12 +40,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-describe.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd describe');
 
@@ -19,12 +20,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-export.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd export');
 
@@ -37,12 +38,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-import.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd import');
 
@@ -37,12 +38,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-list.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd list');
 
@@ -21,12 +22,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub1-delete.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub1 delete');
 
@@ -39,12 +40,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub1-describe.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub1 describe');
 
@@ -19,12 +20,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub1-export.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub1 export');
 
@@ -37,12 +38,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub1-import.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub1 import');
 
@@ -37,12 +38,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub1-list.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub1 list');
 
@@ -21,12 +22,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub2-delete.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub2 delete');
 
@@ -39,12 +40,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub2-describe.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub2 describe');
 
@@ -19,12 +20,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub2-export.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub2 export');
 
@@ -37,12 +38,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub2-import.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub2 import');
 
@@ -37,12 +38,12 @@ 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()) {
         // code goes here
       }

package/src/cli/_template/cmd-sub2-list.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd sub2 list');
 
@@ -21,12 +22,12 @@ 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()) {
         // code goes here
       }