Merge pull request #422 from rockcarver/pr/421

Pr/421

.gitignore

@@ -125,6 +125,9 @@ out
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
 
+# Stores JetBrain IDE's configuration
+.idea
+
 # yarn v2
 .yarn/cache
 .yarn/unplugged
@@ -133,4 +136,4 @@ out
 .pnp.*
 
 test/fs_tmp/*
-!test/fs_tmp/.gitkeep
+!test/fs_tmp/.gitkeep

package.json

@@ -114,7 +114,7 @@
     ]
   },
   "devDependencies": {
-    "@rockcarver/frodo-lib": "2.0.0-95",
+    "@rockcarver/frodo-lib": "2.0.0-96",
     "@types/colors": "^1.2.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.2.3",

src/cli/FrodoCommand.ts

@@ -243,7 +243,7 @@ export class FrodoCommand extends FrodoStubCommand {
     // additional help
     this.addHelpText(
       'after',
-      `\nEvironment Variables:\n` +
+      `\nEnvironment Variables:\n` +
         `  FRODO_HOST: Access Management base URL. Overrides 'host' argument.\n` +
         `  FRODO_REALM: Realm. Overrides 'realm' argument.\n` +
         `  FRODO_USERNAME: Username. Overrides 'username' argument.\n` +
@@ -322,7 +322,7 @@ export class FrodoCommand extends FrodoStubCommand {
     // fail fast if an incompatible deployment type option (-m or --type) was provided
     if (
       state.getDeploymentType() &&
-      !(state.getDeploymentType() in this.types)
+      !this.types.includes(state.getDeploymentType())
     ) {
       throw new FrodoError(
         `Command does not support deployment type '${state.getDeploymentType()}'`

src/cli/agent/agent-import.ts

@@ -25,13 +25,13 @@ export default function setup() {
     .addOption(
       new Option(
         '-a, --all',
-        'Import all cmds from single file. Ignored with -i.'
+        'Import all agents from single file. Ignored with -i.'
       )
     )
     .addOption(
       new Option(
         '-A, --all-separate',
-        'Import all cmds from separate files (*.cmd.json) in the current directory. Ignored with -i or -a.'
+        'Import all agents from separate files (*.agent.json) in the current directory. Ignored with -i or -a.'
       )
     )
     .action(
@@ -69,7 +69,7 @@ export default function setup() {
             const outcome = await importAgentsFromFiles();
             if (!outcome) process.exitCode = 1;
           }
-          // import first journey in file
+          // import first agent in file
           else if (options.file) {
             verboseMessage('Importing first agent in file...');
             const outcome = await importFirstAgentFromFile(options.file);

src/cli/authz/authz.ts

@@ -5,7 +5,7 @@ import TypeCmd from './authz-type.js';
 
 export default function setup() {
   const program = new FrodoStubCommand('authz').description(
-    'Manage authotiztion policies, policy sets, and resource types.'
+    'Manage authorization policies, policy sets, and resource types.'
   );
 
   program.addCommand(SetCmd().name('set'));

src/cli/config/config-import.ts

@@ -31,15 +31,6 @@ export default function setup() {
     .addOption(
       new Option('-C, --clean', 'Remove existing service(s) before importing.')
     )
-    .addOption(
-      new Option('-g, --global', 'Import service(s) as global service(s).')
-    )
-    .addOption(
-      new Option(
-        '-r, --current-realm',
-        'Import service(s) into the current realm.'
-      )
-    )
     .addOption(
       new Option(
         '--re-uuid-journeys',
@@ -116,8 +107,6 @@ export default function setup() {
             reUuidJourneys: options.reUuidJourneys,
             reUuidScripts: options.reUuidScripts,
             cleanServices: options.clean,
-            global: options.global,
-            realm: options.realm,
             includeDefault: options.default,
             includeActiveValues: options.includeActiveValues,
             source: options.source,
@@ -140,8 +129,6 @@ export default function setup() {
             reUuidJourneys: options.reUuidJourneys,
             reUuidScripts: options.reUuidScripts,
             cleanServices: options.clean,
-            global: options.global,
-            realm: options.realm,
             includeDefault: options.default,
             includeActiveValues: options.includeActiveValues,
             source: options.source,

src/cli/esv/esv-variable-delete.ts

@@ -12,7 +12,7 @@ const deploymentTypes = ['cloud'];
 
 export default function setup() {
   const program = new FrodoCommand(
-    'frodo cmd sub2 delete',
+    'frodo esv variable delete',
     ['realm'],
     deploymentTypes
   );

src/ops/AgentOps.ts

@@ -51,6 +51,7 @@ const agentTypeToFileIdMap = {
 
 /**
  * List agents
+ * @param {boolean} [long=false] detailed list
  * @returns {Promise<boolean>} true if successful, false otherwise
  */
 export async function listAgents(long: boolean = false): Promise<boolean> {
@@ -1306,7 +1307,6 @@ export async function deleteWebAgent(agentId: string): Promise<boolean> {
 
 /**
  * Delete agents
- * @param {string} agentId agent id/name
  * @returns {Promise<boolean>} true if successful, false otherwise
  */
 export async function deleteAgents(): Promise<boolean> {
@@ -1321,7 +1321,6 @@ export async function deleteAgents(): Promise<boolean> {
 
 /**
  * Delete identity gateway agents
- * @param {string} agentId agent id/name
  * @returns {Promise<boolean>} true if successful, false otherwise
  */
 export async function deleteIdentityGatewayAgents(): Promise<boolean> {
@@ -1336,7 +1335,6 @@ export async function deleteIdentityGatewayAgents(): Promise<boolean> {
 
 /**
  * Delete java agents
- * @param {string} agentId agent id/name
  * @returns {Promise<boolean>} true if successful, false otherwise
  */
 export async function deleteJavaAgents(): Promise<boolean> {
@@ -1351,7 +1349,6 @@ export async function deleteJavaAgents(): Promise<boolean> {
 
 /**
  * Delete web agents
- * @param {string} agentId agent id/name
  * @returns {Promise<boolean>} true if successful, false otherwise
  */
 export async function deleteWebAgents(): Promise<boolean> {