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

Author: dana-yaish

.github/workflows/ci.yml

@@ -18,10 +18,10 @@ jobs:
           pip install black==22.3.0 isort==5.10.1
       - name: Check linting with black
         run: |
-          black --check .
+          black --check codecov_cli
       - name: Check imports order with isort
         run: |
-          isort --check --profile=black .
+          isort --check --profile=black codecov_cli
 
 
   build:
@@ -38,6 +38,9 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: "3.10"
+    - name: Git Sumbodule Update
+      run: |
+        git pull --recurse-submodules
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/python-package.yml

@@ -14,16 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install black==22.3.0 isort==5.10.1
       - name: Check linting with black
         run: |
-          black --check .
+          black --check codecov_cli
       - name: Check imports order with isort
         run: |
-          isort --check --profile=black .
+          isort --check --profile=black codecov_cli -p staticcodecov_languages
 
 
   build:
@@ -35,6 +37,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
+        submodules: true
         fetch-depth: 2
     - name: Set up Python 3.10
       uses: actions/setup-python@v3

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "languages/treesitterpython"]
+	path = languages/treesitterpython
+	url = [email protected]:tree-sitter/tree-sitter-python.git
+[submodule "languages/treesitterjavascript"]
+	path = languages/treesitterjavascript
+	url = [email protected]:tree-sitter/tree-sitter-javascript.git

Makefile

@@ -0,0 +1,6 @@
+name ?= codecovcli
+
+lint:
+	pip install black==22.3.0 isort==5.10.1
+	black .
+	isort --profile black .

README.md

@@ -44,6 +44,20 @@ WIP
 
 # Development
 
+## Requirements
+
+To start, most of this package is a normal Python package. The main different thing is the static analysis tool that uses both git submodules and c code
+
+Before installing, one should pull the submodules with
+
+```
+git submodule update --init
+```
+
+The c code shouldn't require anything on most places, but it might ask you to install compilers and stuff. Most of the times you can find the instructions online given the error messsage
+
+## Guidelines
+
 There are a few guidelines when developing in this systems. We have a few notable folders:
 
 1. `commands` - It's the folder that interacts with the caller. This is where the commands themselves should live. They are not meant to do heavy lifting. They only do wiring, which is mostly parsing the input parameters

codecov_cli/commands/base_picking.py

@@ -72,9 +72,4 @@ def pr_base_picking(
         )
         return
 
-    res = base_picking_logic(base_sha, pr, slug, token, service)
-    if not res.error:
-        logger.info(
-            "Base picking finished successfully",
-            extra=dict(extra_log_attributes=dict(response=res.text)),
-        )
+    base_picking_logic(base_sha, pr, slug, token, service)

codecov_cli/commands/labelanalysis.py

@@ -0,0 +1,115 @@
+import logging
+import pprint
+import subprocess
+import time
+
+import click
+import requests
+
+from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+
+logger = logging.getLogger("codecovcli")
+
+
+@click.command()
+@click.option("--token", required=True)
+@click.option(
+    "--head-sha",
+    "head_commit_sha",
+    help="Commit SHA (with 40 chars)",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.commit_sha,
+    required=True,
+)
+@click.option(
+    "--base-sha",
+    "base_commit_sha",
+    help="Commit SHA (with 40 chars)",
+    cls=CodecovOption,
+    required=True,
+)
+def label_analysis(token, head_commit_sha, base_commit_sha):
+    url = "https://api.codecov.io/labels/labels-analysis"
+    token_header = f"Repotoken {token}"
+    # this needs to be more flexible to support multiple elements
+    runner = ThisRunner()
+    requested_labels = runner.collect_tests()
+    payload = {
+        "base_commit": base_commit_sha,
+        "head_commit": head_commit_sha,
+        "requested_labels": requested_labels,
+    }
+    try:
+        response = requests.post(
+            url, json=payload, headers={"Authorization": token_header}
+        )
+        if response.status_code >= 500:
+            raise click.ClickException("Sorry. Codecov is having problems")
+        if response.status_code >= 400:
+            logger.warning(
+                "Got a 4XX status code back from Codecov",
+                extra=dict(
+                    extra_log_attributes=dict(
+                        status_code=response.status_code, response_json=response.json()
+                    )
+                ),
+            )
+            raise click.ClickException(
+                "There is some problem with the submitted information"
+            )
+    except requests.RequestException:
+        raise click.ClickException(click.style("Unable to reach Codecov", fg="red"))
+    eid = response.json()["external_id"]
+    has_result = False
+    logger.info("Label request sent")
+    time.sleep(2)
+    while not has_result:
+        resp_data = requests.get(
+            f"https://api.codecov.io/labels/labels-analysis/{eid}",
+            headers={"Authorization": token_header},
+        )
+        resp_json = resp_data.json()
+        if resp_json["state"] == "finished":
+            runner.do_something_with_result(resp_data.json()["result"])
+            return
+        if resp_json["state"] == "error":
+            logger.error(
+                "Request had problems calculating",
+                extra=dict(extra_log_attributes=dict(resp_json=resp_json)),
+            )
+            return
+        logger.info("Waiting more time for result")
+        time.sleep(5)
+
+
+class ThisRunner(object):
+    def collect_tests(self):
+        return [
+            x
+            for x in subprocess.run(
+                ["python", "-m", "pytest", "-q", "--collect-only"],
+                capture_output=True,
+                check=True,
+            )
+            .stdout.decode()
+            .split()
+            if "::" in x
+        ]
+
+    def do_something_with_result(self, result):
+        command_array = ["python", "-m", "pytest", "--cov=./", "--cov-context=test"]
+        all_labels = (
+            result["absent_labels"]
+            + result["present_diff_labels"]
+            + result["global_level_labels"]
+        )
+        all_labels = set(all_labels)
+        all_labels = [x.rsplit("[", 1)[0] if "[" in x else x for x in all_labels]
+        # Not safe from the customer perspective, in general, probably.
+        # This is just to check it working
+        command_array.extend(all_labels)
+        logger.info(
+            "Running Pytest command",
+            extra=dict(extra_log_attributes=dict(command_array=command_array)),
+        )
+        subprocess.run(command_array, check=True)

