Skip to content

Commit ac20da0

Browse files
mikethemanmiketheman
authored
chore: remove calls to JournalEntry.submitted_from (#13751)
* chore: remove calls to `JournalEntry.submitted_from` We don't really need this data, so stop storing it. A separate PR will provide a migration to drop the column. Signed-off-by: Mike Fiedler <[email protected]> * make translations Signed-off-by: Mike Fiedler <[email protected]> --------- Signed-off-by: Mike Fiedler <[email protected]>
1 parent 5175a95 commit ac20da0

File tree

21 files changed

+55
-177
lines changed

21 files changed

+55
-177
lines changed

‎tests/unit/admin/views/test_journals.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,3 @@ def test_query_term_version(self, db_request):
119119
"journals": [journals[0]],
120120
"query": f"version:{journals[0].version}",
121121
}
122-
123-
def test_query_term_ip(self, db_request):
124-
ipv4 = "10.6.6.6"
125-
ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"
126-
journals0 = sorted(
127-
[JournalEntryFactory.create(submitted_from=ipv4) for _ in range(10)],
128-
key=lambda j: (j.submitted_date, j.id),
129-
reverse=True,
130-
)
131-
journals1 = sorted(
132-
[JournalEntryFactory.create(submitted_from=ipv6) for _ in range(10)],
133-
key=lambda j: (j.submitted_date, j.id),
134-
reverse=True,
135-
)
136-
137-
db_request.GET["q"] = f"ip:{ipv4}"
138-
result = views.journals_list(db_request)
139-
140-
assert result == {"journals": journals0, "query": f"ip:{ipv4}"}
141-
142-
db_request.GET["q"] = f"ip:{ipv6}"
143-
result = views.journals_list(db_request)
144-
145-
assert result == {"journals": journals1, "query": f"ip:{ipv6}"}

‎tests/unit/forklift/test_legacy.py

Lines changed: 14 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,16 +1472,12 @@ def storage_service_store(path, file_path, *, meta):
14721472
.order_by("submitted_date", "id")
14731473
.all()
14741474
)
1475-
assert [
1476-
(j.name, j.version, j.action, j.submitted_by, j.submitted_from)
1477-
for j in journals
1478-
] == [
1475+
assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
14791476
(
14801477
release.project.name,
14811478
release.version,
14821479
f"add source file {filename}",
14831480
user,
1484-
db_request.remote_addr,
14851481
)
14861482
]
14871483

@@ -2118,26 +2114,11 @@ def test_upload_succeeds_custom_project_size_limit(
21182114
.order_by("submitted_date", "id")
21192115
.all()
21202116
)
2121-
assert [
2122-
(j.name, j.version, j.action, j.submitted_by, j.submitted_from)
2123-
for j in journals
2124-
] == [
2125-
("example", None, "create", user, db_request.remote_addr),
2126-
(
2127-
"example",
2128-
None,
2129-
f"add Owner {user.username}",
2130-
user,
2131-
db_request.remote_addr,
2132-
),
2133-
("example", "1.0", "new release", user, db_request.remote_addr),
2134-
(
2135-
"example",
2136-
"1.0",
2137-
"add source file example-1.0.tar.gz",
2138-
user,
2139-
db_request.remote_addr,
2140-
),
2117+
assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
2118+
("example", None, "create", user),
2119+
("example", None, f"add Owner {user.username}", user),
2120+
("example", "1.0", "new release", user),
2121+
("example", "1.0", "add source file example-1.0.tar.gz", user),
21412122
]
21422123

21432124
def test_upload_fails_with_previously_used_filename(
@@ -2768,16 +2749,12 @@ def storage_service_store(path, file_path, *, meta):
27682749
.order_by("submitted_date", "id")
27692750
.all()
27702751
)
2771-
assert [
2772-
(j.name, j.version, j.action, j.submitted_by, j.submitted_from)
2773-
for j in journals
2774-
] == [
2752+
assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
27752753
(
27762754
release.project.name,
27772755
release.version,
27782756
f"add cp34 file {filename}",
27792757
user,
2780-
db_request.remote_addr,
27812758
)
27822759
]
27832760

