reorder options in cycode scan; improve help text of report command

Author: MarshalX

README.md

@@ -282,7 +282,7 @@ The following are the options and commands available with the Cycode CLI applica
 | [configure](#using-the-configure-command) | Initial command to configure your CLI client authentication.                                                                                 |
 | [ignore](#ignoring-scan-results)          | Ignores a specific value, path or rule ID.                                                                                                   |
 | [scan](#running-a-scan)                   | Scan the content for Secrets/IaC/SCA/SAST violations. You`ll need to specify which scan type to perform: commit-history/path/repository/etc. |
-| [report](#report-command)                 | Generate report. You`ll need to specify which report type to perform.                                                                        |
+| [report](#report-command)                 | Generate report. You`ll need to specify which report type to perform as SBOM.                                                                |
 | status                                    | Show the CLI status and exit.                                                                                                                |
 
 # Scan Command

cycode/cli/apps/report/__init__.py

@@ -4,5 +4,5 @@
 from cycode.cli.apps.report.report_command import report_command
 
 app = typer.Typer(name='report', no_args_is_help=True)
-app.callback(short_help='Generate report. You`ll need to specify which report type to perform.')(report_command)
+app.callback(short_help='Generate report. You`ll need to specify which report type to perform as SBOM.')(report_command)
 app.add_typer(sbom.app)

cycode/cli/apps/scan/scan_command.py

@@ -29,9 +29,6 @@ def scan_command(
             case_sensitive=False,
         ),
     ] = ScanTypeOption.SECRET,
-    show_secret: Annotated[
-        bool, typer.Option('--show-secret', help='Show Secrets in plain text.', rich_help_panel=_SECRET_RICH_HELP_PANEL)
-    ] = False,
     soft_fail: Annotated[
         bool, typer.Option('--soft-fail', help='Run the scan without failing; always return a non-error status code.')
     ] = False,
@@ -56,27 +53,9 @@ def scan_command(
             'A link to the report will be displayed in the console output.',
         ),
     ] = False,
-    export_type: Annotated[
-        ExportTypeOption,
-        typer.Option(
-            '--export-type',
-            case_sensitive=False,
-            help='Specify the export type. '
-            'HTML and SVG will export terminal output and rely on --output option. '
-            'JSON always exports JSON.',
-            rich_help_panel=_EXPORT_RICH_HELP_PANEL,
-        ),
-    ] = ExportTypeOption.JSON,
-    export_file: Annotated[
-        Optional[Path],
-        typer.Option(
-            '--export-file',
-            help='Export file. Path to the file where the export will be saved. ',
-            dir_okay=False,
-            writable=True,
-            rich_help_panel=_EXPORT_RICH_HELP_PANEL,
-        ),
-    ] = None,
+    show_secret: Annotated[
+        bool, typer.Option('--show-secret', help='Show Secrets in plain text.', rich_help_panel=_SECRET_RICH_HELP_PANEL)
+    ] = False,
     sca_scan: Annotated[
         list[ScaScanTypeOption],
         typer.Option(
@@ -109,6 +88,27 @@ def scan_command(
             rich_help_panel=_SCA_RICH_HELP_PANEL,
         ),
     ] = False,
+    export_type: Annotated[
+        ExportTypeOption,
+        typer.Option(
+            '--export-type',
+            case_sensitive=False,
+            help='Specify the export type. '
+            'HTML and SVG will export terminal output and rely on --output option. '
+            'JSON always exports JSON.',
+            rich_help_panel=_EXPORT_RICH_HELP_PANEL,
+        ),
+    ] = ExportTypeOption.JSON,
+    export_file: Annotated[
+        Optional[Path],
+        typer.Option(
+            '--export-file',
+            help='Export file. Path to the file where the export will be saved. ',
+            dir_okay=False,
+            writable=True,
+            rich_help_panel=_EXPORT_RICH_HELP_PANEL,
+        ),
+    ] = None,
 ) -> None:
     """:mag: [bold cyan]Scan code for vulnerabilities (Secrets, IaC, SCA, SAST).[/]