Update option names for consistency, update resource bundles

fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties

@@ -53,6 +53,9 @@ while-any=Wait while any records match any of the given states
 until-all=Wait until all records match any of the given states
 until-any=Wait until any of the records match any of the given states
 
+# StandardWaitHelperProgressMonitorMixin
+no-progress=Don't show progress information
+
 # Login and connection options
 arggroup.optional.session-name.heading = Session options:%n
 session-name[0] = Name for this session

fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties

@@ -109,41 +109,42 @@ fcli.sc-dast.scan-policy.usage.header = Manage ScanCentral DAST scan policies
 
 # fcli sc-dast scan-policy get
 fcli.sc-dast.scan-policy.get.usage.header = Get the details for a single scan policy
-# TODO options
+
 
 # fcli sc-dast scan-policy list
 fcli.sc-dast.scan-policy.list.usage.header = List scan policies
-# TODO options
+
 
 # fcli sc-dast scan-settings
 fcli.sc-dast.scan-settings.usage.header = Manage ScanCentral DAST scan settings
 
 # fcli sc-dast scan-settings get
 fcli.sc-dast.scan-settings.get.usage.header = Get the details for a single scan settings definition
-# TODO options
+
 
 # fcli sc-dast scan-settings list
 fcli.sc-dast.scan-settings.list.usage.header = List scan settings
-# TODO options
+fcli.sc-dast.scan-settings.list.modified-after = List settings modified after the given date
+fcli.sc-dast.scan-settings.list.modified-before = List settings modified before the given date
 
 # fcli sc-dast sensor
 fcli.sc-dast.sensor.usage.header = Manage ScanCentral DAST sensors
 
 # fcli sc-dast sensor disable
 fcli.sc-dast.sensor.disable.usage.header = Disable a sensor
-# TODO options
+
 
 # fcli sc-dast sensor enable
 fcli.sc-dast.sensor.enable.usage.header = enable a sensor
-# TODO options
+
 
 # fcli sc-dast sensor get
 fcli.sc-dast.sensor.get.usage.header = Get the details for a single sensor
-# TODO options
+
 
 # fcli sc-dast sensor list
 fcli.sc-dast.sensor.list.usage.header = List sensors
-# TODO options
+
 
 
 #################################################################################################################

fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties

@@ -1,6 +1,9 @@
 # fcli sc-sast
 fcli.sc-sast.usage.header = Commands for interacting with Fortify ScanCentral SAST
 
+# SSCApplicationVersionResolver
+ApplicationVersionMixin = Application version id or <application>:<version> name.
+
 # fcli sc-sast session
 fcli.sc-sast.session.usage.header = Login, logout and manage Fortify ScanCentral SAST sessions
 # Shared login options
@@ -42,6 +45,8 @@ fcli.sc-sast.scan.start.mbs.heading = Options for scanning an MBS file:%n
 fcli.sc-sast.scan.start.package.heading = Options for scanning a package file:%n
 fcli.sc-sast.scan.start.mbs-file = MBS file to scan
 fcli.sc-sast.scan.start.package-file = Package file to scan
+fcli.sc-sast.scan.start.notify = Email address to which to send a scan completion notification
+fcli.sc-sast.scan.start.no-upload = Don't upload scan results to SSC (enabled by default)
 fcli.sc-sast.scan.start.sensor-version = Version of the sensor on which the package should be scanned. Officially, you should select the same sensor version as the version of the ScanCentral Client used to create the package.
 fcli.sc-sast.scan.status.usage.header = Get status for a previously submitted scan request
 fcli.sc-sast.scan.wait-for.usage.header = Wait for one or more scans to reach or exit specified scan statuses

fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityAddCommand.java

@@ -47,7 +47,7 @@ public class SSCAppVersionAuthEntityAddCommand extends AbstractSSCOutputCommand
     @Getter @Mixin private SSCOutputHelperMixins.Add outputHelper;
     @Mixin private SSCAppVersionAuthEntityMixin.RequiredPositionalParameter authEntityMixin;
     @Mixin private SSCAppVersionResolverMixin.RequiredOption parentResolver;
