codecov-cli 11.2.7__tar.gz → 11.3.0__tar.gz

{codecov_cli-11.2.7/codecov_cli.egg-info → codecov_cli-11.3.0}/PKG-INFO

@@ -1,29 +1,29 @@
 Metadata-Version: 2.4
 Name: codecov-cli
-Version: 11.2.7
+Version: 11.3.0
 Summary: Codecov Command Line Interface
 Author-email: Tom Hu <thomas.hu@sentry.io>
 Maintainer-email: Codecov Support <support@codecov.io>
 Project-URL: Homepage, https://about.codecov.io
-Project-URL: CI: GitHub, https://github.com/getsentry/prevent-cli/actions/workflows/ci.yml
+Project-URL: CI: GitHub, https://github.com/codecov/codecov-cli/actions/workflows/ci.yml
 Project-URL: Docs, https://docs.codecov.com
-Project-URL: GitHub: issues, https://github.com/getsentry/prevent-cli/issues
-Project-URL: GitHub: repo, https://github.com/getsentry/prevent-cli
+Project-URL: GitHub: issues, https://github.com/codecov/codecov-cli/issues
+Project-URL: GitHub: repo, https://github.com/codecov/codecov-cli
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click<8.3.0,>=8.0.0
 Requires-Dist: ijson==3.*
 Requires-Dist: PyYAML==6.*
-Requires-Dist: responses==0.21.*
+Requires-Dist: requests>=2.25.0
 Requires-Dist: sentry-sdk==2.*
 Requires-Dist: test-results-parser==0.6.1
 Dynamic: license-file
 
 # CodecovCLI
 
