Merge branch 'master' into dana/check-head-base-shas

Author: dana-yaish

codecov_cli/commands/base_picking.py

@@ -54,6 +54,7 @@ def pr_base_picking(
     token: typing.Optional[uuid.UUID],
     service: typing.Optional[str],
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting base picking process",
         extra=dict(
@@ -62,6 +63,7 @@ def pr_base_picking(
                 slug=slug,
                 token=token,
                 service=service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
@@ -72,4 +74,4 @@ def pr_base_picking(
         )
         return
 
-    base_picking_logic(base_sha, pr, slug, token, service)
+    base_picking_logic(base_sha, pr, slug, token, service, enterprise_url)

codecov_cli/commands/commit.py

@@ -75,6 +75,7 @@ def create_commit(
     token: typing.Optional[uuid.UUID],
     git_service: typing.Optional[str],
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting create commit process",
         extra=dict(
@@ -86,9 +87,17 @@ def create_commit(
                 slug=slug,
                 token=token,
                 service=git_service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
     create_commit_logic(
-        commit_sha, parent_sha, pull_request_number, branch, slug, token, git_service
+        commit_sha,
+        parent_sha,
+        pull_request_number,
+        branch,
+        slug,
+        token,
+        git_service,
+        enterprise_url,
     )

codecov_cli/commands/create_report_result.py

@@ -51,12 +51,19 @@ def create_report_results(
     git_service: str,
     token: uuid.UUID,
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Creating report results",
         extra=dict(
             extra_log_attributes=dict(
-                commit_sha=commit_sha, code=code, slug=slug, service=git_service
+                commit_sha=commit_sha,
+                code=code,
+                slug=slug,
+                service=git_service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
-    create_report_results_logic(commit_sha, code, slug, git_service, token)
+    create_report_results_logic(
+        commit_sha, code, slug, git_service, token, enterprise_url
+    )

codecov_cli/commands/empty_upload.py

@@ -52,6 +52,7 @@ def empty_upload(
     token: typing.Optional[uuid.UUID],
     git_service: typing.Optional[str],
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting empty upload process",
         extra=dict(
@@ -60,7 +61,8 @@ def empty_upload(
                 slug=slug,
                 token=token,
                 service=git_service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
-    return empty_upload_logic(commit_sha, slug, token, git_service)
+    return empty_upload_logic(commit_sha, slug, token, git_service, enterprise_url)

codecov_cli/commands/get_report_results.py

@@ -52,11 +52,16 @@ def get_report_results(
     git_service: str,
     token: uuid.UUID,
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Getting report results",
         extra=dict(
             extra_log_attributes=dict(
-                commit_sha=commit_sha, code=code, slug=slug, service=git_service
+                commit_sha=commit_sha,
+                code=code,
+                slug=slug,
+                service=git_service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
@@ -67,4 +72,5 @@ def get_report_results(
         encoded_slug=encoded_slug,
         service=git_service,
         token=token,
+        enterprise_url=enterprise_url,
     )

codecov_cli/commands/labelanalysis.py

@@ -6,6 +6,7 @@
 import requests
 
 from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+from codecov_cli.helpers.config import CODECOV_API_URL
 from codecov_cli.runners import get_runner
 from codecov_cli.runners.types import (
     LabelAnalysisRequestResult,
@@ -55,6 +56,7 @@ def label_analysis(
     runner_name: str,
     max_wait_time: str,
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting label analysis",
         extra=dict(
@@ -63,6 +65,7 @@ def label_analysis(
                 base_commit_sha=base_commit_sha,
                 token="NOTOKEN" if not token else (str(token)[:1] + 18 * "*"),
                 runner_name=runner_name,
+                enterprise_url=enterprise_url,
             )
         ),
     )
@@ -79,8 +82,8 @@ def label_analysis(
         raise click.ClickException(
             click.style("Unable to run label analysis", fg="red")
         )
-
-    url = "https://api.codecov.io/labels/labels-analysis"
+    upload_url = enterprise_url or CODECOV_API_URL
+    url = f"{upload_url}/labels/labels-analysis"
     token_header = f"Repotoken {token}"
 
     codecov_yaml = ctx.obj["codecov_yaml"] or {}
@@ -135,7 +138,7 @@ def label_analysis(
     time.sleep(2)
     while not has_result:
         resp_data = requests.get(
-            f"https://api.codecov.io/labels/labels-analysis/{eid}",
+            f"{upload_url}/labels/labels-analysis/{eid}",
             headers={"Authorization": token_header},
         )
         resp_json = resp_data.json()

codecov_cli/commands/report.py

@@ -50,15 +50,22 @@
 def create_report(
     ctx, commit_sha: str, code: str, slug: str, git_service: str, token: uuid.UUID
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting create report process",
         extra=dict(
             extra_log_attributes=dict(
-                commit_sha=commit_sha, code=code, slug=slug, service=git_service
+                commit_sha=commit_sha,
+                code=code,
+                slug=slug,
+                service=git_service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
-    res = create_report_logic(commit_sha, code, slug, git_service, token)
+    res = create_report_logic(
+        commit_sha, code, slug, git_service, token, enterprise_url
+    )
     if not res.error:
         logger.info(
             "Finished creating report successfully",

codecov_cli/commands/staticanalysis.py

@@ -50,6 +50,7 @@ def static_analysis(
     force,
     folders_to_exclude: typing.List[pathlib.Path],
 ):
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting Static Analysis processing",
         extra=dict(
@@ -61,6 +62,7 @@ def static_analysis(
                 token="NOTOKEN" if not token else (str(token)[:1] + 18 * "*"),
                 force=force,
                 folders_to_exclude=folders_to_exclude,
+                enterprise_url=enterprise_url,
             )
         ),
     )
@@ -74,5 +76,6 @@ def static_analysis(
             token,
             force,
             list(folders_to_exclude),
+            enterprise_url,
         )
     )

codecov_cli/commands/upload.py

@@ -203,6 +203,7 @@ def do_upload(
     codecov_yaml = ctx.obj["codecov_yaml"] or {}
     cli_config = codecov_yaml.get("cli", {})
     ci_adapter = ctx.obj.get("ci_adapter")
+    enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
         "Starting upload processing",
         extra=dict(
@@ -225,6 +226,7 @@ def do_upload(
                 slug=slug,
                 pull_request_number=pull_request_number,
                 git_service=git_service,
+                enterprise_url=enterprise_url,
             )
         ),
     )
@@ -257,4 +259,5 @@ def do_upload(
         fail_on_error=fail_on_error,
         dry_run=dry_run,
         git_service=git_service,
+        enterprise_url=enterprise_url,
     )

codecov_cli/helpers/config.py

@@ -5,6 +5,9 @@
 
 logger = logging.getLogger("codecovcli")
 
+CODECOV_API_URL = "https://api.codecov.io"
+LEGACY_CODECOV_API_URL = "https://codecov.io"
+
 
 def load_cli_config(codecov_yml_path: pathlib.Path):
     if codecov_yml_path.exists() and codecov_yml_path.is_file():