feat: adjust for tokenless v3

we are no longer sending the X-Tokenless-PR header and we are changing
the format of the contents of the X-Tokenless header

Signed-off-by: joseph-sentry <joseph.sawaya@sentry.io>

codecov_cli/commands/report.py

@@ -13,15 +13,6 @@
 @click.option(
     "--code", help="The code of the report. If unsure, leave default", default="default"
 )
-@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,
-)
 @global_options
 @click.pass_context
 def create_report(
@@ -32,7 +23,6 @@ def create_report(
     git_service: str,
     token: str,
     fail_on_error: bool,
-    pull_request_number: int,
 ):
     enterprise_url = ctx.obj.get("enterprise_url")
     logger.debug(
@@ -55,7 +45,6 @@ def create_report(
         git_service,
         token,
         enterprise_url,
-        pull_request_number,
         fail_on_error,
     )
     if not res.error:

codecov_cli/helpers/request.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from sys import exit
 from time import sleep
 
@@ -95,6 +96,15 @@ def get_token_header_or_fail(token: str) -> dict:
     return {"Authorization": f"token {token}"}
 
 
+def get_auth_header(token):
+    tokenless = os.environ.get("TOKENLESS", None)
+    if tokenless:
+        headers = {"X-Tokenless": tokenless}
+    else:
+        headers = get_token_header_or_fail(token)
+    return headers
+
+
 @retry_request
 def send_put_request(
     url: str,

codecov_cli/services/commit/__init__.py

@@ -2,10 +2,9 @@
 import typing
 
 from codecov_cli.helpers.config import CODECOV_API_URL
-from codecov_cli.helpers.encoder import decode_slug, encode_slug
-from codecov_cli.helpers.git import get_pull, is_fork_pr
+from codecov_cli.helpers.encoder import encode_slug
 from codecov_cli.helpers.request import (
-    get_token_header_or_fail,
+    get_auth_header,
     log_warnings_and_errors_if_any,
     send_post_request,
 )
@@ -43,15 +42,7 @@ def create_commit_logic(
 def send_commit_data(
     commit_sha, parent_sha, pr, branch, slug, token, service, enterprise_url
 ):
-    decoded_slug = decode_slug(slug)
-    pull_dict = get_pull(service, decoded_slug, pr) if not token else None
-    if is_fork_pr(pull_dict):
-        headers = {"X-Tokenless": pull_dict["head"]["slug"], "X-Tokenless-PR": pr}
-        branch = pull_dict["head"]["slug"] + ":" + branch
-        logger.info("The PR is happening in a forked repo. Using tokenless upload.")
-    else:
-        headers = get_token_header_or_fail(token)
-
+    headers = get_auth_header(token)
     data = {
         "commitid": commit_sha,
         "parent_commit_id": parent_sha,

codecov_cli/services/report/__init__.py

@@ -9,6 +9,7 @@
 from codecov_cli.helpers.encoder import decode_slug, encode_slug
 from codecov_cli.helpers.git import get_pull, is_fork_pr
 from codecov_cli.helpers.request import (
+    get_auth_header,
     get_token_header_or_fail,
     log_warnings_and_errors_if_any,
     request_result,
@@ -26,7 +27,6 @@ def create_report_logic(
     service: str,
     token: str,
     enterprise_url: str,
-    pull_request_number: int,
     fail_on_error: bool = False,
 ):
     encoded_slug = encode_slug(slug)
@@ -37,27 +37,16 @@ def create_report_logic(
         token,
         encoded_slug,
         enterprise_url,
-        pull_request_number,
     )
     log_warnings_and_errors_if_any(sending_result, "Report creating", fail_on_error)
     return sending_result
 
 
 def send_create_report_request(
-    commit_sha, code, service, token, encoded_slug, enterprise_url, pull_request_number
+    commit_sha, code, service, token, encoded_slug, enterprise_url
 ):
     data = {"code": code}
-    decoded_slug = decode_slug(encoded_slug)
-    pull_dict = (
-        get_pull(service, decoded_slug, pull_request_number) if not token else None
-    )
-    if is_fork_pr(pull_dict):
-        headers = {
-            "X-Tokenless": pull_dict["head"]["slug"],
-            "X-Tokenless-PR": pull_request_number,
-        }
-    else:
-        headers = get_token_header_or_fail(token)
+    headers = get_auth_header(token)
     upload_url = enterprise_url or CODECOV_API_URL
     url = f"{upload_url}/upload/{service}/{encoded_slug}/commits/{commit_sha}/reports"
     return send_post_request(url=url, headers=headers, data=data)

codecov_cli/services/upload/upload_sender.py

@@ -10,7 +10,7 @@
 from codecov_cli.helpers.encoder import encode_slug
 from codecov_cli.helpers.git import get_pull, is_fork_pr
 from codecov_cli.helpers.request import (
-    get_token_header_or_fail,
+    get_auth_header,
     send_post_request,
     send_put_request,
 )
@@ -54,18 +54,7 @@ def send_upload_data(
             "ci_service": ci_service,
         }
 
-        # Data to upload to Codecov
-        pull_dict = (
-            get_pull(git_service, slug, pull_request_number) if not token else None
-        )
-
-        if is_fork_pr(pull_dict):
-            headers = {
-                "X-Tokenless": pull_dict["head"]["slug"],
-                "X-Tokenless-PR": pull_request_number,
-            }
-        else:
-            headers = get_token_header_or_fail(token)
+        headers = get_auth_header(token)
         encoded_slug = encode_slug(slug)
         upload_url = enterprise_url or CODECOV_API_URL
         url, data = self.get_url_and_possibly_update_data(
@@ -100,7 +89,6 @@ def send_upload_data(
             extra=dict(extra_log_attributes=dict(response=resp_json_obj)),
         )
         put_url = resp_json_obj["raw_upload_location"]
-        logger.debug("Sending upload to storage")
         resp_from_storage = send_put_request(put_url, data=reports_payload)
         return resp_from_storage
 

tests/commands/test_process_test_results.py

@@ -44,7 +44,6 @@ def test_process_test_results(
 
     assert result.exit_code == 0
 
-
     mocked_post.assert_called_with(
         url="https://api.github.com/repos/fake/repo/issues/pull/comments",
         data={
@@ -58,7 +57,6 @@ def test_process_test_results(
     )
 
 
-
 def test_process_test_results_non_existent_file(mocker, tmpdir):
     tmp_file = tmpdir.mkdir("folder").join("summary.txt")
 
@@ -93,7 +91,7 @@ def test_process_test_results_non_existent_file(mocker, tmpdir):
     assert result.exit_code == 1
     expected_logs = [
         "ci service found",
-        'Some files were not found',
+        "Some files were not found",
     ]
     for log in expected_logs:
         assert log in result.output
@@ -182,7 +180,6 @@ def test_process_test_results_missing_ref(mocker, tmpdir):
         assert log in result.output
 
 
-
 def test_process_test_results_missing_step_summary(mocker, tmpdir):
     tmp_file = tmpdir.mkdir("folder").join("summary.txt")
 
@@ -221,4 +218,4 @@ def test_process_test_results_missing_step_summary(mocker, tmpdir):
         "Error: Error getting step summary file path from environment. Can't find GITHUB_STEP_SUMMARY environment variable.",
     ]
     for log in expected_logs:
-        assert log in result.output
+        assert log in result.output

tests/helpers/test_network_finder.py

@@ -12,40 +12,115 @@ def test_find_files(mocker, tmp_path):
     mocked_vs = MagicMock()
     mocked_vs.list_relevant_files.return_value = filenames
 
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter=None, network_prefix=None, network_root_folder=tmp_path).find_files() == filenames
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix="bello", network_root_folder=tmp_path).find_files(False) == filtered_filenames
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix="bello", network_root_folder=tmp_path).find_files(True) == filenames
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter=None,
+            network_prefix=None,
+            network_root_folder=tmp_path,
+        ).find_files()
+        == filenames
+    )
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix="bello",
+            network_root_folder=tmp_path,
+        ).find_files(False)
+        == filtered_filenames
+    )
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix="bello",
+            network_root_folder=tmp_path,
+        ).find_files(True)
+        == filenames
+    )
     mocked_vs.list_relevant_files.assert_called_with(tmp_path)
 
