Skip to content

fix: Robustify CLI context handling for programmatic invocation #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Robustify CLI context handling for programmatic invocation #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions codecov_cli/commands/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ def do_upload(
):
with sentry_sdk.start_transaction(op="task", name="Do Upload"):
with sentry_sdk.start_span(name="do_upload"):
versioning_system = ctx.obj["versioning_system"]
codecov_yaml = ctx.obj["codecov_yaml"] or {}
versioning_system = ctx.obj.get("versioning_system")
codecov_yaml = ctx.obj.get("codecov_yaml") or {}
cli_config = codecov_yaml.get("cli", {})
ci_adapter = ctx.obj.get("ci_adapter")
enterprise_url = ctx.obj.get("enterprise_url")
Expand Down
4 changes: 2 additions & 2 deletions codecov_cli/commands/upload_coverage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ def upload_coverage(
report_type = report_type_from_str(report_type_str)

if not use_legacy_uploader and report_type == ReportType.COVERAGE:
versioning_system = ctx.obj["versioning_system"]
codecov_yaml = ctx.obj["codecov_yaml"] or {}
versioning_system = ctx.obj.get("versioning_system")
codecov_yaml = ctx.obj.get("codecov_yaml") or {}
cli_config = codecov_yaml.get("cli", {})
ci_adapter = ctx.obj.get("ci_adapter")
enterprise_url = ctx.obj.get("enterprise_url")
Expand Down
9 changes: 8 additions & 1 deletion codecov_cli/fallbacks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

import click

from codecov_cli.branding import Branding


class FallbackFieldEnum(Enum):
branch = auto()
Expand Down Expand Up @@ -66,8 +68,13 @@ def get_default(
class BrandedOption(click.Option):
def resolve_envvar_value(self, ctx: click.Context) -> typing.Optional[str]:
actual_var = self.envvar
branding = (
ctx.obj.get("branding", [Branding.CODECOV])
if ctx.obj is not None
else [Branding.CODECOV]
)
self.envvar = [
f"{brand.value.upper()}_{actual_var}" for brand in ctx.obj["branding"]
f"{brand.value.upper()}_{actual_var}" for brand in branding
]
res = super().resolve_envvar_value(ctx)
self.envvar = actual_var
Expand Down
Loading