@@ -2902,16 +2879,12 @@ def storage_service_store(path, file_path, *, meta):
29022879
.order_by("submitted_date", "id")
29032880
.all()
29042881
)
2905-
assert [
2906-
(j.name, j.version, j.action, j.submitted_by, j.submitted_from)
2907-
for j in journals
2908-
] == [
2882+
assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
29092883
(
29102884
release.project.name,
29112885
release.version,
29122886
f"add cp34 file {filename}",
29132887
user,
2914-
db_request.remote_addr,
29152888
)
29162889
]
29172890

@@ -3167,23 +3140,18 @@ def test_upload_succeeds_creates_release(
31673140
.order_by("submitted_date", "id")
31683141
.all()
31693142
)
3170-
assert [
3171-
(j.name, j.version, j.action, j.submitted_by, j.submitted_from)
3172-
for j in journals
3173-
] == [
3143+
assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
31743144
(
31753145
release.project.name,
31763146
release.version,
31773147
"new release",
31783148
user,
3179-
db_request.remote_addr,
31803149
),
31813150
(
31823151
release.project.name,
31833152
release.version,
31843153
f"add source file {filename}",
31853154
user,
3186-
db_request.remote_addr,
31873155
),
31883156
]
31893157

@@ -3464,26 +3432,11 @@ def test_upload_succeeds_creates_project(
34643432
.order_by("submitted_date", "id")
34653433
.all()
34663434
)
3467-
assert [
3468-
(j.name, j.version, j.action, j.submitted_by, j.submitted_from)
3469-
for j in journals
3470-
] == [
3471-
("example", None, "create", user, db_request.remote_addr),
3472-
(
3473-
"example",
3474-
None,
3475-
f"add Owner {user.username}",
3476-
user,
3477-
db_request.remote_addr,
3478-
),
3479-
("example", "1.0", "new release", user, db_request.remote_addr),
3480-
(
3481-
"example",
3482-
"1.0",
3483-
"add source file example-1.0.tar.gz",
3484-
user,
3485-
db_request.remote_addr,
3486-
),
3435+
assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
3436+
("example", None, "create", user),
3437+
("example", None, f"add Owner {user.username}", user),
3438+
("example", "1.0", "new release", user),
3439+
("example", "1.0", "add source file example-1.0.tar.gz", user),
34873440
]
34883441