codecov_cli/commands/staticanalysis.py

@@ -0,0 +1,45 @@
+import asyncio
+import pathlib
+
+import click
+
+from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+from codecov_cli.services.staticanalysis import run_analysis_entrypoint
+
+
+@click.command()
+@click.option(
+    "--foldertosearch",
+    default=".",
+    help="Folder to search",
+    type=click.Path(path_type=pathlib.Path),
+)
+@click.option(
+    "--numberprocesses", type=click.INT, default=None, help="number of processes to use"
+)
+@click.option("--pattern", default="*", help="file pattern to search for")
+@click.option("--force/--no-force", default=False)
+@click.option(
+    "--commit-sha",
+    "commit",
+    help="Commit SHA (with 40 chars)",
+    cls=CodecovOption,
+    fallback_field=FallbackFieldEnum.commit_sha,
+    required=True,
+)
+@click.option("--token")
+@click.pass_context
+def static_analysis(
+    ctx, foldertosearch, numberprocesses, pattern, commit, token, force
+):
+    return asyncio.run(
+        run_analysis_entrypoint(
+            ctx.obj["codecov_yaml"],
+            foldertosearch,
+            numberprocesses,
+            pattern,
+            commit,
+            token,
+            force,
+        )
+    )

codecov_cli/commands/upload.py

@@ -153,6 +153,13 @@ def _turn_env_vars_into_dict(ctx, params, value):
     is_flag=True,
     help="Exit with non-zero code in case of error uploading.",
 )
+@click.option(
+    "-d",
+    "--dry-run",
+    "dry_run",
+    is_flag=True,
+    help="Don't upload files to Codecov",
+)
 @click.option("--use-new-uploader", "is_using_new_uploader", default=False)
 @click.pass_context
 def do_upload(
@@ -176,6 +183,7 @@ def do_upload(
     pull_request_number: typing.Optional[str],
     is_using_new_uploader: bool,
     fail_on_error: bool,
+    dry_run: bool,
 ):
     versioning_system = ctx.obj["versioning_system"]
     codecov_yaml = ctx.obj["codecov_yaml"] or {}
@@ -228,4 +236,5 @@ def do_upload(
         pull_request_number=pull_request_number,
         is_using_new_uploader=is_using_new_uploader,
         fail_on_error=fail_on_error,
+        dry_run=dry_run,
     )

codecov_cli/helpers/ci_adapters/__init__.py

@@ -24,12 +24,14 @@ 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():
+                logger.debug(f"Using ci service from provider name: {provider_name}")
                 return provider
     else:
         for provider in get_ci_providers_list():
             if provider.detect():
-                logger.info(f"Found ci service {provider._get_service()}")
+                logger.info(f"ci service found: {provider._get_service()}")
                 return provider
+    logger.warning("No ci adapter found")
     return None