Merge branch 'master' into dana/base-picking-command

Author: dana-yaish

.github/workflows/ci.yml

@@ -48,11 +48,8 @@ jobs:
         pytest --cov
     - name: Dogfooding codecov-cli. Use codecov-cli to upload to codecov
       run: |
-        codecovcli --auto-load-params-from githubactions do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10
-    - name: Upload to codecov
-      run: |
-        pip install codecov
-        codecov -t ${{ secrets.CODECOV_TOKEN }} -F python3.10
+        codecovcli do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10
+
 
 
   create_release:

.github/workflows/python-package.yml

@@ -50,10 +50,10 @@ jobs:
         pytest --cov
     - name: Dogfooding codecov-cli. Use codecov-cli to upload to codecov
       run: |
-        codecovcli --auto-load-params-from githubactions do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10
-    - name: Upload to codecov
-      run: |
-        pip install codecov
-        codecov -t ${{ secrets.CODECOV_TOKEN }} -F python3.10
+        codecovcli do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10 --flag python3.10
+    # - name: Upload to codecov
+    #   run: |
+    #     pip install codecov
+    #     codecov -t ${{ secrets.CODECOV_TOKEN }} -F python3.10
 
 

codecov_cli/commands/report_result.py renamed to codecov_cli/commands/create_report_result.py

@@ -4,7 +4,7 @@
 import click
 
 from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
-from codecov_cli.services.report import get_report_results_logic
+from codecov_cli.services.report import create_report_results_logic
 
 logger = logging.getLogger("codecovcli")
 
@@ -42,7 +42,7 @@
     envvar="CODECOV_TOKEN",
 )
 @click.pass_context