34893442
def test_upload_succeeds_with_signature(

‎tests/unit/manage/test_views.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3975,7 +3975,6 @@ def test_yank_project_release(self, monkeypatch, db_request):
39753975
assert entry.action == "yank release"
39763976
assert entry.version == release.version
39773977
assert entry.submitted_by == db_request.user
3978-
assert entry.submitted_from == db_request.remote_addr
39793978
assert db_request.session.flash.calls == [
39803979
pretend.call(f"Yanked release {release.version!r}", queue="success")
39813980
]
@@ -4129,7 +4128,6 @@ def test_unyank_project_release(self, monkeypatch, db_request):
41294128
assert entry.action == "unyank release"
41304129
assert entry.version == release.version
41314130
assert entry.submitted_by == db_request.user
4132-
assert entry.submitted_from == db_request.remote_addr
41334131

41344132
assert db_request.session.flash.calls == [
41354133
pretend.call(f"Un-yanked release {release.version!r}", queue="success")
@@ -4287,7 +4285,6 @@ def test_delete_project_release(self, monkeypatch, db_request):
42874285
assert entry.action == "remove release"
42884286
assert entry.version == release.version
42894287
assert entry.submitted_by == db_request.user
4290-
assert entry.submitted_from == db_request.remote_addr
42914288

42924289
assert db_request.session.flash.calls == [
42934290
pretend.call(f"Deleted release {release.version!r}", queue="success")
@@ -4474,7 +4471,6 @@ def test_delete_project_release_file(self, monkeypatch, db_request):
44744471
version=release.version,
44754472
action=f"remove file {release_file.filename}",
44764473
submitted_by=user,
4477-
submitted_from=db_request.remote_addr,
44784474
)
44794475
.one()
44804476
)
@@ -5460,7 +5456,6 @@ def test_change_role(self, db_request, monkeypatch):
54605456
assert entry.name == project.name
54615457
assert entry.action == "change Owner testuser to Maintainer"
54625458
assert entry.submitted_by == db_request.user
5463-
assert entry.submitted_from == db_request.remote_addr
54645459

54655460
def test_change_role_invalid_role_name(self, pyramid_request):
54665461
project = pretend.stub(name="foobar")
@@ -5578,7 +5573,6 @@ def test_delete_role(self, db_request, monkeypatch):
55785573
assert entry.name == project.name
55795574
assert entry.action == "remove Owner testuser"
55805575
assert entry.submitted_by == db_request.user
5581-
assert entry.submitted_from == db_request.remote_addr
55825576

55835577
def test_delete_missing_role(self, db_request):
55845578
project = ProjectFactory.create(name="foobar")
@@ -5674,7 +5668,6 @@ def test_delete_not_sole_owner_role(self, db_request, monkeypatch):
56745668
assert entry.name == project.name
56755669
assert entry.action == "remove Owner testuser"
56765670
assert entry.submitted_by == db_request.user
5677-
assert entry.submitted_from == db_request.remote_addr
56785671

56795672
def test_delete_non_owner_role(self, db_request):
56805673
project = ProjectFactory.create(name="foobar")

‎tests/unit/manage/views/test_teams.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,6 @@ def test_change_role(
838838
assert entry.name == organization_project.name
839839
assert entry.action == f"change Owner {organization_team.name} to Maintainer"
840840
assert entry.submitted_by == db_request.user
841-
assert entry.submitted_from == db_request.remote_addr
842841

843842
def test_change_role_invalid_role_name(self, pyramid_request, organization_project):
844843
pyramid_request.method = "POST"
@@ -1023,7 +1022,6 @@ def test_delete_role(
10231022
assert entry.name == organization_project.name
10241023
assert entry.action == f"remove Owner {organization_team.name}"
10251024
assert entry.submitted_by == db_request.user
1026-
assert entry.submitted_from == db_request.remote_addr
10271025

10281026
def test_delete_missing_role(self, db_request, organization_project):
10291027
missing_role_id = str(uuid.uuid4())

‎tests/unit/utils/test_project.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ def test_remove_project(db_request, flash):
140140
)
141141
assert journal_entry.action == "remove project"
142142
assert journal_entry.submitted_by == db_request.user
143-
assert journal_entry.submitted_from == db_request.remote_addr
144143

145144

146145
@pytest.mark.parametrize("flash", [True, False])
@@ -164,7 +163,6 @@ def test_destroy_docs(db_request, flash):
164163
)
165164
assert journal_entry.action == "docdestroy"
166165
assert journal_entry.submitted_by == db_request.user
167-
assert journal_entry.submitted_from == db_request.remote_addr
168166

169167
assert not (
170168
db_request.db.query(Project)

‎warehouse/accounts/views.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,6 @@ def _error(message):
11271127
name=project.name,
11281128
action=f"accepted {desired_role} {user.username}",
11291129
submitted_by=request.user,
1130-
submitted_from=request.remote_addr,
11311130
)
11321131
)
11331132
project.record_event(

‎warehouse/admin/templates/admin/journals/list.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="card-body">
2727
<form>
2828
<div class="input-group input-group-lg">
29-
<input name="q" type="text" class="form-control input-lg" placeholder="Search: supported terms are user: project: version: ip:"{% if query %} value="{{ query }}"{% endif %}>
29+
<input name="q" type="text" class="form-control input-lg" placeholder="Search: supported terms are user: project: version:"{% if query %} value="{{ query }}"{% endif %}>
3030
<div class="input-group-btn input-group-append">
3131
<button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
3232
</div>
@@ -44,7 +44,6 @@
4444
<th>Version</th>
4545
<th>Date</th>
4646
<th>Submitted By</th>
47-
<th>Submitted From</th>
4847
<th>Action</th>
4948
</tr>
5049
</thead>
@@ -55,13 +54,6 @@
5554
<td>{{ journal.version }}</td>
5655
<td>{{ journal.submitted_date }}</td>
5756
<td><a href="{{ request.route_path('admin.user.detail', username=journal.submitted_by.username) }}">{{ journal.submitted_by.username }}</a></td>
58-
<td>
59-
{% if journal.submitted_from %}
60-
<a href="{{ request.route_path('admin.journals.list', _query={'q': 'ip:' + journal.submitted_from}) }}">
61-
{{ journal.submitted_from }}
62-
</a>
63-
{% endif %}
64-
</td>
6557
<td>{{ journal.action }}</td>
6658
</tr>
6759
{% endfor %}

‎warehouse/admin/templates/admin/projects/detail.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ <h3 class="card-title">Journals</h3>
280280
<th>version</th>
281281
<th>date</th>
282282
<th>submitted_by</th>
283-
<th>submitted_from</th>
284283
<th>action</th>
285284
</tr>
286285
</thead>
@@ -291,7 +290,6 @@ <h3 class="card-title">Journals</h3>
291290
<td>{{ entry.version }}</td>
292291
<td>{{ entry.submitted_date }}</td>
293292
<td><a href="{{ request.route_path('admin.user.detail', username=entry.submitted_by.username) }}">{{ entry.submitted_by.username }}</a></td>
294-
<td>{{ entry.submitted_from }}</td>
295293
<td>{{ entry.action }}</td>
296294
</tr>
297295
{% endfor %}

‎warehouse/admin/templates/admin/projects/journals_list.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<th>Version</th>
4747
<th>Date</th>
4848
<th>Submitted By</th>
49-
<th>Submitted From</th>
5049
<th>Action</th>
5150
</tr>
5251
</thead>
@@ -58,7 +57,6 @@
5857
<td>{{ journal.version }}</td>
5958
<td>{{ journal.submitted_date }}</td>
6059
<td><a href="{{ request.route_path('admin.user.detail', username=journal.submitted_by.username) }}">{{ journal.submitted_by.username }}</a></td>
61-
<td>{{ journal.submitted_from }}</td>
6260
<td>{{ journal.action }}</td>
6361
</tr>
6462
{% endfor %}

‎warehouse/admin/templates/admin/projects/release_detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ <h3>Journals</h3>
103103
<tr>
104104
<td>{{ journal.action }}</td>
105105
<td>{{ journal.submitted_date|format_datetime() }}</td>
106-
<td>{{ journal.submitted_by.username }} from {{ journal.submitted_from }}</td>
106+
<td>{{ journal.submitted_by.username }}</td>
107107
</tr>
108108
{% endfor %}
109109
</tbody>

‎warehouse/admin/views/journals.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def journals_list(request):
5555
filters.append(JournalEntry.version.ilike(value))
5656
if field.lower() == "user":
5757
filters.append(JournalEntry._submitted_by.like(value))
58-
if field.lower() == "ip":
59-
filters.append(JournalEntry.submitted_from.ilike(value))
6058
else:
6159
filters.append(JournalEntry.name.ilike(term))
6260

‎warehouse/admin/views/projects.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ def add_role(project, request):
404404
name=project.name,
405405
action=f"add {role_name} {user.username}",
406406
submitted_by=request.user,
407-
submitted_from=request.remote_addr,
408407
)
409408
)
410409