+
 def test_find_files_with_filter(mocker, tmp_path):
     filenames = ["hello/a.txt", "hello/c.txt", "bello/b.txt"]
     filtered_filenames = ["hello/a.txt", "hello/c.txt"]
 
     mocked_vs = MagicMock()
     mocked_vs.list_relevant_files.return_value = filenames
 
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix=None, network_root_folder=tmp_path).find_files() == filtered_filenames
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix="bello", network_root_folder=tmp_path).find_files(True) == filenames
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix=None,
+            network_root_folder=tmp_path,
+        ).find_files()
+        == filtered_filenames
+    )
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix="bello",
+            network_root_folder=tmp_path,
+        ).find_files(True)
+        == filenames
+    )
     mocked_vs.list_relevant_files.assert_called_with(tmp_path)
 
+
 def test_find_files_with_prefix(mocker, tmp_path):
     filenames = ["hello/a.txt", "hello/c.txt", "bello/b.txt"]
     filtered_filenames = ["hellohello/a.txt", "hellohello/c.txt", "hellobello/b.txt"]
 
     mocked_vs = MagicMock()
     mocked_vs.list_relevant_files.return_value = filenames
 
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter=None, network_prefix="hello", network_root_folder=tmp_path).find_files() == filtered_filenames
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix="bello", network_root_folder=tmp_path).find_files(True) == filenames
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter=None,
+            network_prefix="hello",
+            network_root_folder=tmp_path,
+        ).find_files()
+        == filtered_filenames
+    )
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix="bello",
+            network_root_folder=tmp_path,
+        ).find_files(True)
+        == filenames
+    )
     mocked_vs.list_relevant_files.assert_called_with(tmp_path)
 