-    @Option(names="--allowMultiMatch", defaultValue = "false")
+    @Option(names="--allow-multi-match", defaultValue = "false")
     private boolean allowMultiMatch;
 
     @Override

fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityDeleteCommand.java

@@ -47,7 +47,7 @@ public class SSCAppVersionAuthEntityDeleteCommand extends AbstractSSCOutputComma
     @Getter @Mixin private SSCOutputHelperMixins.Delete outputHelper; 
     @Mixin private SSCAppVersionAuthEntityMixin.RequiredPositionalParameter authEntityMixin;
     @Mixin private SSCAppVersionResolverMixin.RequiredOption parentResolver;
-    @Option(names="--allowMultiMatch", defaultValue = "false")
+    @Option(names="--allow-multi-match", defaultValue = "false")
     private boolean allowMultiMatch;
 
     @Override

fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCreateCommand.java

@@ -48,7 +48,7 @@ public class SSCIssueTemplateCreateCommand extends AbstractSSCOutputCommand impl
     @Getter @Mixin private SSCOutputHelperMixins.Create outputHelper; 
     @Parameters(index = "0", arity = "1", descriptionKey = "issueTemplateName")
     private String issueTemplateName;
-    @Option(names={"--issueTemplate","-f"}, required = true)
+    @Option(names={"--issue-template-file","-f"}, required = true)
     private String fileName;
     @Option(names={"--description","-d"}, required = false, defaultValue = "")
     private String description;

fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityDeleteCommand.java

@@ -51,7 +51,7 @@ public class SSCAuthEntityDeleteCommand extends AbstractSSCOutputCommand impleme
     @Getter @Mixin private SSCOutputHelperMixins.Delete outputHelper;
     @Parameters(index = "0..*", arity = "1..*")
     private String[] authEntitySpecs;
-    @Option(names="--allowMultiMatch", defaultValue = "false")
+    @Option(names="--allow-multi-match", defaultValue = "false")
     private boolean allowMultiMatch;
 
     @Override

fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties

@@ -6,6 +6,12 @@ fcli.ssc.usage.header = Commands for interacting with Fortify Software Security
 ApplicationVersionMixin = Application version id or <application>:<version> name.
 download.destination = The output location for the file download.
 upload.filePath = The path to the file to be uploaded.
+issue-template = Issue template name or id
+attribute = Set one or more attribute values
+useradd = Assign user or LDAP group to application version; accepts user id, entity name or email address. Option is repeatable.
+userdel = Remove user or LDAP group from application version; accepts user id, entity name or email address. Option is repeatable.
+allow-multi-match = Allow for multiple matches
+filterset = Filter set title or id
 
 # fcli ssc session
 fcli.ssc.session.usage.header = Login, logout and manage Fortify Software Security Center (SSC) sessions
@@ -57,23 +63,35 @@ fcli.ssc.alert.list.usage.header = List alerts
 # fcli ssc app
 fcli.ssc.app.usage.header = Commands for interacting with applications
 fcli.ssc.app.delete.usage.header = Delete an application and all contained versions
+fcli.ssc.app.delete.delete-versions = Confirm deletion of all versions with the specified application
 fcli.ssc.app.get.usage.header = Get application details
 fcli.ssc.app.list.usage.header = List and query applications
 fcli.ssc.app.update.usage.header = Update an application
+fcli.ssc.app.update.name = New name for the application
+fcli.ssc.app.update.description = New description for the application
 
 # fcli ssc appversion
 fcli.ssc.appversion.usage.header = Commands for interacting with application versions
 fcli.ssc.appversion.create.usage.header = Create an application version
+fcli.ssc.appversion.create.auto-required-attrs = Automatically set a default value for required application version attributes
+fcli.ssc.appversion.create.description = Application version description
+fcli.ssc.appversion.create.active = Whether to activate this application version; enabled by default
+fcli.ssc.appversion.create.skip-if-exists = Skip application version creation if an application version with the specified name already exists
 fcli.ssc.appversion.delete.usage.header = Delete an application version
 fcli.ssc.appversion.get.usage.header = Get application version details
 fcli.ssc.appversion.list.usage.header = List and query application versions
 fcli.ssc.appversion.update.usage.header = Update an application version
