quick fix

Author: joseph-sentry

prevent-cli/src/prevent_cli/commands/upload.py

@@ -1,33 +1,266 @@
 import logging
+import os
 import pathlib
 import typing
 
 import click
 import sentry_sdk
-from codecov_cli.commands.upload import global_upload_options
 from codecov_cli.helpers.args import get_cli_args
-from codecov_cli.helpers.options import global_options
 from codecov_cli.helpers.upload_type import report_type_from_str
 from codecov_cli.opentelemetry import close_telem
 from codecov_cli.services.upload_coverage import upload_coverage_logic
 
+
+def _turn_env_vars_into_dict(ctx, params, value):
+    return dict((v, os.getenv(v, None)) for v in value)
+
+
+_global_options = [
+    click.option(
+        "-C",
+        "--sha",
+        "--commit-sha",
+        "commit_sha",
+        help="Commit SHA (with 40 chars)",
+        required=True,
+    ),
+    click.option(
+        "-Z",
+        "--fail-on-error",
+        "fail_on_error",
+        is_flag=True,
+        help="Exit with non-zero code in case of error",
+    ),
+    click.option(
+        "--git-service",
+        help="Git service provider",
+        type=click.Choice(
+            [
+                "github",
+                "gitlab",
+                "bitbucket",
+                "github_enterprise",
+                "gitlab_enterprise",
+                "bitbucket_server",
+            ]
+        ),
+    ),
+    click.option(
+        "-t",
+        "--token",
+        help="Codecov upload token",
+        envvar="TOKEN",
+    ),
+    click.option(
+        "-r",
+        "--slug",
+        help="owner/repo slug used instead of the private repo token in Self-hosted",
+        envvar="SLUG",
+    ),
+]
+
+_global_upload_options = [
+    click.option(
+        "--code",
+        "--report-code",
+        "report_code",
+        help="The code of the report. If unsure, leave default",
+        default="default",
+        hidden=True,
+    ),
+    click.option(
+        "--network-root-folder",
+        help="Root folder from which to consider paths on the network section",
+        type=click.Path(path_type=pathlib.Path),
+        default=pathlib.Path.cwd,
+        show_default="Current working directory",
+    ),
+    click.option(
+        "-s",
+        "--dir",
+        "--coverage-files-search-root-folder",
+        "--files-search-root-folder",
+        "files_search_root_folder",
+        help="Folder where to search for coverage files",
+        type=click.Path(path_type=pathlib.Path),
+        default=pathlib.Path.cwd,
+        show_default="Current Working Directory",
+    ),
+    click.option(
+        "--exclude",
+        "--coverage-files-search-exclude-folder",
+        "--files-search-exclude-folder",
+        "files_search_exclude_folders",
+        help="Folders to exclude from search",
+        type=click.Path(path_type=pathlib.Path),
+        multiple=True,
+        default=[],
+    ),
+    click.option(
+        "-f",
+        "--file",
+        "--coverage-files-search-direct-file",
+        "--files-search-direct-file",
+        "files_search_explicitly_listed_files",
+        help="Explicit files to upload. These will be added to the coverage files found for upload. If you wish to only upload the specified files, please consider using --disable-search to disable uploading other files.",
+        type=click.Path(path_type=pathlib.Path),
+        multiple=True,
+        default=[],
+    ),
+    click.option(
+        "--recurse-submodules",
+        help="Whether to enumerate files inside of submodules for path-fixing purposes. Off by default.",
+        is_flag=True,
+        default=False,
+    ),
+    click.option(
+        "--disable-search",
+        help="Disable search for coverage files. This is helpful when specifying what files you want to upload with the --file option.",
+        is_flag=True,
+        default=False,
+    ),
+    click.option(
+        "--disable-file-fixes",
+        help="Disable file fixes to ignore common lines from coverage (e.g. blank lines or empty brackets)",
+        is_flag=True,
+        default=False,
+    ),
+    click.option(
+        "-b",
+        "--build",
+        "--build-code",
+        "build_code",
+        help="Specify the build number manually",
+    ),
+    click.option(
+        "--build-url",
+        "build_url",
+        help="The URL of the build where this is running",
+    ),
+    click.option(
+        "--job-code",
+        help="Specify the job code manually",
+    ),
+    click.option(
+        "-n",
+        "--name",
+        help="Custom defined name of the upload. Visible in Codecov UI",
+    ),
+    click.option(
+        "-B",
+        "--branch",
+        help="Branch to which this commit belongs to",
+    ),
+    click.option(
+        "-P",
+        "--pr",
+        "--pull-request-number",
+        "pull_request_number",
+        help="Specify the pull request number manually. Used to override pre-existing CI environment variables",
+    ),
+    click.option(
+        "-e",
+        "--env",
+        "--env-var",
+        "env_vars",
+        multiple=True,
+        callback=_turn_env_vars_into_dict,
+        help="Specify environment variables to be included with this build.",
+    ),
+    click.option(
+        "-F",
+        "--flag",
+        "flags",
+        multiple=True,
+        default=[],
+        help="Flag the upload to group coverage metrics. Multiple flags allowed.",
+    ),
+    click.option(
+        "--plugin",
+        "plugin_names",
+        multiple=True,
+        default=["xcode", "gcov", "pycoverage"],
+    ),
+    click.option(
+        "-d",
+        "--dry-run",
+        "dry_run",
+        is_flag=True,
+        help="Don't upload files to Codecov",
+    ),
+    click.option(
+        "--legacy",
+        "--use-legacy-uploader",
+        "use_legacy_uploader",
+        is_flag=True,
+        help="Use the legacy upload endpoint",
+    ),
+    click.option(
+        "--handle-no-reports-found",
+        "handle_no_reports_found",
+        is_flag=True,
+        help="Raise no exceptions when no coverage reports found.",
+    ),
+    click.option(
+        "--report-type",
+        "report_type_str",
+        help="The type of report to upload",
+        default="coverage",
+        type=click.Choice(["coverage", "test-results", "test_results"]),
+    ),
+    click.option(
+        "--network-filter",
+        help="Specify a filter on the files listed in the network section of the Codecov report. This will only add files whose path begin with the specified filter. Useful for upload-specific path fixing",
+    ),
+    click.option(
+        "--network-prefix",
+        help="Specify a prefix on files listed in the network section of the Codecov report. Useful to help resolve path fixing",
+    ),
+    click.option(
+        "--gcov-args",
+        help="Extra arguments to pass to gcov",
+    ),
+    click.option(
+        "--gcov-ignore",
+        help="Paths to ignore during gcov gathering",
+    ),
+    click.option(
+        "--gcov-include",
+        help="Paths to include during gcov gathering",
+    ),
+    click.option(
+        "--gcov-executable",
+        help="gcov executable to run. Defaults to 'gcov'",
+    ),
+    click.option(
+        "--swift-project",
+        help="Specify the swift project",
+    ),
+    click.option(
+        "--parent-sha",
+        help="SHA (with 40 chars) of what should be the parent of this commit",
+    ),
+]
+
+
+def global_options(func):
+    for option in reversed(_global_options):
+        func = option(func)
+    return func
+
+
+def global_upload_options(func):
+    for option in reversed(_global_upload_options):
+        func = option(func)
+    return func
+
+
 logger = logging.getLogger("codecovcli")
 
 
 @click.command()
 @global_options
 @global_upload_options
-@click.option(
-    "--parent-sha",
-    help="SHA (with 40 chars) of what should be the parent of this commit",
-)
-@click.option(
-    "--report-type",
-    "report_type_str",
-    help="The type of report to upload",
-    default="coverage",
-    type=click.Choice(["coverage", "test-results", "test_results"]),
-)
 @click.pass_context
 def upload(
     ctx: click.Context,