another quick fix

Author: joseph-sentry

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

@@ -5,60 +5,19 @@
 
 import click
 import sentry_sdk
+from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
 from codecov_cli.helpers.args import get_cli_args
 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
 
+from prevent_cli.options import global_options
+
 
 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",
@@ -130,16 +89,22 @@ def _turn_env_vars_into_dict(ctx, params, value):
         "--build",
         "--build-code",
         "build_code",
+        cls=CodecovOption,
         help="Specify the build number manually",
+        fallback_field=FallbackFieldEnum.build_code,
     ),
     click.option(
         "--build-url",
         "build_url",
+        cls=CodecovOption,
         help="The URL of the build where this is running",
+        fallback_field=FallbackFieldEnum.build_url,
     ),
     click.option(
         "--job-code",
+        cls=CodecovOption,
         help="Specify the job code manually",
+        fallback_field=FallbackFieldEnum.job_code,
     ),
     click.option(
         "-n",
@@ -149,14 +114,18 @@ def _turn_env_vars_into_dict(ctx, params, value):
     click.option(
         "-B",
         "--branch",
+        cls=CodecovOption,
         help="Branch to which this commit belongs to",
+        fallback_field=FallbackFieldEnum.branch,
     ),
     click.option(
         "-P",
         "--pr",
         "--pull-request-number",
         "pull_request_number",
+        cls=CodecovOption,
         help="Specify the pull request number manually. Used to override pre-existing CI environment variables",
+        fallback_field=FallbackFieldEnum.pull_request_number,
     ),
     click.option(
         "-e",
@@ -243,12 +212,6 @@ def _turn_env_vars_into_dict(ctx, params, value):
 ]
 
 
-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)

prevent-cli/src/prevent_cli/fallbacks.py

@@ -0,0 +1,56 @@
+import typing
+from enum import Enum, auto
+
+import click
+
+
+class FallbackFieldEnum(Enum):
+    branch = auto()
+    build_code = auto()
+    build_url = auto()
+    commit_sha = auto()
+    git_service = auto()
+    job_code = auto()
+    pull_request_number = auto()
+    service = auto()
+    slug = auto()
+
+
+class CodecovOption(click.Option):
+    def __init__(self, *args, **kwargs):
+        self.fallback_field = kwargs.pop("fallback_field", None)
+        super().__init__(*args, **kwargs)
+
+    def get_default(
+        self, ctx: click.Context, call: bool = True
+    ) -> typing.Optional[typing.Union[typing.Any, typing.Callable[[], typing.Any]]]:
+        res = super().get_default(ctx, call=call)
+        if res is not None:
+            return res
+        if self.fallback_field is not None:
+            if ctx.obj.get("ci_adapter") is not None:
+                res = ctx.obj.get("ci_adapter").get_fallback_value(self.fallback_field)
+                if res is not None:
+                    return res
+            if ctx.obj.get("versioning_system") is not None:
+                res = ctx.obj.get("versioning_system").get_fallback_value(
+                    self.fallback_field
+                )
+                if res is not None:
+                    return res
+        return None
+
+
+class BrandedOption(click.Option):
+    def resolve_envvar_value(self, ctx: click.Context) -> typing.Optional[str]:
+        actual_var = self.envvar
+        self.envvar = [
+            f"{brand.value.upper()}_{actual_var}" for brand in ctx.obj["branding"]
+        ]
+        res = super().resolve_envvar_value(ctx)
+        self.envvar = actual_var
+        return res
+
+
+class BrandedCodecovOption(CodecovOption, BrandedOption):
+    pass

prevent-cli/src/prevent_cli/options.py

@@ -0,0 +1,56 @@
+import click
+from codecov_cli.fallbacks import (
+    BrandedCodecovOption,
+    BrandedOption,
+    CodecovOption,
+    FallbackFieldEnum,
+)
+from codecov_cli.helpers.git import GitService
+
+_global_options = [
+    click.option(
+        "-C",
+        "--sha",
+        "--commit-sha",
+        "commit_sha",
+        help="Commit SHA (with 40 chars)",
+        cls=CodecovOption,
+        fallback_field=FallbackFieldEnum.commit_sha,
+        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",
+        cls=CodecovOption,
+        fallback_field=FallbackFieldEnum.git_service,
+        type=click.Choice([service.value for service in GitService]),
+    ),
+    click.option(
+        "-t",
+        "--token",
+        help="Codecov upload token",
+        cls=BrandedOption,
+        envvar="TOKEN",
+    ),
+    click.option(
+        "-r",
+        "--slug",
+        "slug",
+        cls=BrandedCodecovOption,
+        fallback_field=FallbackFieldEnum.slug,
+        help="owner/repo slug used instead of the private repo token in Self-hosted",
+        envvar="SLUG",
+    ),
+]
+
+
+def global_options(func):
+    for option in reversed(_global_options):
+        func = option(func)
+    return func