+fcli.ssc.appversion.update.name = Update application version name
+fcli.ssc.appversion.update.description = Update application version description
 
 # fcli ssc appversion-artifact
 fcli.ssc.appversion-artifact.usage.header = Commands for interacting with application version artifacts
 fcli.ssc.appversion-artifact.approve.usage.header = Approve an artifact
+fcli.ssc.appversion-artifact.approve.message = Approval message, default value '${DEFAULT-VALUE}'
 fcli.ssc.appversion-artifact.delete.usage.header = Delete an artifact
 fcli.ssc.appversion-artifact.download.usage.header = Download an artifact
+fcli.ssc.appversion-artifact.download.no-include-sources = Don't include sources in downloaded artifact (enabled by default)
+fcli.ssc.appversion-artifact.download.id = Artifact id to download 
 fcli.ssc.appversion-artifact.get.usage.header = Get artifact details
 fcli.ssc.appversion-artifact.list.usage.header = List application version artifacts
 fcli.ssc.appversion-artifact.upload.usage.header = Upload an artifact
@@ -85,6 +103,7 @@ fcli.ssc.appversion-artifact.wait-for.usage.description.3 = ${fcli.ssc.appversio
 fcli.ssc.appversion-artifact.purge.usage.header = Commands for purging artifacts
 fcli.ssc.appversion-artifact.purge.by-id.usage.header = Purge an artifact by id
 fcli.ssc.appversion-artifact.purge.by-date.usage.header = Purge artifacts by date
+fcli.ssc.appversion-artifact.purge.by-date.older-than = Purge artifacts older than the specified value, in the format 30d (5 days), 1y (1 year)
 
 # fcli ssc appversion-attribute
 fcli.ssc.appversion-attribute.usage.header = Commands for interacting with application version attributes
@@ -105,6 +124,7 @@ fcli.ssc.appversion-user.list.usage.header = List users assigned to an applicati
 # fcli ssc appversion-vuln
 fcli.ssc.appversion-vuln.usage.header = Commands for interacting with application version vulnerabilities
 fcli.ssc.appversion-vuln.count.usage.header = Count application version vulnerabilities by grouping
+fcli.ssc.appversion-vuln.count.by = Vulnerability grouping type. See SSC REST API documentation for allowed values. Default value: ${DEFAULT-VALUE}
 
 # fcli ssc attribute-definition
 fcli.ssc.attribute-definition.usage.header = Commands for managing attribute definitions
@@ -118,18 +138,25 @@ fcli.ssc.event.list.usage.header = List system events
 # fcli ssc issue-template
 fcli.ssc.issue-template.usage.header = Commands for interacting with issue templates
 fcli.ssc.issue-template.create.usage.header = Create/upload an issue template
+fcli.ssc.issue-template.create.issue-template-file = File containing the issue template definition
+fcli.ssc.issue-template.create.description = Issue template description
+fcli.ssc.issue-template.create.set-as-default = Set this issue template as the default issue template
 fcli.ssc.issue-template.delete.usage.header = Delete an issue template
 fcli.ssc.issue-template.download.usage.header = Download an issue template
 fcli.ssc.issue-template.get.usage.header = Get issue template details
 fcli.ssc.issue-template.list.usage.header = List issue templates
 fcli.ssc.issue-template.update.usage.header = Update an issue template
+fcli.ssc.issue-template.update.name = Update issue template name
+fcli.ssc.issue-template.update.description = Update issue template description
+fcli.ssc.issue-template.update.set-as-default = Set this issue template as the default issue template 
 
 # fcli ssc job
 fcli.ssc.job.usage.header = Commands for interacting with jobs
 fcli.ssc.job.cancel.usage.header = Cancel a job
 fcli.ssc.job.get.usage.header = Get job details
 fcli.ssc.job.list.usage.header = List jobs
 fcli.ssc.job.update.usage.header = Update job priority
+fcli.ssc.job.update.priority = New priority for this job
 
 # SSC plugins
 fcli.ssc.plugin.usage.header = Commands for interacting with 3rd party parser plugins
@@ -151,6 +178,8 @@ fcli.ssc.report-template.create.file = A completed answer file with all the requ
 fcli.ssc.report-template.delete.usage.header = Delete a report template
 fcli.ssc.report-template.download.usage.header = Download a report template file
 fcli.ssc.report-template.generate-answerFile.usage.header = Generate a new answer file template
+fcli.ssc.report-template.generate-answerFile.f = Output file
+fcli.ssc.report-template.generate-answerFile.force = Overwrite otput file if it already exists
 fcli.ssc.report-template.generate-answerFile.usage.header = Generate a new answer file template that can be used for the creation of new report template definitions. For example, within the answer file, you can specify things like the name of the report definition, what parameters it accepts, and what are the types of those parameters.
 fcli.ssc.report-template.get.usage.header = Get report template details
 fcli.ssc.report-template.list.usage.header = List report template definitions
@@ -160,6 +189,9 @@ reportTemplateNameOrId = The name or ID of the report template definition.
 # fcli ssc role
 fcli.ssc.role.usage.header = Commands for interacting with user roles
 fcli.ssc.role.create.usage.header = Create a role
+fcli.ssc.role.create.description = Role description
+fcli.ssc.role.create.universal-access = Set this role to have universal access to all SSC application versions
+fcli.ssc.role.create.permission-id = Permission id's to assign to this role
 fcli.ssc.role.delete.usage.header = Delete a role
 fcli.ssc.role.get.usage.header = Get role details
 fcli.ssc.role.list.usage.header = List and query roles
@@ -176,9 +208,14 @@ fcli.ssc.seed-bundle.upload.usage.header = Upload a seed bundle
 # fcli ssc token
 fcli.ssc.token.usage.header = Commands for interacting with user tokens
 fcli.ssc.token.create.usage.header = Create a token
+fcli.ssc.token.create.expire-in = Expire token after the given time period, which is specified as 30m (30 minutes), 2h (2 hours), 1d (1 day)
+fcli.ssc.token.create.description = Token description
 fcli.ssc.token.list.usage.header = List tokens
 fcli.ssc.token.revoke.usage.header = Revoke a token
 fcli.ssc.token.update.usage.header = Update a token
+fcli.ssc.token.update.expire-in = Update token expiration period, specified as 30m (30 minutes), 2h (2 hours), 1d (1 day)
+fcli.ssc.token.update.description = Update token description
+
 
 # fcli ssc token-definition
 fcli.ssc.token-definition.usage.header = Commands for interacting with token definitions

fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties

@@ -17,6 +17,7 @@ fcli.tool.fod-uploader.uninstall.usage.header = Uninstall Fortify on Demand Uplo
 # fcli tool sc-client
 fcli.tool.sc-client.usage.header = Commands for installing and managing ScanCentral SAST Client
 fcli.tool.sc-client.install.usage.header = Download and install ScanCentral SAST Client
+fcli.tool.sc-client.install.client-auth-token = ScanCentral SAST client_auth_token used for authenticating with ScanCentral SAST Controller
 fcli.tool.sc-client.list.usage.header = List ScanCentral SAST Client available and installed versions
 fcli.tool.sc-client.uninstall.usage.header = Uninstall ScanCentral SAST Client
 

fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties

@@ -3,6 +3,7 @@ fcli.util.usage.header = Various fcli utility commands that don't fit in any of
 fcli.util.all-commands.usage.header = Commands for listing information about all fcli commands
 fcli.util.all-commands.list.usage.header = List all fcli commands
 fcli.util.all-commands.list.include-hidden = Include hidden commands
+fcli.util.all-commands.list.include-parents = Include parent (container) commands
 fcli.util.auto-complete.usage.header = Commands for generating fcli auto-completion scripts
 fcli.util.auto-complete.generate.usage.header = Generate fcli auto-completion script
 fcli.util.auto-complete.generate.usage.description.0 = Generate bash/zsh completion script for ${ROOT-COMMAND-NAME:-the root command of this command}.