-[![codecov](https://codecov.io/github/getsentry/prevent-cli/graph/badge.svg?token=K1xQn7DaxT)](https://codecov.io/github/getsentry/prevent-cli)
-[![Build-Test-Upload](https://github.com/getsentry/prevent-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/getsentry/prevent-cli/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/github/codecov/codecov-cli/graph/badge.svg?token=K1xQn7DaxT)](https://codecov.io/github/codecov/codecov-cli)
+[![Build-Test-Upload](https://github.com/codecov/codecov-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/codecov/codecov-cli/actions/workflows/ci.yml)
 
 CodecovCLI is a new way for users to interact with Codecov directly from the user’s terminal or CI platform. Many Codecov features that require the user’s interference can be done via the codecovCLI. It saves commits, creates reports, uploads coverage and has many more features.
 
@@ -63,7 +63,7 @@ The above command will download the latest version of Codecov-cli. If you wish t
 Note: If you're installing in a `pyenv` environment, you may need to call `pyenv rehash` before the CLI will work.
 
 ## As a Binary
-If you would like to use the CLI in an environment that does not have access to Python / PIP, you can install the CLI as a compiled binary. Linux and macOS releases can be found [here](https://cli.codecov.io/), along with SHASUMs and signatures for each released version. Binary releases are also available via [Github releases](https://github.com/getsentry/prevent-cli/releases) on this repository.
+If you would like to use the CLI in an environment that does not have access to Python / PIP, you can install the CLI as a compiled binary. Linux and macOS releases can be found [here](https://cli.codecov.io/), along with SHASUMs and signatures for each released version. Binary releases are also available via [Github releases](https://github.com/codecov/codecov-cli/releases) on this repository.
 
 You can retrieve the Binary for Linux directly from your command line as follows:
 
@@ -78,7 +78,7 @@ sudo chmod +x codecov
 The binary can be integrity checked using a SHASUM256 and SHASUM256.sig file. The process for macos and Linux is identical. Linux is as follows:
 
 ```
-curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
+curl https://keybase.io/codecovsecops/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
 curl -Os https://cli.codecov.io/latest/linux/codecov
 curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM
 curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM.sig
@@ -121,7 +121,7 @@ The following tokens are suitable for uploading:
 If the installation is successful, running `codecovcli --help` will output the available commands along with the different general options that can be used with them.
 
 > [!IMPORTANT]
-> For up-to-date command usage, please check the `codecovcli_commands` [file](https://github.com/getsentry/prevent-cli/blob/main/codecov-cli/codecovcli_commands)
+> For up-to-date command usage, please check the `codecovcli_commands` [file](https://github.com/codecov/codecov-cli/blob/main/codecovcli_commands)
 
 ```
 Usage: codecovcli [OPTIONS] COMMAND [ARGS]...

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/README.md

@@ -1,7 +1,7 @@
 # CodecovCLI
 
-[![codecov](https://codecov.io/github/getsentry/prevent-cli/graph/badge.svg?token=K1xQn7DaxT)](https://codecov.io/github/getsentry/prevent-cli)
-[![Build-Test-Upload](https://github.com/getsentry/prevent-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/getsentry/prevent-cli/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/github/codecov/codecov-cli/graph/badge.svg?token=K1xQn7DaxT)](https://codecov.io/github/codecov/codecov-cli)
+[![Build-Test-Upload](https://github.com/codecov/codecov-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/codecov/codecov-cli/actions/workflows/ci.yml)
 
 CodecovCLI is a new way for users to interact with Codecov directly from the user’s terminal or CI platform. Many Codecov features that require the user’s interference can be done via the codecovCLI. It saves commits, creates reports, uploads coverage and has many more features.
 
@@ -41,7 +41,7 @@ The above command will download the latest version of Codecov-cli. If you wish t
 Note: If you're installing in a `pyenv` environment, you may need to call `pyenv rehash` before the CLI will work.
 
 ## As a Binary
-If you would like to use the CLI in an environment that does not have access to Python / PIP, you can install the CLI as a compiled binary. Linux and macOS releases can be found [here](https://cli.codecov.io/), along with SHASUMs and signatures for each released version. Binary releases are also available via [Github releases](https://github.com/getsentry/prevent-cli/releases) on this repository.
+If you would like to use the CLI in an environment that does not have access to Python / PIP, you can install the CLI as a compiled binary. Linux and macOS releases can be found [here](https://cli.codecov.io/), along with SHASUMs and signatures for each released version. Binary releases are also available via [Github releases](https://github.com/codecov/codecov-cli/releases) on this repository.
 
 You can retrieve the Binary for Linux directly from your command line as follows:
 
@@ -56,7 +56,7 @@ sudo chmod +x codecov
 The binary can be integrity checked using a SHASUM256 and SHASUM256.sig file. The process for macos and Linux is identical. Linux is as follows:
 
 ```
-curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
+curl https://keybase.io/codecovsecops/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
 curl -Os https://cli.codecov.io/latest/linux/codecov
 curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM
 curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM.sig
@@ -99,7 +99,7 @@ The following tokens are suitable for uploading:
 If the installation is successful, running `codecovcli --help` will output the available commands along with the different general options that can be used with them.
 
 > [!IMPORTANT]
-> For up-to-date command usage, please check the `codecovcli_commands` [file](https://github.com/getsentry/prevent-cli/blob/main/codecov-cli/codecovcli_commands)
+> For up-to-date command usage, please check the `codecovcli_commands` [file](https://github.com/codecov/codecov-cli/blob/main/codecovcli_commands)
 
 ```
 Usage: codecovcli [OPTIONS] COMMAND [ARGS]...

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/commands/upload.py

@@ -111,7 +111,10 @@ _global_upload_options = [
         "--name",
         help="Custom defined name of the upload. Visible in Codecov UI",
         cls=CodecovOption,
-        fallback_field=FallbackFieldEnum.build_code,
+        fallback_fields=(
+            FallbackFieldEnum.job_name,
+            FallbackFieldEnum.build_code,
+        ),
     ),
     click.option(
         "-B",

codecov_cli-11.3.0/codecov_cli/fallbacks.py

@@ -0,0 +1,78 @@
+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()
+    job_name = auto()
+
+
+_FIELDS_WITH_VERSIONING_FALLBACK = frozenset(
+    {
+        FallbackFieldEnum.branch,
+        FallbackFieldEnum.commit_sha,
+        FallbackFieldEnum.slug,
+        FallbackFieldEnum.git_service,
+    }
+)
+
+
+class CodecovOption(click.Option):
+    fallback_fields: typing.Optional[tuple[FallbackFieldEnum, ...]]
+
+    def __init__(self, *args, **kwargs):
+        fallback_fields = kwargs.pop("fallback_fields", None)
+        fallback_field = kwargs.pop("fallback_field", None)
+        if fallback_fields is not None:
+            self.fallback_fields = tuple(fallback_fields)
+        elif fallback_field is not None:
+            self.fallback_fields = (fallback_field,)
+        else:
+            self.fallback_fields = 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_fields is not None:
+            for field in self.fallback_fields:
+                if ctx.obj.get("ci_adapter") is not None:
+                    res = ctx.obj.get("ci_adapter").get_fallback_value(field)
+                    if res is not None:
+                        return res
+                if (
+                    ctx.obj.get("versioning_system") is not None
+                    and field in _FIELDS_WITH_VERSIONING_FALLBACK
+                ):
+                    res = ctx.obj.get("versioning_system").get_fallback_value(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

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/helpers/args.py

@@ -5,6 +5,7 @@ from pathlib import PosixPath
 import click
 
 from codecov_cli import __version__
+from codecov_cli.opentelemetry import set_cli_tags
 
 logger = logging.getLogger("codecovcli")
 
@@ -28,4 +29,6 @@ def get_cli_args(ctx: click.Context):
         except Exception:
             continue
 
+    set_cli_tags(filtered_args, ctx)
+
     return filtered_args

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/helpers/ci_adapters/__init__.py

@@ -14,6 +14,7 @@ from codecov_cli.helpers.ci_adapters.codebuild import AWSCodeBuildCIAdapter
 from codecov_cli.helpers.ci_adapters.droneci import DroneCIAdapter
 from codecov_cli.helpers.ci_adapters.github_actions import GithubActionsCIAdapter
 from codecov_cli.helpers.ci_adapters.gitlab_ci import GitlabCIAdapter
+from codecov_cli.helpers.ci_adapters.harness import HarnessAdapter
 from codecov_cli.helpers.ci_adapters.heroku import HerokuCIAdapter
 from codecov_cli.helpers.ci_adapters.jenkins import JenkinsAdapter
 from codecov_cli.helpers.ci_adapters.local import LocalAdapter
@@ -48,6 +49,7 @@ def get_ci_providers_list():
         BitriseCIAdapter(),
         AppveyorCIAdapter(),
         WoodpeckerCIAdapter(),
+        HarnessAdapter(),
         HerokuCIAdapter(),
         DroneCIAdapter(),
         BuildkiteAdapter(),

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/helpers/ci_adapters/base.py

@@ -17,6 +17,7 @@ class CIAdapterBase(ABC):
             FallbackFieldEnum.pull_request_number: self._get_pull_request_number,
             FallbackFieldEnum.job_code: self._get_job_code,
             FallbackFieldEnum.git_service: self._get_git_service,
+            FallbackFieldEnum.job_name: self._get_job_name,
         }
 
     def get_fallback_value(
@@ -100,3 +101,10 @@ class CIAdapterBase(ABC):
 
     def _get_git_service(self):
         return None
+
+    def _get_job_name(self):
+        """
+        Name of the job that gets displayed in the Codecov UI
+        Returns: string
+        """
+        return None

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/helpers/ci_adapters/github_actions.py

@@ -87,3 +87,10 @@ class GithubActionsCIAdapter(CIAdapterBase):
 
     def get_service_name(self):
         return "GithubActions"
+
+    def _get_job_name(self):
+        github_workflow = os.getenv("GITHUB_WORKFLOW")
+        github_job = os.getenv("GITHUB_JOB")
+        if github_workflow and github_job:
+            return f"{github_workflow} - {github_job}"
+        return github_workflow or github_job or None

codecov_cli-11.3.0/codecov_cli/helpers/ci_adapters/harness.py

@@ -0,0 +1,52 @@
+import os
+
+from codecov_cli.helpers.ci_adapters.base import CIAdapterBase
+from codecov_cli.helpers.git import parse_slug
+
+# https://developer.harness.io/docs/continuous-integration/troubleshoot-ci/ci-env-var/
+
+# Uses CI_ prefixed environment variables variant if available and DRONE_ prefixed environment variables variant if not
+# The DRONE variables overlap with the Drone CI Adapter as Harness CI is built on top 
+class HarnessAdapter(CIAdapterBase):
+    def detect(self) -> bool:
+        return bool(os.getenv("HARNESS_BUILD_ID"))
+
+    def _get_branch(self):
+        return os.getenv("DRONE_COMMIT_BRANCH")
+
+    def _get_commit_sha(self):
+        return os.getenv("DRONE_COMMIT_SHA")
+
+    def _get_pull_request_number(self):
+        return os.getenv("DRONE_PULL_REQUEST")
+
+    def _get_job_code(self):
+        return None
+
+    def _get_build_code(self):
+        return os.getenv("CI_BUILD_NUMBER")
+
+    def _get_build_url(self):
+        return os.getenv("CI_BUILD_LINK")
+
+    def _get_slug(self):
+        ci_repo = os.getenv("CI_REPO")
+        if ci_repo and "/" in ci_repo:
+            return ci_repo
+        for env_var in (
+            "CI_REPO_REMOTE",
+            "CI_REMOTE_URL",
+            "CI_REPO_LINK",
+            "DRONE_GIT_HTTP_URL",
+            "DRONE_REMOTE_URL",
+        ):
+            if url := os.getenv(env_var):
+                if slug := parse_slug(url):
+                    return slug
+        return None
+
+    def _get_service(self):
+        return "harness"
+
+    def get_service_name(self):
+        return "Harness"

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/helpers/request.py

@@ -152,7 +152,7 @@ def log_warnings_and_errors_if_any(
     sending_result: RequestResult, process_desc: str, fail_on_error: bool = False
 ):
     logger.info(
-        f"Process {process_desc} complete",
+        f"{process_desc} complete",
     )
     logger.debug(
         f"{process_desc} result",

codecov_cli-11.3.0/codecov_cli/helpers/upload_url_validation.py

@@ -0,0 +1,21 @@
+import click
+
+from codecov_cli.helpers.git import GitService
+
+# The set of acceptable upload services from Shelter
+_CODECOV_UPLOAD_SERVICES = frozenset(s.value for s in GitService) | {"github-actions"}
+
+
+def validate_upload_service(
+    service: str,
+) -> None:
+    allowed = ", ".join(sorted(_CODECOV_UPLOAD_SERVICES))
+    if not service:
+        raise click.ClickException(
+            "Upload service is missing (Codecov requires it for upload URLs). "
+            f"Pass --git-service with one of: {allowed}"
+        )
+    if service not in _CODECOV_UPLOAD_SERVICES:
+        raise click.ClickException(
+            f"Invalid upload service {service!r}. Use one of: {allowed}"
+        )

codecov_cli-11.3.0/codecov_cli/opentelemetry.py

@@ -0,0 +1,85 @@
+import os
+import random
+
+import sentry_sdk
+
+from codecov_cli import __version__
+
+_SAMPLED_MESSAGES = [
+    "Token required",
+    "No JUnit XML reports found",
+]
+_SAMPLE_RATE = 100
+_SKIP_TAG_KEYS = {"branch", "flags", "commit_sha", "env_vars"}
+
+
+def _before_send(event, hint):
+    messages = []
+    if "message" in event and event.get("message") is not None:
+        messages.append(event.get("message"))
+    if "logentry" in event and "message" in event.get("logentry", {}) and event.get("logentry", {}).get("message") is not None:
+        messages.append(event.get("logentry", {}).get("message"))
+    if "exception" in event and event.get("exception") is not None:
+        for exc in event.get("exception", {}).get("values", []):
+            if "value" in exc:
+                messages.append(exc.get("value"))
+
+    matched = False
+    for message in messages:
+        for pattern in _SAMPLED_MESSAGES:
+            if pattern in message:
+                matched = True
+                break
+
+    if matched and random.randint(1, _SAMPLE_RATE) != 1:
+        return None
+    return event
+
+
+def init_telem(ctx):
+    if ctx["disable_telem"]:
+        return
+    if ctx["enterprise_url"]:  # dont run on dedicated cloud
+        return
+    if os.getenv("CODECOV_ENV", "production") == "test":
+        return
+
+    sentry_sdk.init(
+        dsn="https://0bea75c61745c221a6ef1ac1709b1f4d@o26192.ingest.us.sentry.io/4508615876083713",
+        enable_tracing=True,
+        environment=os.getenv("CODECOV_ENV", "production"),
+        release=f"cli@{__version__}",
+        before_send=_before_send,
+    )
+
+
+def set_cli_tags(args: dict, ctx):
+    """Set Sentry tags from resolved CLI arguments."""
+    for key, value in args.items():
+        if key in _SKIP_TAG_KEYS:
+            continue
+        if value is None or value in ([], (), {}):
+            continue
+        if isinstance(value, (list, tuple)):
+            value = ",".join(str(v) for v in value)
+        elif isinstance(value, dict):
+            value = ",".join(
+                f"{k}={v}" for k, v in value.items() if v is not None
+            )
+        sentry_sdk.set_tag(f"cli.{key}", str(value)[:200])
+
+    token = ctx.params.get("token") if hasattr(ctx, "params") else None
+    sentry_sdk.set_tag("cli.token_provided", str(bool(token)).lower())
+
+    ci_adapter = (
+        ctx.obj.get("ci_adapter") if hasattr(ctx, "obj") and ctx.obj else None
+    )
+    if ci_adapter is not None:
+        try:
+            sentry_sdk.set_tag("cli.ci_adapter", ci_adapter.get_service_name())
+        except Exception:
+            pass
+
+
+def close_telem():
+    sentry_sdk.flush()

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/services/commit/__init__.py

@@ -2,6 +2,7 @@ import logging
 import os
 import typing
 
+from codecov_cli import __version__ as codecov_cli_version
 from codecov_cli.helpers.config import CODECOV_INGEST_URL
 from codecov_cli.helpers.encoder import encode_slug
 from codecov_cli.helpers.request import (
@@ -9,10 +10,10 @@ from codecov_cli.helpers.request import (
     log_warnings_and_errors_if_any,
     send_post_request,
 )
+from codecov_cli.helpers.upload_url_validation import validate_upload_service
 
 logger = logging.getLogger("codecovcli")
 
-
 def create_commit_logic(
     commit_sha: str,
     parent_sha: typing.Optional[str],
@@ -75,10 +76,13 @@ def send_commit_data(
         "commitid": commit_sha,
         "parent_commit_id": parent_sha,
         "pullid": pr,
+        "version": codecov_cli_version,
     }
 
     upload_url = enterprise_url or CODECOV_INGEST_URL
-    url = f"{upload_url}/upload/{service}/{slug}/commits"
+    service_part = (service or "").strip()
+    validate_upload_service(service_part)
+    url = f"{upload_url}/upload/{service_part}/{slug}/commits"
     return send_post_request(
         url=url,
         data=data,

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/services/empty_upload/__init__.py

@@ -1,8 +1,11 @@
 import json
 import logging
 
+from codecov_cli import __version__ as codecov_cli_version
 from codecov_cli.helpers.config import CODECOV_API_URL
 from codecov_cli.helpers.encoder import encode_slug
+from codecov_cli.helpers.upload_url_validation import validate_upload_service
+
 from codecov_cli.helpers.request import (
     get_token_header,
     log_warnings_and_errors_if_any,
@@ -25,13 +28,16 @@ def empty_upload_logic(
     encoded_slug = encode_slug(slug)
     headers = get_token_header(token)
     upload_url = enterprise_url or CODECOV_API_URL
-    url = f"{upload_url}/upload/{git_service}/{encoded_slug}/commits/{commit_sha}/empty-upload"
+    service_part = (git_service or "").strip()
+    validate_upload_service(service_part)
+    url = f"{upload_url}/upload/{service_part}/{encoded_slug}/commits/{commit_sha}/empty-upload"
     sending_result = send_post_request(
         url=url,
         headers=headers,
         data={
             "cli_args": args,
             "should_force": should_force,
+            "version": codecov_cli_version,
         },
     )
     log_warnings_and_errors_if_any(sending_result, "Empty Upload", fail_on_error)

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/services/report/__init__.py

@@ -3,8 +3,7 @@ import logging
 import time
 import typing
 
-import requests
-
+from codecov_cli import __version__ as codecov_cli_version
 from codecov_cli.helpers import request
 from codecov_cli.helpers.config import CODECOV_API_URL, CODECOV_INGEST_URL
 from codecov_cli.helpers.encoder import encode_slug
@@ -14,6 +13,7 @@ from codecov_cli.helpers.request import (
     request_result,
     send_post_request,
 )
+from codecov_cli.helpers.upload_url_validation import validate_upload_service
 
 logger = logging.getLogger("codecovcli")
 MAX_NUMBER_TRIES = 3
@@ -58,10 +58,13 @@ def send_create_report_request(
     data = {
         "cli_args": args,
         "code": code,
+        "version": codecov_cli_version,
     }
     headers = get_token_header(token)
     upload_url = enterprise_url or CODECOV_INGEST_URL
-    url = f"{upload_url}/upload/{service}/{encoded_slug}/commits/{commit_sha}/reports"
+    service_part = (service or "").strip()
+    validate_upload_service(service_part)
+    url = f"{upload_url}/upload/{service_part}/{encoded_slug}/commits/{commit_sha}/reports"
     return send_post_request(url=url, headers=headers, data=data)
 
 
@@ -103,10 +106,13 @@ def send_reports_result_request(
 ):
     data = {
         "cli_args": args,
+        "version": codecov_cli_version,
     }
     headers = get_token_header(token)
     upload_url = enterprise_url or CODECOV_API_URL
-    url = f"{upload_url}/upload/{service}/{encoded_slug}/commits/{commit_sha}/reports/{report_code}/results"
+    service_part = (service or "").strip()
+    validate_upload_service(service_part)
+    url = f"{upload_url}/upload/{service_part}/{encoded_slug}/commits/{commit_sha}/reports/{report_code}/results"
     return send_post_request(url=url, data=data, headers=headers)
 
 
@@ -121,7 +127,9 @@ def send_reports_result_get_request(
 ):
     headers = get_token_header(token)
     upload_url = enterprise_url or CODECOV_API_URL
-    url = f"{upload_url}/upload/{service}/{encoded_slug}/commits/{commit_sha}/reports/{report_code}/results"
+    service_part = (service or "").strip()
+    validate_upload_service(service_part)
+    url = f"{upload_url}/upload/{service_part}/{encoded_slug}/commits/{commit_sha}/reports/{report_code}/results"
     number_tries = 0
     while number_tries < MAX_NUMBER_TRIES:
         resp = request.get(url=url, headers=headers)

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/services/upload/__init__.py

@@ -165,5 +165,5 @@ def do_upload_logic(
             status_code=200,
             text="Data NOT sent to Codecov because of dry-run option",
         )
-    log_warnings_and_errors_if_any(sending_result, "Upload", fail_on_error)
+    log_warnings_and_errors_if_any(sending_result, "Upload queued for processing", fail_on_error)
     return sending_result

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/services/upload/upload_sender.py

@@ -2,7 +2,6 @@ import base64
 import json
 import logging
 import typing
-import sys
 import zlib
 from typing import Any, Dict
 
@@ -12,6 +11,7 @@ from codecov_cli import __version__ as codecov_cli_version
 from codecov_cli.helpers.config import CODECOV_INGEST_URL
 from codecov_cli.helpers.encoder import encode_slug
 from codecov_cli.helpers.upload_type import ReportType
+from codecov_cli.helpers.upload_url_validation import validate_upload_service
 from codecov_cli.helpers.request import (
     get_token_header,
     send_post_request,
@@ -92,11 +92,14 @@ class UploadSender(object):
                     commit_sha,
                     report_code,
                     upload_coverage,
+                    file_not_found=file_not_found,
                 )
                 # Data that goes to storage
                 reports_payload = self._generate_payload(
                     upload_data, env_vars, report_type
                 )
+                reports_payload_size = len(reports_payload)
+                data["report_payload_bytes"] = reports_payload_size
 
             with sentry_sdk.start_span(name="upload_sender_storage_request"):
                 logger.debug("Sending upload request to Codecov")
@@ -117,7 +120,7 @@ class UploadSender(object):
                 resp_json_obj = json.loads(resp_from_codecov.text)
                 if resp_json_obj.get("url"):
                     logger.info(
-                        f"Your upload is now processing. When finished, results will be available at: {resp_json_obj.get('url')}"
+                        f"Your upload is now queued for processing. When finished, results will be available at: {resp_json_obj.get('url')}"
                     )
                 logger.debug(
                     "Upload request to Codecov complete.",
@@ -126,9 +129,8 @@ class UploadSender(object):
                 put_url = resp_json_obj["raw_upload_location"]
 
             with sentry_sdk.start_span(name="upload_sender_storage") as storage_span:
-                payload_size = sys.getsizeof(reports_payload)
-                storage_span.set_data("payload_size", payload_size)
-                logger.info(f"Sending upload ({payload_size} bytes) to storage")
+                storage_span.set_data("payload_size", reports_payload_size)
+                logger.info(f"Sending upload ({reports_payload_size} bytes) to storage")
                 resp_from_storage = send_put_request(put_url, data=reports_payload)
 
             return resp_from_storage
@@ -218,8 +220,11 @@ class UploadSender(object):
         upload_coverage=False,
         file_not_found=False,
     ):
+        service_part = (git_service or "").strip()
+
         if report_type == ReportType.COVERAGE:
-            base_url = f"{upload_url}/upload/{git_service}/{encoded_slug}"
+            validate_upload_service(service_part)
+            base_url = f"{upload_url}/upload/{service_part}/{encoded_slug}"
             if upload_coverage:
                 url = f"{base_url}/upload-coverage"
             else:
@@ -228,7 +233,7 @@ class UploadSender(object):
             data["slug"] = encoded_slug
             data["branch"] = branch
             data["commit"] = commit_sha
-            data["service"] = git_service
+            data["service"] = service_part if service_part else None
             data["file_not_found"] = file_not_found
             url = f"{upload_url}/upload/test_results/v1"
 

{codecov_cli-11.2.7 → codecov_cli-11.3.0}/codecov_cli/services/upload_completion/__init__.py

@@ -1,8 +1,10 @@
 import json
 import logging
 
+from codecov_cli import __version__ as codecov_cli_version
 from codecov_cli.helpers.config import CODECOV_API_URL
 from codecov_cli.helpers.encoder import encode_slug
+from codecov_cli.helpers.upload_url_validation import validate_upload_service
 from codecov_cli.helpers.request import (
     get_token_header,
     log_warnings_and_errors_if_any,
@@ -24,9 +26,12 @@ def upload_completion_logic(
     encoded_slug = encode_slug(slug)
     headers = get_token_header(token)
     upload_url = enterprise_url or CODECOV_API_URL
-    url = f"{upload_url}/upload/{git_service}/{encoded_slug}/commits/{commit_sha}/upload-complete"
+    service_part = (git_service or "").strip()
+    validate_upload_service(service_part)
+    url = f"{upload_url}/upload/{service_part}/{encoded_slug}/commits/{commit_sha}/upload-complete"
     data = {
         "cli_args": args,
+        "version": codecov_cli_version,
     }
     sending_result = send_post_request(url=url, data=data, headers=headers)
     log_warnings_and_errors_if_any(