update other omitted flags

Signed-off-by: Emily Rodriguez <ecrodriguez@mm279976-pc.lan>
mitre · Mar 15, 2022 · d928bbc · d928bbc
1 parent 6ccf441
commit d928bbc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/commands/convert/aws_config2hdf.ts b/src/commands/convert/aws_config2hdf.ts
@@ -1,4 +1,4 @@
-import BaseCommand from '../../utils/base-command'
+import BaseCommand, {omitFlags} from '../../utils/base-command'
 import {OutputFlags} from '@oclif/parser'
 import {flags} from '@oclif/command'
 import fs from 'fs'
@@ -16,9 +16,7 @@ export default class AWSConfig2HDF extends BaseCommand {
   static examples = ['saf convert:aws_config2hdf -a ABCDEFGHIJKLMNOPQRSTUV -s +4NOT39A48REAL93SECRET934 -r us-east-1 -o output-hdf-name.json']
 
   static flags = {
-    ...BaseCommand.flags,
-    input: flags.string({hidden: true}),
-    ..._.omit(BaseCommand.flags, 'input'),
+    ...omitFlags(['input']),
     accessKeyId: flags.string({char: 'a', required: false}),
     secretAccessKey: flags.string({char: 's', required: false}),
     sessionToken: flags.string({char: 't', required: false}),

diff --git a/src/commands/convert/sonarqube2hdf.ts b/src/commands/convert/sonarqube2hdf.ts
@@ -1,4 +1,4 @@
-import BaseCommand from '../../utils/base-command'
+import BaseCommand, {omitFlags} from '../../utils/base-command'
 import {OutputFlags} from '@oclif/parser'
 import {flags} from '@oclif/command'
 import fs from 'fs'
@@ -15,9 +15,7 @@ export default class Sonarqube2HDF extends BaseCommand {
   static examples = ['saf convert:sonarqube2hdf -n sonar_project_key -u http://sonar:9000 --auth YOUR_API_KEY -o scan_results.json']
 
   static flags = {
-    ...BaseCommand.flags,
-    input: flags.string({hidden: true}),
-    ..._.omit(BaseCommand.flags, 'input'),
+    ...omitFlags(['input']),
     auth: flags.string({char: 'a', required: true}),
     projectKey: flags.string({char: 'n', required: true}),
     url: flags.string({char: 'u', required: true}),

diff --git a/src/utils/base-command.ts b/src/utils/base-command.ts
@@ -18,8 +18,8 @@ export function omitFlags(flagsToOmit: string[]): typeof BaseCommand.flags {
 export default abstract class BaseCommand extends Command {
   static flags = {
     help: flags.help({char: 'h'}),
-    input: flags.string({char: 'i', required: false, description: 'Input file to be converted'}),
-    output: flags.string({char: 'o', required: false}),
+    input: flags.string({char: 'i', required: true, description: 'Input file to be converted'}),
+    output: flags.string({char: 'o', required: true}),
     logLevel: flags.string({char: 'L', required: false, default: 'info', options: ['info', 'warn', 'debug', 'verbose']}),
     listAllCommands: flags.boolean({char: 'A', required: false, description: 'List all SAF CLI commands'}),
   }