@@ -455,7 +454,6 @@ def delete_role(project, request):
455454
name=project.name,
456455
action=f"remove {role.role_name} {role.user.username}",
457456
submitted_by=request.user,
458-
submitted_from=request.remote_addr,
459457
)
460458
)
461459

‎warehouse/admin/views/users.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ def _nuke_user(user, request):
207207
name=project.name,
208208
action="remove project",
209209
submitted_by=request.user,
210-
submitted_from=request.remote_addr,
211210
)
212211
)
213212
projects.delete(synchronize_session=False)
@@ -239,7 +238,6 @@ def _nuke_user(user, request):
239238
name=f"user:{user.username}",
240239
action="nuke user",
241240
submitted_by=request.user,
242-
submitted_from=request.remote_addr,
243241
)
244242
)
245243

‎warehouse/forklift/legacy.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,6 @@ def file_upload(request):
11641164
version=release.version,
11651165
action="new release",
11661166
submitted_by=request.user if request.user else None,
1167-
submitted_from=request.remote_addr,
11681167
)
11691168
)
11701169

@@ -1437,7 +1436,6 @@ def file_upload(request):
14371436
python_version=file_.python_version, filename=file_.filename
14381437
),
14391438
submitted_by=request.user if request.user else None,
1440-
submitted_from=request.remote_addr,
14411439
)
14421440
)
14431441

0 commit comments

Comments
 (0)