Merge branch 'logging' of github.com:mitre/saf into logging

mitre · Mar 15, 2022 · fb73a45 · fb73a45
2 parents 1e73f5d + d928bbc
commit fb73a45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 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}),