codecov-cli 0.4.8__tar.gz → 0.5.0__tar.gz

{codecov-cli-0.4.8/codecov_cli.egg-info → codecov-cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codecov-cli
-Version: 0.4.8
+Version: 0.5.0
 Summary: Codecov Command Line Interface
 Author: Codecov
 Author-email: support@codecov.io
@@ -134,7 +134,7 @@ Codecov-cli supports user input. These inputs, along with their descriptions and
 | `get-report-results` | Used for local upload. It asks codecov to provide you the report results you calculated with the previous command. 
 | `pr-base-picking` | Tells codecov that you want to explicitly define a base for your PR
 | `upload-process` | A wrapper for 3 commands. Create-commit, create-report and do-upload. You can use this command to upload to codecov instead of using the previosly mentioned commands.
-| `send-notification` | A command that tells Codecov that you finished uploading and you want to be sent notifications. To disable automatically sent notifications please consider adding manual_trigger to your codecov.yml, so it will look like codecov: notify: manual_trigger: true. 
+| `send-notifications` | A command that tells Codecov that you finished uploading and you want to be sent notifications. To disable automatically sent notifications please consider adding manual_trigger to your codecov.yml, so it will look like codecov: notify: manual_trigger: true.
 >**Note**: Every command has its own different options that will be mentioned later in this doc. Codecov will try to load these options from your CI environment variables, if not, it will try to load them from git, if not found, you may need to add them manually. 
 
 

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/README.md

@@ -124,7 +124,7 @@ Codecov-cli supports user input. These inputs, along with their descriptions and
 | `get-report-results` | Used for local upload. It asks codecov to provide you the report results you calculated with the previous command. 
 | `pr-base-picking` | Tells codecov that you want to explicitly define a base for your PR
 | `upload-process` | A wrapper for 3 commands. Create-commit, create-report and do-upload. You can use this command to upload to codecov instead of using the previosly mentioned commands.
-| `send-notification` | A command that tells Codecov that you finished uploading and you want to be sent notifications. To disable automatically sent notifications please consider adding manual_trigger to your codecov.yml, so it will look like codecov: notify: manual_trigger: true. 
+| `send-notifications` | A command that tells Codecov that you finished uploading and you want to be sent notifications. To disable automatically sent notifications please consider adding manual_trigger to your codecov.yml, so it will look like codecov: notify: manual_trigger: true.
 >**Note**: Every command has its own different options that will be mentioned later in this doc. Codecov will try to load these options from your CI environment variables, if not, it will try to load them from git, if not found, you may need to add them manually. 
 
 

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/commands/upload.py

@@ -63,7 +63,7 @@ _global_upload_options = [
     ),
     click.option(
         "--disable-search",
-        help="Disable search for coverage files. This is helpful when specifying what files you want to uload with the --file option.",
+        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,
     ),
@@ -164,6 +164,14 @@ _global_upload_options = [
         default="coverage",
         type=click.Choice(["coverage", "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",
+    ),
 ]
 
 
@@ -181,29 +189,31 @@ def do_upload(
     ctx: click.Context,
     commit_sha: str,
     report_code: str,
+    branch: typing.Optional[str],
     build_code: typing.Optional[str],
     build_url: typing.Optional[str],
-    job_code: typing.Optional[str],
+    disable_file_fixes: bool,
+    disable_search: bool,
+    dry_run: bool,
     env_vars: typing.Dict[str, str],
+    fail_on_error: bool,
+    files_search_exclude_folders: typing.List[pathlib.Path],
+    files_search_explicitly_listed_files: typing.List[pathlib.Path],
+    files_search_root_folder: pathlib.Path,
     flags: typing.List[str],
+    git_service: typing.Optional[str],
+    handle_no_reports_found: bool,
+    job_code: typing.Optional[str],
     name: typing.Optional[str],
+    network_filter: typing.Optional[str],
+    network_prefix: typing.Optional[str],
     network_root_folder: pathlib.Path,
-    files_search_root_folder: pathlib.Path,
-    files_search_exclude_folders: typing.List[pathlib.Path],
-    files_search_explicitly_listed_files: typing.List[pathlib.Path],
-    disable_search: bool,
-    disable_file_fixes: bool,
-    token: typing.Optional[str],
     plugin_names: typing.List[str],
-    branch: typing.Optional[str],
-    slug: typing.Optional[str],
     pull_request_number: typing.Optional[str],
-    use_legacy_uploader: bool,
-    fail_on_error: bool,
-    dry_run: bool,
-    git_service: typing.Optional[str],
-    handle_no_reports_found: bool,
     report_type: str,
+    slug: typing.Optional[str],
+    token: typing.Optional[str],
+    use_legacy_uploader: bool,
 ):
     versioning_system = ctx.obj["versioning_system"]
     codecov_yaml = ctx.obj["codecov_yaml"] or {}
@@ -214,29 +224,31 @@ def do_upload(
         "Starting upload processing",
         extra=dict(
             extra_log_attributes=dict(
-                upload_file_type=report_type,
-                commit_sha=commit_sha,
-                report_code=report_code,
+                branch=branch,
                 build_code=build_code,
                 build_url=build_url,
-                job_code=job_code,
+                commit_sha=commit_sha,
+                disable_file_fixes=disable_file_fixes,
+                disable_search=disable_search,
+                enterprise_url=enterprise_url,
                 env_vars=env_vars,
+                files_search_exclude_folders=files_search_exclude_folders,
+                files_search_explicitly_listed_files=files_search_explicitly_listed_files,
+                files_search_root_folder=files_search_root_folder,
                 flags=flags,
+                git_service=git_service,
+                handle_no_reports_found=handle_no_reports_found,
+                job_code=job_code,
                 name=name,
+                network_filter=network_filter,
+                network_prefix=network_prefix,
                 network_root_folder=network_root_folder,
-                files_search_root_folder=files_search_root_folder,
-                files_search_exclude_folders=files_search_exclude_folders,
-                files_search_explicitly_listed_files=files_search_explicitly_listed_files,
                 plugin_names=plugin_names,
-                token=token,
-                branch=branch,
-                slug=slug,
                 pull_request_number=pull_request_number,
-                git_service=git_service,
-                enterprise_url=enterprise_url,
-                disable_search=disable_search,
-                disable_file_fixes=disable_file_fixes,
-                handle_no_reports_found=handle_no_reports_found,
+                report_code=report_code,
+                slug=slug,
+                token=token,
+                upload_file_type=report_type,
             )
         ),
     )
@@ -244,30 +256,32 @@ def do_upload(
         cli_config,
         versioning_system,
         ci_adapter,
-        upload_file_type=report_type,
-        commit_sha=commit_sha,
-        report_code=report_code,
+        branch=branch,
         build_code=build_code,
         build_url=build_url,
-        job_code=job_code,
+        commit_sha=commit_sha,
+        disable_file_fixes=disable_file_fixes,
+        disable_search=disable_search,
+        dry_run=dry_run,
+        enterprise_url=enterprise_url,
         env_vars=env_vars,
+        fail_on_error=fail_on_error,
+        files_search_exclude_folders=list(files_search_exclude_folders),
+        files_search_explicitly_listed_files=list(files_search_explicitly_listed_files),
+        files_search_root_folder=files_search_root_folder,
         flags=flags,
+        git_service=git_service,
+        handle_no_reports_found=handle_no_reports_found,
+        job_code=job_code,
         name=name,
+        network_filter=network_filter,
+        network_prefix=network_prefix,
         network_root_folder=network_root_folder,
-        files_search_root_folder=files_search_root_folder,
-        files_search_exclude_folders=list(files_search_exclude_folders),
-        files_search_explicitly_listed_files=list(files_search_explicitly_listed_files),
         plugin_names=plugin_names,
-        token=token,
-        branch=branch,
-        slug=slug,
         pull_request_number=pull_request_number,
+        report_code=report_code,
+        slug=slug,
+        token=token,
+        upload_file_type=report_type,
         use_legacy_uploader=use_legacy_uploader,
-        fail_on_error=fail_on_error,
-        dry_run=dry_run,
-        git_service=git_service,
-        enterprise_url=enterprise_url,
-        disable_search=disable_search,
-        handle_no_reports_found=handle_no_reports_found,
-        disable_file_fixes=disable_file_fixes,
     )

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/commands/upload_process.py

@@ -31,6 +31,8 @@ def upload_process(
     env_vars: typing.Dict[str, str],
     flags: typing.List[str],
     name: typing.Optional[str],
+    network_filter: typing.Optional[str],
+    network_prefix: typing.Optional[str],
     network_root_folder: pathlib.Path,
     files_search_root_folder: pathlib.Path,
     files_search_exclude_folders: typing.List[pathlib.Path],

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/helpers/request.py

@@ -47,15 +47,27 @@ def backoff_time(curr_retry):
     return 2 ** (curr_retry - 1)
 
 
+class RetryException(Exception):
+    ...
+
+
 def retry_request(func):
     def wrapper(*args, **kwargs):
         retry = 0
         while retry < MAX_RETRIES:
             try:
-                return func(*args, **kwargs)
+                response = func(*args, **kwargs)
+                if response.status_code == 502:
+                    logger.warning(
+                        "Response status code was 502.",
+                        extra=dict(extra_log_attributes=dict(retry=retry)),
+                    )
+                    raise RetryException
+                return response
             except (
                 requests.exceptions.ConnectionError,
                 requests.exceptions.Timeout,
+                RetryException,
             ) as exp:
                 logger.warning(
                     "Request failed. Retrying",

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/helpers/versioning_systems.py

@@ -38,10 +38,30 @@ def get_versioning_system() -> VersioningSystemInterface:
 class GitVersioningSystem(VersioningSystemInterface):
     @classmethod
     def is_available(cls):
-        return which("git") is not None
+        if which("git") is not None:
+            p = subprocess.run(
+                ["git", "rev-parse", "--show-toplevel"], capture_output=True
+            )
+            if p.stdout:
+                return True
+        return False
 
     def get_fallback_value(self, fallback_field: FallbackFieldEnum):
         if fallback_field == FallbackFieldEnum.commit_sha:
+            # here we will get the commit SHA of the latest commit
+            # that is NOT a merge commit
+            p = subprocess.run(
+                # List current commit parent's SHA
+                ["git", "rev-parse", "HEAD^@"],
+                capture_output=True,
+            )
+            parents_hash = p.stdout.decode().strip().splitlines()
+            if len(parents_hash) == 2:
+                # IFF the current commit is a merge commit it will have 2 parents
+                # We return the 2nd one - The commit that came from the branch merged into ours
+                return parents_hash[1]
+            # At this point we know the current commit is not a merge commit
+            # so we get it's SHA and return that
             p = subprocess.run(["git", "log", "-1", "--format=%H"], capture_output=True)
             if p.stdout:
                 return p.stdout.decode().strip()
@@ -56,7 +76,7 @@ class GitVersioningSystem(VersioningSystemInterface):
                 return branch_name if branch_name != "HEAD" else None
 
         if fallback_field == FallbackFieldEnum.slug:
-            # if there are multiple remotes, we will prioritize using the one called 'origin' if it exsits, else we will use the first one in 'git remote' list
+            # if there are multiple remotes, we will prioritize using the one called 'origin' if it exists, else we will use the first one in 'git remote' list
 
             p = subprocess.run(["git", "remote"], capture_output=True)
 
@@ -78,7 +98,7 @@ class GitVersioningSystem(VersioningSystemInterface):
             return parse_slug(remote_url)
 
         if fallback_field == FallbackFieldEnum.git_service:
-            # if there are multiple remotes, we will prioritize using the one called 'origin' if it exsits, else we will use the first one in 'git remote' list
+            # if there are multiple remotes, we will prioritize using the one called 'origin' if it exists, else we will use the first one in 'git remote' list
 
             p = subprocess.run(["git", "remote"], capture_output=True)
             if not p.stdout:

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/services/upload/__init__.py

@@ -25,32 +25,34 @@ def do_upload_logic(
     versioning_system: VersioningSystemInterface,
     ci_adapter: CIAdapterBase,
     *,
-    commit_sha: str,
-    report_code: str,
+    branch: typing.Optional[str],
     build_code: typing.Optional[str],
     build_url: typing.Optional[str],
-    job_code: typing.Optional[str],
+    commit_sha: str,
+    disable_file_fixes: bool = False,
+    disable_search: bool = False,
+    dry_run: bool = False,
+    enterprise_url: typing.Optional[str],
     env_vars: typing.Dict[str, str],
+    fail_on_error: bool = False,
+    files_search_exclude_folders: typing.List[Path],
+    files_search_explicitly_listed_files: typing.List[Path],
+    files_search_root_folder: Path,
     flags: typing.List[str],
+    git_service: typing.Optional[str],
+    handle_no_reports_found: bool = False,
+    job_code: typing.Optional[str],
     name: typing.Optional[str],
+    network_filter: typing.Optional[str],
+    network_prefix: typing.Optional[str],
     network_root_folder: Path,
-    files_search_root_folder: Path,
-    files_search_exclude_folders: typing.List[Path],
-    files_search_explicitly_listed_files: typing.List[Path],
     plugin_names: typing.List[str],
-    token: str,
-    branch: typing.Optional[str],
-    slug: typing.Optional[str],
     pull_request_number: typing.Optional[str],
+    report_code: str,
+    slug: typing.Optional[str],
+    token: str,
     upload_file_type: str = "coverage",
     use_legacy_uploader: bool = False,
-    fail_on_error: bool = False,
-    dry_run: bool = False,
-    git_service: typing.Optional[str],
-    enterprise_url: typing.Optional[str],
-    disable_search: bool = False,
-    handle_no_reports_found: bool = False,
-    disable_file_fixes: bool = False,
 ):
     if upload_file_type == "coverage":
         preparation_plugins = select_preparation_plugins(cli_config, plugin_names)
@@ -63,7 +65,12 @@ def do_upload_logic(
         disable_search,
         upload_file_type,
     )
-    network_finder = select_network_finder(versioning_system)
+    network_finder = select_network_finder(
+        versioning_system,
+        network_filter=network_filter,
+        network_prefix=network_prefix,
+        network_root_folder=network_root_folder,
+    )
     collector = UploadCollector(
         preparation_plugins, network_finder, file_selector, disable_file_fixes
     )

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/services/upload/file_finder.py

@@ -232,7 +232,7 @@ class FileFinder(object):
                 files_excluded_but_user_includes.append(str(file))
         if files_excluded_but_user_includes:
             logger.warning(
-                "Some files being explicitly added are found in the list of excluded files for upload.",
+                "Some files being explicitly added are found in the list of excluded files for upload. We are still going to search for the explicitly added files.",
                 extra=dict(
                     extra_log_attributes=dict(files=files_excluded_but_user_includes)
                 ),
@@ -246,7 +246,6 @@ class FileFinder(object):
                 self.search_root,
                 self.folders_to_ignore,
                 filename_include_regex=regex_patterns_to_include,
-                filename_exclude_regex=regex_patterns_to_exclude,
                 multipart_include_regex=multipart_include_regex,
             )
         )

codecov-cli-0.5.0/codecov_cli/services/upload/network_finder.py

@@ -0,0 +1,43 @@
+import pathlib
+import typing
+
+from codecov_cli.helpers.versioning_systems import VersioningSystemInterface
+
+
+class NetworkFinder(object):
+    def __init__(
+        self,
+        versioning_system: VersioningSystemInterface,
+        network_filter: typing.Optional[str],
+        network_prefix: typing.Optional[str],
+        network_root_folder: pathlib.Path,
+    ):
+        self.versioning_system = versioning_system
+        self.network_filter = network_filter
+        self.network_prefix = network_prefix
+        self.network_root_folder = network_root_folder
+
+    def find_files(self, ignore_filters=False) -> typing.List[str]:
+        files = self.versioning_system.list_relevant_files(self.network_root_folder)
+
+        if not ignore_filters:
+            if self.network_filter:
+                files = [file for file in files if file.startswith(self.network_filter)]
+            if self.network_prefix:
+                files = [self.network_prefix + file for file in files]
+
+        return files
+
+
+def select_network_finder(
+    versioning_system: VersioningSystemInterface,
+    network_filter: typing.Optional[str],
+    network_prefix: typing.Optional[str],
+    network_root_folder: pathlib.Path,
+):
+    return NetworkFinder(
+        versioning_system,
+        network_filter,
+        network_prefix,
+        network_root_folder,
+    )

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/services/upload/upload_collector.py

@@ -36,10 +36,10 @@ class UploadCollector(object):
         self.file_finder = file_finder
         self.disable_file_fixes = disable_file_fixes
 
-    def _produce_file_fixes_for_network(
-        self, network: typing.List[str]
+    def _produce_file_fixes(
+        self, files: typing.List[str]
     ) -> typing.List[UploadCollectionResultFileFixer]:
-        if not network or self.disable_file_fixes:
+        if not files or self.disable_file_fixes:
             return []
         # patterns that we don't need to specify a reason for
         empty_line_regex = re.compile(r"^\s*$")
@@ -94,7 +94,7 @@ class UploadCollector(object):
         }
 
         result = []
-        for filename in network:
+        for filename in files:
             for glob, fix_patterns in file_regex_patterns.items():
                 if fnmatch(filename, glob):
                     result.append(self._get_file_fixes(filename, fix_patterns))
@@ -150,21 +150,27 @@ class UploadCollector(object):
             prep.run_preparation(self)
         logger.debug("Collecting relevant files")
         network = self.network_finder.find_files()
-        files = self.file_finder.find_files()
-        logger.info(f"Found {len(files)} {report_type} files to upload")
-        if not files:
+        report_files = self.file_finder.find_files()
+        logger.info(f"Found {len(report_files)} {report_type} files to report")
+        if not report_files:
+            if report_type == "test_results":
+                error_message = "No JUnit XML reports found. Please review our documentation (https://docs.codecov.com/docs/test-result-ingestion-beta) to generate and upload the file."
+            else:
+                error_message = "No coverage reports found. Please make sure you're generating reports successfully."
             raise click.ClickException(
                 click.style(
-                    f"No {report_type} reports found. Please make sure you're generating reports successfully.",
+                    error_message,
                     fg="red",
                 )
             )
-        for file in files:
+        for file in report_files:
             logger.info(f"> {file}")
         return UploadCollectionResult(
             network=network,
-            files=files,
-            file_fixes=self._produce_file_fixes_for_network(network)
-            if report_type == "coverage"
-            else [],
+            files=report_files,
+            file_fixes=(
+                self._produce_file_fixes(self.network_finder.find_files(True))
+                if report_type == "coverage"
+                else []
+            ),
         )

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/codecov_cli/services/upload/upload_sender.py

@@ -51,6 +51,7 @@ class UploadSender(object):
             "name": name,
             "job_code": job_code,
             "version": codecov_cli_version,
+            "ci_service": ci_service,
         }
 
         # Data to upload to Codecov

{codecov-cli-0.4.8 → codecov-cli-0.5.0/codecov_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codecov-cli
-Version: 0.4.8
+Version: 0.5.0
 Summary: Codecov Command Line Interface
 Author: Codecov
 Author-email: support@codecov.io
@@ -134,7 +134,7 @@ Codecov-cli supports user input. These inputs, along with their descriptions and
 | `get-report-results` | Used for local upload. It asks codecov to provide you the report results you calculated with the previous command. 
 | `pr-base-picking` | Tells codecov that you want to explicitly define a base for your PR
 | `upload-process` | A wrapper for 3 commands. Create-commit, create-report and do-upload. You can use this command to upload to codecov instead of using the previosly mentioned commands.
-| `send-notification` | A command that tells Codecov that you finished uploading and you want to be sent notifications. To disable automatically sent notifications please consider adding manual_trigger to your codecov.yml, so it will look like codecov: notify: manual_trigger: true. 
+| `send-notifications` | A command that tells Codecov that you finished uploading and you want to be sent notifications. To disable automatically sent notifications please consider adding manual_trigger to your codecov.yml, so it will look like codecov: notify: manual_trigger: true.
 >**Note**: Every command has its own different options that will be mentioned later in this doc. Codecov will try to load these options from your CI environment variables, if not, it will try to load them from git, if not found, you may need to add them manually. 
 
 

{codecov-cli-0.4.8 → codecov-cli-0.5.0}/setup.py

@@ -10,7 +10,7 @@ with open(path.join(here, "README.md"), encoding="utf-8") as f:
 
 setup(
     name="codecov-cli",
-    version="0.4.8",
+    version="0.5.0",
     packages=find_packages(exclude=["contrib", "docs", "tests*"]),
     description="Codecov Command Line Interface",
     long_description=long_description,

codecov-cli-0.4.8/codecov_cli/services/upload/network_finder.py

@@ -1,21 +0,0 @@
-import pathlib
-import typing
-
-from codecov_cli.helpers.versioning_systems import VersioningSystemInterface
-
-
-class NetworkFinder(object):
-    def __init__(self, versioning_system: VersioningSystemInterface):
-        self.versioning_system = versioning_system
-
-    def find_files(
-        self,
-        network_root: typing.Optional[pathlib.Path] = None,
-        network_filter=None,
-        network_adjuster=None,
-    ) -> typing.List[str]:
-        return self.versioning_system.list_relevant_files(network_root)
-
-
-def select_network_finder(versioning_system: VersioningSystemInterface):
-    return NetworkFinder(versioning_system)