-def get_report_results(
+def create_report_results(
     ctx,
     commit_sha: str,
     code: str,
@@ -51,11 +51,11 @@ def get_report_results(
     token: uuid.UUID,
 ):
     logger.debug(
-        "Getting report results",
+        "Creating report results",
         extra=dict(
             extra_log_attributes=dict(
                 commit_sha=commit_sha, code=code, slug=slug, service=service
             )
         ),
     )
-    get_report_results_logic(commit_sha, code, slug, service, token)
+    create_report_results_logic(commit_sha, code, slug, service, token)

codecov_cli/commands/get_report_results.py

@@ -0,0 +1,69 @@
+import logging
+import uuid
+
+import click
+
+from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+from codecov_cli.helpers.encoder import encode_slug
+from codecov_cli.services.report import send_reports_result_get_request
+
+logger = logging.getLogger("codecovcli")
+
+
+@click.command()
+@click.option(
+    "--commit-sha",
+    help="Commit SHA (with 40 chars)",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.commit_sha,
+    required=True,
+)
+@click.option(
+    "--code", help="The code of the report. If unsure, leave default", default="default"
+)
+@click.option(
+    "--slug",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.slug,
+    help="owner/repo slug used instead of the private repo token in Self-hosted",
+    envvar="CODECOV_SLUG",
+    required=True,
+)
+@click.option(
+    "--service",
+    help="Git service provider, e.g. github",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.service,
+)
+@click.option(
+    "-t",
+    "--token",
+    help="Codecov upload token",
+    type=click.UUID,
+    envvar="CODECOV_TOKEN",
+)
+@click.pass_context
+def get_report_results(
+    ctx,
+    commit_sha: str,
+    code: str,
+    slug: str,
+    service: str,
+    token: uuid.UUID,
+):
+    logger.debug(
+        "Getting report results",
+        extra=dict(
+            extra_log_attributes=dict(
+                commit_sha=commit_sha, code=code, slug=slug, service=service
+            )
+        ),
+    )
+    encoded_slug = encode_slug(slug)
+    send_reports_result_get_request(
+        commit_sha=commit_sha,
+        report_code=code,
+        encoded_slug=encoded_slug,
+        service=service,
+        token=token,
+    )

codecov_cli/commands/report.py

@@ -1,4 +1,5 @@
 import logging
+import uuid
 
 import click
 
@@ -27,16 +28,34 @@
     envvar="CODECOV_SLUG",
     required=True,
 )
+@click.option(
+    "--service",
+    help="Git service provider, e.g. github",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.service,
+)
+@click.option(
+    "-t",
+    "--token",
+    help="Codecov upload token",
+    type=click.UUID,
+    envvar="CODECOV_TOKEN",
+)
 @click.pass_context
-def create_report(ctx, commit_sha: str, code: str, slug: str):
+def create_report(
+    ctx, commit_sha: str, code: str, slug: str, service: str, token: uuid.UUID
+):
     logger.debug(
         "Starting create report process",
         extra=dict(
             extra_log_attributes=dict(
-                commit_sha=commit_sha,
-                code=code,
-                slug=slug,
+                commit_sha=commit_sha, code=code, slug=slug, service=service
             )
         ),
     )
-    create_report_logic(commit_sha, code, slug)
+    res = create_report_logic(commit_sha, code, slug, service, token)
+    if not res.error:
+        logger.info(
+            "Finished creating report successfully",
+            extra=dict(extra_log_attributes=dict(response=res.text)),
+        )

codecov_cli/commands/upload.py

@@ -18,7 +18,10 @@ def _turn_env_vars_into_dict(ctx, params, value):
 
 @click.command()
 @click.option(
+    "-C",
+    "--sha",
     "--commit-sha",
+    "commit_sha",
     help="Commit SHA (with 40 chars)",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.commit_sha,
@@ -37,13 +40,17 @@ def _turn_env_vars_into_dict(ctx, params, value):
     show_default="Current working directory",
 )
 @click.option(
+    "-s",
+    "--dir",
     "--coverage-files-search-root-folder",
+    "coverage_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",
     "coverage_files_search_exclude_folders",
     help="Folders where to search for coverage files",
@@ -52,6 +59,8 @@ def _turn_env_vars_into_dict(ctx, params, value):
     default=None,
 )
 @click.option(
+    "-f",
+    "--file",
     "--coverage-files-search-direct-file",
     "coverage_files_search_explicitly_listed_files",
     help="Explicit files to upload",
@@ -60,12 +69,17 @@ def _turn_env_vars_into_dict(ctx, params, value):
     default=None,
 )
 @click.option(
+    "-b",
+    "--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,
@@ -95,23 +109,50 @@ def _turn_env_vars_into_dict(ctx, params, value):
     fallback_field=FallbackFieldEnum.branch,
 )
 @click.option(
+    "-r",
     "--slug",
+    "slug",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.slug,
     help="owner/repo slug used instead of the private repo token in Self-hosted",
     envvar="CODECOV_SLUG",
 )
 @click.option(
+    "-P",
+    "--pr",
     "--pull-request-number",
+    "pull_request_number",
     help="Specify the pull request number mannually. Used to override pre-existing CI environment variables",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.pull_request_number,
 )
-@click.option("--env-var", "env_vars", multiple=True, callback=_turn_env_vars_into_dict)
-@click.option("--flag", "flags", multiple=True, default=[])
+@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(
+    "-Z",
+    "--fail-on-error",
+    "fail_on_error",
+    is_flag=True,
+    help="Exit with non-zero code in case of error uploading.",
+)
 @click.option("--use-new-uploader", "is_using_new_uploader", default=False)
 @click.pass_context
 def do_upload(
@@ -134,6 +175,7 @@ def do_upload(
     slug: typing.Optional[str],
     pull_request_number: typing.Optional[str],
     is_using_new_uploader: bool,
+    fail_on_error: bool,
 ):
     versioning_system = ctx.obj["versioning_system"]
     codecov_yaml = ctx.obj["codecov_yaml"] or {}
@@ -185,4 +227,5 @@ def do_upload(
         slug=slug,
         pull_request_number=pull_request_number,
         is_using_new_uploader=is_using_new_uploader,
+        fail_on_error=fail_on_error,
     )

codecov_cli/helpers/ci_adapters/__init__.py

@@ -1,16 +1,55 @@
+import logging
+
 from codecov_cli.helpers.ci_adapters.appveyor_ci import AppveyorCIAdapter
+from codecov_cli.helpers.ci_adapters.azure_pipelines import AzurePipelinesCIAdapter
+from codecov_cli.helpers.ci_adapters.bitbucket_ci import BitbucketAdapter
+from codecov_cli.helpers.ci_adapters.bitrise_ci import BitriseCIAdapter
+from codecov_cli.helpers.ci_adapters.buildkite import BuildkiteAdapter
 from codecov_cli.helpers.ci_adapters.circleci import CircleCICIAdapter
+from codecov_cli.helpers.ci_adapters.cirrus_ci import CirrusCIAdapter
+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.heroku import HerokuCIAdapter
+from codecov_cli.helpers.ci_adapters.jenkins import JenkinsAdapter
+from codecov_cli.helpers.ci_adapters.local import LocalAdapter
+from codecov_cli.helpers.ci_adapters.teamcity import TeamcityAdapter
+from codecov_cli.helpers.ci_adapters.travis_ci import TravisCIAdapter
+from codecov_cli.helpers.ci_adapters.woodpeckerci import WoodpeckerCIAdapter
+
+logger = logging.getLogger("codecovcli")
 
 
-def get_ci_adapter(provider_name):
-    if provider_name == "circleci":
-        return CircleCICIAdapter()
-    if provider_name == "githubactions":
-        return GithubActionsCIAdapter()
-    if provider_name == "gitlabCI":
-        return GitlabCIAdapter()
-    if provider_name == "appveyor":
-        return AppveyorCIAdapter()
+def get_ci_adapter(provider_name: str = None):
+    if provider_name:
+        for provider in get_ci_providers_list():
+            if provider.get_service_name().lower() == provider_name.lower():
+                return provider
+    else:
+        for provider in get_ci_providers_list():
+            if provider.detect():
+                logger.info(f"Found ci service {provider._get_service()}")
+                return provider
     return None
+
+
+def get_ci_providers_list():
+    return [
+        CircleCICIAdapter(),
+        GithubActionsCIAdapter(),
+        GitlabCIAdapter(),
+        BitbucketAdapter(),
+        BitriseCIAdapter(),
+        AppveyorCIAdapter(),
+        WoodpeckerCIAdapter(),
+        HerokuCIAdapter(),
+        DroneCIAdapter(),
+        BuildkiteAdapter(),
+        AzurePipelinesCIAdapter(),
+        JenkinsAdapter(),
+        CirrusCIAdapter(),
+        TeamcityAdapter(),
+        TravisCIAdapter(),
+        # local adapter should always be the last one
+        LocalAdapter(),
+    ]

codecov_cli/helpers/ci_adapters/appveyor_ci.py

@@ -4,6 +4,11 @@
 
 
 class AppveyorCIAdapter(CIAdapterBase):
+    # https://www.appveyor.com/docs/environment-variables/
+
+    def detect(self) -> bool:
+        return bool(os.getenv("CI")) and bool(os.getenv("APPVEYOR"))
+
     def _get_commit_sha(self):
         return os.getenv("APPVEYOR_PULL_REQUEST_HEAD_COMMIT") or os.getenv(
             "APPVEYOR_REPO_COMMIT"
@@ -44,3 +49,6 @@ def _get_branch(self):
 
     def _get_service(self):
         return "appveyor"
+
+    def get_service_name(self):
+        return "AppVeyor"