Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit fd87f23

Browse files
joseph-sentryjoseph-sentry
authored
deps: update shared (#1173)
1 parent c289bda commit fd87f23

File tree

12 files changed

+49
-44
lines changed

12 files changed

+49
-44
lines changed

‎graphql_api/tests/test_test_analytics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __call__(self, updated_at: datetime.datetime) -> dict[str, Any]:
5151

5252
@pytest.fixture
5353
def mock_storage(mocker):
54-
m = mocker.patch("utils.test_results.StorageService")
54+
m = mocker.patch("utils.test_results.get_appropriate_storage_service")
5555
storage_server = MemoryStorageService({})
5656
m.return_value = storage_server
5757
yield storage_server

‎requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ freezegun
2525
google-cloud-pubsub
2626
gunicorn>=22.0.0
2727
https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
28-
https://github.com/codecov/shared/archive/47fa7fd405cd4a37ab6df9f200d6b600795f2786.tar.gz#egg=shared
28+
https://github.com/codecov/shared/archive/fd58134d9f15bce28917f68bda9e740dd9fe32ff.tar.gz#egg=shared
2929
https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz
3030
idna>=3.7
3131
minio

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ sentry-sdk[celery]==2.13.0
419419
# shared
420420
setproctitle==1.1.10
421421
# via -r requirements.in
422-
shared @ https://github.com/codecov/shared/archive/47fa7fd405cd4a37ab6df9f200d6b600795f2786.tar.gz
422+
shared @ https://github.com/codecov/shared/archive/fd58134d9f15bce28917f68bda9e740dd9fe32ff.tar.gz
423423
# via -r requirements.in
424424
simplejson==3.17.2
425425
# via -r requirements.in

‎staticanalysis/tests/test_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
def test_simple_static_analysis_call_no_uploads_yet(db, mocker):
1717
mocked_task_service = mocker.patch.object(TaskService, "schedule_task")
1818
mocked_presigned_put = mocker.patch(
19-
"shared.api_archive.archive.StorageService.create_presigned_put",
19+
"shared.storage.MinioStorageService.create_presigned_put",
2020
return_value="banana.txt",
2121
)
2222
commit = CommitFactory.create(repository__active=True)

‎upload/tests/test_serializers.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_fake_upload_with_flags():
4646

4747
def test_serialize_upload(transactional_db, mocker):
4848
mocker.patch(
49-
"shared.api_archive.archive.StorageService.create_presigned_put",
49+
"shared.storage.MinioStorageService.create_presigned_put",
5050
return_value="presigned put",
5151
)
5252
fake_upload = get_fake_upload()
@@ -63,7 +63,7 @@ def test_serialize_upload(transactional_db, mocker):
6363

6464
def test_upload_serializer_contains_expected_fields_no_flags(transactional_db, mocker):
6565
mocker.patch(
66-
"shared.api_archive.archive.StorageService.create_presigned_put",
66+
"shared.storage.MinioStorageService.create_presigned_put",
6767
return_value="presigned put",
6868
)
6969
upload = get_fake_upload()
@@ -90,7 +90,7 @@ def test_upload_serializer_contains_expected_fields_with_flags(
9090
transactional_db, mocker
9191
):
9292
mocker.patch(
93-
"shared.api_archive.archive.StorageService.create_presigned_put",
93+
"shared.storage.MinioStorageService.create_presigned_put",
9494
return_value="presigned put",
9595
)
9696
upload = get_fake_upload_with_flags()
@@ -114,6 +114,10 @@ def test_upload_serializer_contains_expected_fields_with_flags(
114114

115115

116116
def test_upload_serializer_null_build_url_empty_flags(transactional_db, mocker):
117+
mocker.patch(
118+
"shared.storage.MinioStorageService.create_presigned_put",
119+
return_value="presigned put",
120+
)
117121
data = {
118122
"ci_url": None,
119123
"flags": [],
@@ -128,7 +132,7 @@ def test_upload_serializer_null_build_url_empty_flags(transactional_db, mocker):
128132

129133
def test__create_existing_flags_map(transactional_db, mocker):
130134
mocker.patch(
131-
"shared.api_archive.archive.StorageService.create_presigned_put",
135+
"shared.storage.MinioStorageService.create_presigned_put",
132136
return_value="presigned put",
133137
)
134138
upload = get_fake_upload_with_flags()

‎upload/tests/test_upload_download.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_invalid_repo(self):
6969
assert response.status_code == 404
7070

7171
@patch("shared.api_archive.archive.ArchiveService.get_archive_hash")
72-
@patch("shared.api_archive.archive.StorageService.create_presigned_get")
72+
@patch("shared.storage.MinioStorageService.create_presigned_get")
7373
def test_invalid_archive_path(self, create_presigned_get, get_archive_hash):
7474
create_presigned_get.side_effect = [
7575
minio.error.S3Error(
@@ -93,7 +93,7 @@ def test_invalid_archive_path(self, create_presigned_get, get_archive_hash):
9393
assert response.status_code == 404
9494

9595
@patch("shared.api_archive.archive.ArchiveService.get_archive_hash")
96-
@patch("shared.api_archive.archive.StorageService.create_presigned_get")
96+
@patch("shared.storage.MinioStorageService.create_presigned_get")
9797
def test_valid_repo_archive_path(self, create_presigned_get, get_archive_hash):
9898
create_presigned_get.return_value = "presigned-url"
9999
get_archive_hash.return_value = "hasssshhh"

‎upload/tests/views/test_bundle_analysis.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
2424
"upload.views.bundle_analysis.BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER.labels"
2525
)
2626
create_presigned_put = mocker.patch(
27-
"shared.api_archive.archive.StorageService.create_presigned_put",
27+
"shared.storage.MinioStorageService.create_presigned_put",
2828
return_value="test-presigned-put",
2929
)
3030

@@ -112,7 +112,7 @@ def test_upload_bundle_analysis_success_shelter(db, client, mocker, mock_redis):
112112
"upload.views.bundle_analysis.BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER.labels"
113113
)
114114
create_presigned_put = mocker.patch(
115-
"shared.api_archive.archive.StorageService.create_presigned_put",
115+
"shared.storage.MinioStorageService.create_presigned_put",
116116
return_value="test-presigned-put",
117117
)
118118

@@ -198,7 +198,7 @@ def test_upload_bundle_analysis_success_shelter(db, client, mocker, mock_redis):
198198
def test_upload_bundle_analysis_org_token(db, client, mocker, mock_redis):
199199
mocker.patch.object(TaskService, "upload")
200200
mocker.patch(
201-
"shared.api_archive.archive.StorageService.create_presigned_put",
201+
"shared.storage.MinioStorageService.create_presigned_put",
202202
return_value="test-presigned-put",
203203
)
204204
mock_metrics = mocker.patch(
@@ -236,7 +236,7 @@ def test_upload_bundle_analysis_org_token(db, client, mocker, mock_redis):
236236
def test_upload_bundle_analysis_existing_commit(db, client, mocker, mock_redis):
237237
upload = mocker.patch.object(TaskService, "upload")
238238
mocker.patch(
239-
"shared.api_archive.archive.StorageService.create_presigned_put",
239+
"shared.storage.MinioStorageService.create_presigned_put",
240240
return_value="test-presigned-put",
241241
)
242242
mock_metrics = mocker.patch(
@@ -282,7 +282,7 @@ def test_upload_bundle_analysis_existing_commit(db, client, mocker, mock_redis):
282282
def test_upload_bundle_analysis_missing_args(db, client, mocker, mock_redis):
283283
upload = mocker.patch.object(TaskService, "upload")
284284
mocker.patch(
285-
"shared.api_archive.archive.StorageService.create_presigned_put",
285+
"shared.storage.MinioStorageService.create_presigned_put",
286286
return_value="test-presigned-put",
287287
)
288288
mock_metrics = mocker.patch(
@@ -331,7 +331,7 @@ def test_upload_bundle_analysis_missing_args(db, client, mocker, mock_redis):
331331
def test_upload_bundle_analysis_invalid_token(db, client, mocker, mock_redis):
332332
upload = mocker.patch.object(TaskService, "upload")
333333
mocker.patch(
334-
"shared.api_archive.archive.StorageService.create_presigned_put",
334+
"shared.storage.MinioStorageService.create_presigned_put",
335335
return_value="test-presigned-put",
336336
)
337337

@@ -361,7 +361,7 @@ def test_upload_bundle_analysis_github_oidc_auth(
361361
):
362362
mocker.patch.object(TaskService, "upload")
363363
mocker.patch(
364-
"shared.api_archive.archive.StorageService.create_presigned_put",
364+
"shared.storage.MinioStorageService.create_presigned_put",
365365
return_value="test-presigned-put",
366366
)
367367
mock_metrics = mocker.patch(
@@ -405,7 +405,7 @@ def test_upload_bundle_analysis_measurement_datasets_created(
405405
):
406406
mocker.patch.object(TaskService, "upload")
407407
mocker.patch(
408-
"shared.api_archive.archive.StorageService.create_presigned_put",
408+
"shared.storage.MinioStorageService.create_presigned_put",
409409
return_value="test-presigned-put",
410410
)
411411
mock_metrics = mocker.patch(
@@ -466,7 +466,7 @@ def test_upload_bundle_analysis_measurement_timeseries_disabled(
466466
):
467467
mocker.patch.object(TaskService, "upload")
468468
mocker.patch(
469-
"shared.api_archive.archive.StorageService.create_presigned_put",
469+
"shared.storage.MinioStorageService.create_presigned_put",
470470
return_value="test-presigned-put",
471471
)
472472
mock_metrics = mocker.patch(
@@ -525,7 +525,7 @@ def test_upload_bundle_analysis_no_repo(db, client, mocker, mock_redis):
525525
upload = mocker.patch.object(TaskService, "upload")
526526
mocker.patch.object(TaskService, "upload")
527527
mocker.patch(
528-
"shared.api_archive.archive.StorageService.create_presigned_put",
528+
"shared.storage.MinioStorageService.create_presigned_put",
529529
return_value="test-presigned-put",
530530
)
531531
mock_metrics = mocker.patch(
@@ -570,7 +570,7 @@ def test_upload_bundle_analysis_tokenless_success(db, client, mocker, mock_redis
570570
)
571571

572572
create_presigned_put = mocker.patch(
573-
"shared.api_archive.archive.StorageService.create_presigned_put",
573+
"shared.storage.MinioStorageService.create_presigned_put",
574574
return_value="test-presigned-put",
575575
)
576576

@@ -621,7 +621,7 @@ def test_upload_bundle_analysis_true_tokenless_success(db, client, mocker, mock_
621621
upload = mocker.patch.object(TaskService, "upload")
622622

623623
create_presigned_put = mocker.patch(
624-
"shared.api_archive.archive.StorageService.create_presigned_put",
624+
"shared.storage.MinioStorageService.create_presigned_put",
625625
return_value="test-presigned-put",
626626
)
627627

‎upload/tests/views/test_test_results.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_upload_test_results(db, client, mocker, mock_redis):
2222
upload = mocker.patch.object(TaskService, "upload")
2323
mock_prometheus_metrics = mocker.patch("upload.metrics.API_UPLOAD_COUNTER.labels")
2424
create_presigned_put = mocker.patch(
25-
"shared.api_archive.archive.StorageService.create_presigned_put",
25+
"shared.storage.MinioStorageService.create_presigned_put",
2626
return_value="test-presigned-put",
2727
)
2828

@@ -119,7 +119,7 @@ def test_upload_test_results(db, client, mocker, mock_redis):
119119
def test_test_results_org_token(db, client, mocker, mock_redis):
120120
mocker.patch.object(TaskService, "upload")
121121
mocker.patch(
122-
"shared.api_archive.archive.StorageService.create_presigned_put",
122+
"shared.storage.MinioStorageService.create_presigned_put",
123123
return_value="test-presigned-put",
124124
)
125125

@@ -149,7 +149,7 @@ def test_test_results_github_oidc_token(
149149
):
150150
mocker.patch.object(TaskService, "upload")
151151
mocker.patch(
152-
"shared.api_archive.archive.StorageService.create_presigned_put",
152+
"shared.storage.MinioStorageService.create_presigned_put",
153153
return_value="test-presigned-put",
154154
)
155155

@@ -180,7 +180,7 @@ def test_test_results_github_oidc_token(
180180
def test_test_results_upload_token_not_required(db, client, mocker, mock_redis):
181181
mocker.patch.object(TaskService, "upload")
182182
mocker.patch(
183-
"shared.api_archive.archive.StorageService.create_presigned_put",
183+
"shared.storage.MinioStorageService.create_presigned_put",
184184
return_value="test-presigned-put",
185185
)
186186

@@ -230,7 +230,7 @@ def test_upload_test_results_no_repo(db, client, mocker, mock_redis):
230230
upload = mocker.patch.object(TaskService, "upload")
231231
mocker.patch.object(TaskService, "upload")
232232
mocker.patch(
233-
"shared.api_archive.archive.StorageService.create_presigned_put",
233+
"shared.storage.MinioStorageService.create_presigned_put",
234234
return_value="test-presigned-put",
235235
)
236236

@@ -256,7 +256,7 @@ def test_upload_test_results_no_repo(db, client, mocker, mock_redis):
256256
def test_upload_test_results_missing_args(db, client, mocker, mock_redis):
257257
upload = mocker.patch.object(TaskService, "upload")
258258
mocker.patch(
259-
"shared.api_archive.archive.StorageService.create_presigned_put",
259+
"shared.storage.MinioStorageService.create_presigned_put",
260260
return_value="test-presigned-put",
261261
)
262262

@@ -292,7 +292,7 @@ def test_upload_test_results_missing_args(db, client, mocker, mock_redis):
292292
def test_upload_test_results_missing_branch_no_commit(db, client, mocker, mock_redis):
293293
upload = mocker.patch.object(TaskService, "upload")
294294
mocker.patch(
295-
"shared.api_archive.archive.StorageService.create_presigned_put",
295+
"shared.storage.MinioStorageService.create_presigned_put",
296296
return_value="test-presigned-put",
297297
)
298298

@@ -321,7 +321,7 @@ def test_upload_test_results_missing_branch_no_commit(db, client, mocker, mock_r
321321
def test_upload_test_results_branch_none_no_commit(db, client, mocker, mock_redis):
322322
upload = mocker.patch.object(TaskService, "upload")
323323
mocker.patch(
324-
"shared.api_archive.archive.StorageService.create_presigned_put",
324+
"shared.storage.MinioStorageService.create_presigned_put",
325325
return_value="test-presigned-put",
326326
)
327327

@@ -353,7 +353,7 @@ def test_update_repo_fields_when_upload_is_triggered(
353353
) -> None:
354354
mocker.patch.object(TaskService, "upload")
355355
mocker.patch(
356-
"shared.api_archive.archive.StorageService.create_presigned_put",
356+
"shared.storage.MinioStorageService.create_presigned_put",
357357
return_value="test-presigned-put",
358358
)
359359

@@ -382,7 +382,7 @@ def test_update_repo_fields_when_upload_is_triggered(
382382
def test_upload_test_results_file_not_found(db, client, mocker, mock_redis):
383383
upload = mocker.patch.object(TaskService, "upload")
384384
create_presigned_put = mocker.patch(
385-
"shared.api_archive.archive.StorageService.create_presigned_put",
385+
"shared.storage.MinioStorageService.create_presigned_put",
386386
return_value="test-presigned-put",
387387
)
388388

‎upload/tests/views/test_upload_coverage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def test_upload_coverage_post(db, mocker):
9898
CanDoCoverageUploadsPermission, "has_permission", return_value=True
9999
)
100100
presigned_put_mock = mocker.patch(
101-
"shared.api_archive.archive.StorageService.create_presigned_put",
101+
"shared.storage.MinioStorageService.create_presigned_put",
102102
return_value="presigned put",
103103
)
104104
upload_task_mock = mocker.patch(
@@ -197,7 +197,7 @@ def test_upload_coverage_post_shelter(db, mocker):
197197
CanDoCoverageUploadsPermission, "has_permission", return_value=True
198198
)
199199
presigned_put_mock = mocker.patch(
200-
"shared.api_archive.archive.StorageService.create_presigned_put",
200+
"shared.storage.MinioStorageService.create_presigned_put",
201201
return_value="presigned put",
202202
)
203203
upload_task_mock = mocker.patch(

‎upload/tests/views/test_uploads.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def test_uploads_post(db, mocker, mock_redis):
207207
CanDoCoverageUploadsPermission, "has_permission", return_value=True
208208
)
209209
presigned_put_mock = mocker.patch(
210-
"shared.api_archive.archive.StorageService.create_presigned_put",
210+
"shared.storage.MinioStorageService.create_presigned_put",
211211
return_value="presigned put",
212212
)
213213
upload_task_mock = mocker.patch(
@@ -307,7 +307,7 @@ def test_uploads_post(db, mocker, mock_redis):
307307
)
308308
def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_sent):
309309
presigned_put_mock = mocker.patch(
310-
"shared.api_archive.archive.StorageService.create_presigned_put",
310+
"shared.storage.MinioStorageService.create_presigned_put",
311311
return_value="presigned put",
312312
)
313313
upload_task_mock = mocker.patch(
@@ -452,7 +452,7 @@ def test_uploads_post_token_required_auth_check(
452452
upload_token_required_for_public_repos,
453453
):
454454
presigned_put_mock = mocker.patch(
455-
"shared.api_archive.archive.StorageService.create_presigned_put",
455+
"shared.storage.MinioStorageService.create_presigned_put",
456456
return_value="presigned put",
457457
)
458458
upload_task_mock = mocker.patch(
@@ -600,7 +600,7 @@ def test_uploads_post_github_oidc_auth(
600600
mock_redis,
601601
):
602602
presigned_put_mock = mocker.patch(
603-
"shared.api_archive.archive.StorageService.create_presigned_put",
603+
"shared.storage.MinioStorageService.create_presigned_put",
604604
return_value="presigned put",
605605
)
606606
upload_task_mock = mocker.patch(
@@ -726,7 +726,7 @@ def test_uploads_post_shelter(db, mocker, mock_redis):
726726
CanDoCoverageUploadsPermission, "has_permission", return_value=True
727727
)
728728
presigned_put_mock = mocker.patch(
729-
"shared.api_archive.archive.StorageService.create_presigned_put",
729+
"shared.storage.MinioStorageService.create_presigned_put",
730730
return_value="presigned put",
731731
)
732732
mocker.patch("upload.views.uploads.trigger_upload_task", return_value=True)
@@ -883,7 +883,7 @@ def test_uploads_post_github_enterprise_oidc_auth_jwks_url(
883883
analytics_service_mock,
884884
):
885885
self.mocker.patch(
886-
"shared.api_archive.archive.StorageService.create_presigned_put",
886+
"shared.storage.MinioStorageService.create_presigned_put",
887887
return_value="presigned put",
888888
)
889889
self.mocker.patch("upload.views.uploads.trigger_upload_task", return_value=True)
@@ -941,7 +941,7 @@ def test_uploads_post_github_enterprise_oidc_auth_no_url(
941941
):
942942
mock_config_helper(self.mocker, configs={"github_enterprise.url": None})
943943
self.mocker.patch(
944-
"shared.api_archive.archive.StorageService.create_presigned_put",
944+
"shared.storage.MinioStorageService.create_presigned_put",
945945
return_value="presigned put",
946946
)
947947
self.mocker.patch("upload.views.uploads.trigger_upload_task", return_value=True)

0 commit comments

Comments
 (0)