From afd37c6707e434c3fbffd429e93786d416e786b0 Mon Sep 17 00:00:00 2001 From: Nora Shapiro Date: Thu, 7 Nov 2024 16:12:36 -0800 Subject: [PATCH 1/2] flip default value on upload_token_required_for_public_repos --- graphql_api/tests/test_owner.py | 6 +++++- upload/tests/views/test_commits.py | 5 ++++- upload/tests/views/test_reports.py | 1 + upload/tests/views/test_uploads.py | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/graphql_api/tests/test_owner.py b/graphql_api/tests/test_owner.py index 8428755154..ef31591af9 100644 --- a/graphql_api/tests/test_owner.py +++ b/graphql_api/tests/test_owner.py @@ -982,7 +982,11 @@ def test_fetch_repos_ai_features_enabled_all_repos(self, get_config_mock): assert data["owner"]["aiEnabledRepos"] == ["b", "a"] def test_fetch_upload_token_required(self): - owner = OwnerFactory(username="sample-owner", service="github") + owner = OwnerFactory( + username="sample-owner", + service="github", + upload_token_required_for_public_repos=True, + ) query = """{ owner(username: "%s") { uploadTokenRequired diff --git a/upload/tests/views/test_commits.py b/upload/tests/views/test_commits.py index f764c044a4..b433ba8081 100644 --- a/upload/tests/views/test_commits.py +++ b/upload/tests/views/test_commits.py @@ -234,7 +234,10 @@ def test_create_commit_already_exists(db, client, mocker): @pytest.mark.parametrize("private", [True, False]) def test_commit_tokenless(db, client, mocker, branch, private): repository = RepositoryFactory.create( - private=private, author__username="codecov", name="the_repo" + private=private, + author__username="codecov", + name="the_repo", + author__upload_token_required_for_public_repos=True, ) mocked_call = mocker.patch.object(TaskService, "update_commit") diff --git a/upload/tests/views/test_reports.py b/upload/tests/views/test_reports.py index c0eb5b371d..22f1f25c34 100644 --- a/upload/tests/views/test_reports.py +++ b/upload/tests/views/test_reports.py @@ -161,6 +161,7 @@ def test_reports_post_tokenless(client, db, mocker, private, branch, branch_sent name="the_repo", author__username="codecov", author__service="github", + author__upload_token_required_for_public_repos=True, private=private, ) commit = CommitFactory(repository=repository) diff --git a/upload/tests/views/test_uploads.py b/upload/tests/views/test_uploads.py index 0fb8788424..a65af3fb28 100644 --- a/upload/tests/views/test_uploads.py +++ b/upload/tests/views/test_uploads.py @@ -307,6 +307,7 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_ author__username="codecov", author__service="github", private=private, + author__upload_token_required_for_public_repos=True, ) commit = CommitFactory(repository=repository) commit.branch = branch @@ -589,6 +590,7 @@ def test_uploads_post_github_oidc_auth( name="the_repo", author__username="codecov", author__service="github", + author__upload_token_required_for_public_repos=True, private=False, ) mock_jwt_decode.return_value = { @@ -861,6 +863,7 @@ def test_uploads_post_github_enterprise_oidc_auth_jwks_url( name="the_repo", author__username="codecov", author__service="github_enterprise", + author__upload_token_required_for_public_repos=True, private=False, ) mock_jwt_decode.return_value = { From 6ced17908313bfdef77e37b74afe327294cedfba Mon Sep 17 00:00:00 2001 From: Nora Shapiro Date: Thu, 14 Nov 2024 12:15:05 -0800 Subject: [PATCH 2/2] update shares sha --- requirements.in | 2 +- requirements.txt | 18 ++---------------- upload/tests/views/test_bundle_analysis.py | 5 ++++- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/requirements.in b/requirements.in index 3367f98090..3f0ff86386 100644 --- a/requirements.in +++ b/requirements.in @@ -20,7 +20,7 @@ factory-boy fakeredis freezegun https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem -https://github.com/codecov/shared/archive/26f0db073fe2d6355c227d032e1b27c3602a010c.tar.gz#egg=shared +https://github.com/codecov/shared/archive/9c31870de026a8a3f026f0753b1991e8c832fadb.tar.gz#egg=shared google-cloud-pubsub gunicorn>=22.0.0 https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz diff --git a/requirements.txt b/requirements.txt index a3d5fedfdd..844e507ff7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,6 @@ aiodataloader==0.4.0 # via -r requirements.in amqp==5.2.0 # via kombu -analytics-python==1.3.0b1 - # via shared annotated-types==0.7.0 # via pydantic anyio==3.6.1 @@ -33,8 +31,6 @@ attrs==20.3.0 # cattrs # ddtrace # jsonschema -backoff==1.6.0 - # via analytics-python billiard==4.2.0 # via celery boto3==1.20.25 @@ -259,8 +255,6 @@ minio==7.1.13 # shared mmh3==4.0.1 # via shared -monotonic==1.5 - # via analytics-python multidict==4.7.6 # via yarl nodeenv==1.5.0 @@ -371,7 +365,6 @@ pytest-mock==3.14.0 python-dateutil==2.9.0.post0 # via # -r requirements.in - # analytics-python # botocore # celery # django-postgres-extra @@ -384,9 +377,7 @@ python-redis-lock==4.0.0 # -r requirements.in # shared pytz==2022.1 - # via - # -r requirements.in - # shared + # via -r requirements.in pyyaml==6.0.1 # via # drf-spectacular @@ -403,7 +394,6 @@ regex==2023.12.25 requests==2.32.3 # via # -r requirements.in - # analytics-python # codecovopentelem # google-api-core # google-cloud-storage @@ -421,13 +411,12 @@ sentry-sdk[celery]==2.13.0 # shared setproctitle==1.1.10 # via -r requirements.in -shared @ https://github.com/codecov/shared/archive/26f0db073fe2d6355c227d032e1b27c3602a010c.tar.gz +shared @ https://github.com/codecov/shared/archive/9c31870de026a8a3f026f0753b1991e8c832fadb.tar.gz # via -r requirements.in simplejson==3.17.2 # via -r requirements.in six==1.16.0 # via - # analytics-python # click-repl # ddsketch # ddtrace @@ -461,8 +450,6 @@ tlslite-ng==0.8.0b1 # via shared toml==0.10.2 # via pre-commit -typing==3.7.4.3 - # via shared typing-extensions==4.6.2 # via # aiodataloader @@ -471,7 +458,6 @@ typing-extensions==4.6.2 # opentelemetry-sdk # pydantic # pydantic-core - # shared # stripe tzdata==2024.1 # via celery diff --git a/upload/tests/views/test_bundle_analysis.py b/upload/tests/views/test_bundle_analysis.py index e37bf13066..8c43959ca6 100644 --- a/upload/tests/views/test_bundle_analysis.py +++ b/upload/tests/views/test_bundle_analysis.py @@ -762,7 +762,10 @@ def test_upload_bundle_analysis_tokenless_mismatched_branch( upload = mocker.patch.object(TaskService, "upload") commit_sha = "6fd5b89357fc8cdf34d6197549ac7c6d7e5977ef" - repository = RepositoryFactory.create(private=False) + repository = RepositoryFactory.create( + private=False, + author__upload_token_required_for_public_repos=True, + ) CommitFactory.create(repository=repository, commitid=commit_sha, branch="main") client = APIClient()