+
 def test_find_files_with_filter_and_prefix(mocker, tmp_path):
     filenames = ["hello/a.txt", "hello/c.txt", "bello/b.txt"]
     filtered_filenames = ["bellohello/a.txt", "bellohello/c.txt"]
 
     mocked_vs = MagicMock()
     mocked_vs.list_relevant_files.return_value = filenames
 
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix="bello", network_root_folder=tmp_path).find_files() == filtered_filenames
-    assert NetworkFinder(versioning_system=mocked_vs, network_filter="hello", network_prefix="bello", network_root_folder=tmp_path).find_files(True) == filenames
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix="bello",
+            network_root_folder=tmp_path,
+        ).find_files()
+        == filtered_filenames
+    )
+    assert (
+        NetworkFinder(
+            versioning_system=mocked_vs,
+            network_filter="hello",
+            network_prefix="bello",
+            network_root_folder=tmp_path,
+        ).find_files(True)
+        == filenames
+    )
     mocked_vs.list_relevant_files.assert_called_with(tmp_path)

tests/helpers/test_upload_sender.py

@@ -1,4 +1,5 @@
 import json
+import os
 import re
 from pathlib import Path
 
@@ -231,19 +232,13 @@ def test_upload_sender_post_called_with_right_parameters_tokenless(
         mocked_storage_server,
         mocker,
     ):
-        headers = {"X-Tokenless": "user-forked/repo", "X-Tokenless-PR": "pr"}
-        mock_get_pull = mocker.patch(
-            "codecov_cli.services.upload.upload_sender.get_pull",
-            return_value={
-                "head": {"slug": "user-forked/repo"},
-                "base": {"slug": "org/repo"},
-            },
-        )
+        headers = {"X-Tokenless": "user:branch"}
         mocked_legacy_upload_endpoint.match = [
             matchers.json_params_matcher(request_data),
             matchers.header_matcher(headers),
         ]
 
+        os.environ["TOKENLESS"] = "user:branch"
         sending_result = UploadSender().send_upload_data(
             upload_collection, random_sha, None, **named_upload_data
         )
@@ -263,7 +258,6 @@ def test_upload_sender_post_called_with_right_parameters_tokenless(
         assert (
             post_req_made.headers.items() >= headers.items()
         )  # test dict is a subset of the other
-        mock_get_pull.assert_called()
 
     def test_upload_sender_put_called_with_right_parameters(
         self, mocked_responses, mocked_legacy_upload_endpoint, mocked_storage_server

tests/services/commit/test_commit_service.py

@@ -1,4 +1,5 @@
 import json
+import os
 import uuid
 
 import requests
@@ -177,6 +178,8 @@ def mock_request(*args, headers={}, **kwargs):
         "get",
         side_effect=mock_request,
     )
+
+    os.environ["TOKENLESS"] = "user:branch"
     res = send_commit_data(
         "commit_sha",
         "parent_sha",
@@ -193,7 +196,7 @@ def mock_request(*args, headers={}, **kwargs):
             "commitid": "commit_sha",
             "parent_commit_id": "parent_sha",
             "pullid": "1",
-            "branch": "user_forked_repo/codecov-cli:branch",
+            "branch": "branch",
         },
-        headers={"X-Tokenless": "user_forked_repo/codecov-cli", "X-Tokenless-PR": "1"},
+        headers={"X-Tokenless": "user:branch"},
     )