Skip to content

Commit 56a76ea

Browse files
keshav-spacekeshav-space
committed
Use proper purl type for Alpine in pipeline, models, and views
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 389eb91 commit 56a76ea

File tree

8 files changed

+95
-102
lines changed

8 files changed

+95
-102
lines changed

‎vulnerabilities/models.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
import hashlib
1111
import json
1212
import logging
13-
import typing
1413
from contextlib import suppress
1514
from functools import cached_property
16-
from typing import Optional
1715
from typing import Union
1816

1917
from cwe2.database import Database
@@ -56,7 +54,7 @@
5654
models.CharField.register_lookup(Trim)
5755

5856
# patch univers for missing entry
59-
RANGE_CLASS_BY_SCHEMES["alpine"] = AlpineLinuxVersionRange
57+
RANGE_CLASS_BY_SCHEMES["apk"] = AlpineLinuxVersionRange
6058

6159

6260
class BaseQuerySet(models.QuerySet):

‎vulnerabilities/pipelines/alpine_linux_importer.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ def load_advisories(
254254
affected_packages.append(
255255
AffectedPackage(
256256
package=PackageURL(
257-
type="alpine",
257+
type="apk",
258+
namespace="alpine",
258259
name=pkg_infos["name"],
259260
qualifiers=qualifiers,
260261
),
@@ -266,7 +267,8 @@ def load_advisories(
266267
affected_packages.append(
267268
AffectedPackage(
268269
package=PackageURL(
269-
type="alpine",
270+
type="apk",
271+
namespace="alpine",
270272
name=pkg_infos["name"],
271273
qualifiers=qualifiers,
272274
),

‎vulnerabilities/tests/pipelines/test_alpine_linux_importer_pipeline.py‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def test_process_record():
3636
affected_packages=[
3737
AffectedPackage(
3838
package=PackageURL(
39-
type="alpine",
40-
namespace=None,
39+
type="apk",
40+
namespace="alpine",
4141
name="xen",
4242
version=None,
4343
qualifiers={
@@ -52,8 +52,8 @@ def test_process_record():
5252
),
5353
AffectedPackage(
5454
package=PackageURL(
55-
type="alpine",
56-
namespace=None,
55+
type="apk",
56+
namespace="alpine",
5757
name="xen",
5858
version=None,
5959
qualifiers={"arch": "armhf", "distroversion": "v3.11", "reponame": "main"},
@@ -64,8 +64,8 @@ def test_process_record():
6464
),
6565
AffectedPackage(
6666
package=PackageURL(
67-
type="alpine",
68-
namespace=None,
67+
type="apk",
68+
namespace="alpine",
6969
name="xen",
7070
version=None,
7171
qualifiers={"arch": "armv7", "distroversion": "v3.11", "reponame": "main"},
@@ -76,8 +76,8 @@ def test_process_record():
7676
),
7777
AffectedPackage(
7878
package=PackageURL(
79-
type="alpine",
80-
namespace=None,
79+
type="apk",
80+
namespace="alpine",
8181
name="xen",
8282
version=None,
8383
qualifiers={
@@ -92,8 +92,8 @@ def test_process_record():
9292
),
9393
AffectedPackage(
9494
package=PackageURL(
95-
type="alpine",
96-
namespace=None,
95+
type="apk",
96+
namespace="alpine",
9797
name="xen",
9898
version=None,
9999
qualifiers={"arch": "s390x", "distroversion": "v3.11", "reponame": "main"},
@@ -104,8 +104,8 @@ def test_process_record():
104104
),
105105
AffectedPackage(
106106
package=PackageURL(
107-
type="alpine",
108-
namespace=None,
107+
type="apk",
108+
namespace="alpine",
109109
name="xen",
110110
version=None,
111111
qualifiers={"arch": "x86", "distroversion": "v3.11", "reponame": "main"},
@@ -116,8 +116,8 @@ def test_process_record():
116116
),
117117
AffectedPackage(
118118
package=PackageURL(
119-
type="alpine",
120-
namespace=None,
119+
type="apk",
120+
namespace="alpine",
121121
name="xen",
122122
version=None,
123123
qualifiers={"arch": "x86_64", "distroversion": "v3.11", "reponame": "main"},
@@ -143,8 +143,8 @@ def test_process_record():
143143
affected_packages=[
144144
AffectedPackage(
145145
package=PackageURL(
146-
type="alpine",
147-
namespace=None,
146+
type="apk",
147+
namespace="alpine",
148148
name="xen",
149149
version=None,
150150
qualifiers={
@@ -159,8 +159,8 @@ def test_process_record():
159159
),
160160
AffectedPackage(
161161
package=PackageURL(
162-
type="alpine",
163-
namespace=None,
162+
type="apk",
163+
namespace="alpine",
164164
name="xen",
165165
version=None,
166166
qualifiers={"arch": "armhf", "distroversion": "v3.11", "reponame": "main"},
@@ -171,8 +171,8 @@ def test_process_record():
171171
),
172172
AffectedPackage(
173173
package=PackageURL(
174-
type="alpine",
175-
namespace=None,
174+
type="apk",
175+
namespace="alpine",
176176
name="xen",
177177
version=None,
178178
qualifiers={"arch": "armv7", "distroversion": "v3.11", "reponame": "main"},
@@ -183,8 +183,8 @@ def test_process_record():
183183
),
184184
AffectedPackage(
185185
package=PackageURL(
186-
type="alpine",
187-
namespace=None,
186+
type="apk",
187+
namespace="alpine",
188188
name="xen",
189189
version=None,
190190
qualifiers={
@@ -199,8 +199,8 @@ def test_process_record():
199199
),
200200
AffectedPackage(
201201
package=PackageURL(
202-
type="alpine",
203-
namespace=None,
202+
type="apk",
203+
namespace="alpine",
204204
name="xen",
205205
version=None,
206206
qualifiers={"arch": "s390x", "distroversion": "v3.11", "reponame": "main"},
@@ -211,8 +211,8 @@ def test_process_record():
211211
),
212212
AffectedPackage(
213213
package=PackageURL(
214-
type="alpine",
215-
namespace=None,
214+
type="apk",
215+
namespace="alpine",
216216
name="xen",
217217
version=None,
218218
qualifiers={"arch": "x86", "distroversion": "v3.11", "reponame": "main"},
@@ -223,8 +223,8 @@ def test_process_record():
223223
),
224224
AffectedPackage(
225225
package=PackageURL(
226-
type="alpine",
227-
namespace=None,
226+
type="apk",
227+
namespace="alpine",
228228
name="xen",
229229
version=None,
230230
qualifiers={"arch": "x86_64", "distroversion": "v3.11", "reponame": "main"},
@@ -250,8 +250,8 @@ def test_process_record():
250250
affected_packages=[
251251
AffectedPackage(
252252
package=PackageURL(
253-
type="alpine",
254-
namespace=None,
253+
type="apk",
254+
namespace="alpine",
255255
name="apk-tools",
256256
version=None,
257257
qualifiers={
@@ -266,8 +266,8 @@ def test_process_record():
266266
),
267267
AffectedPackage(
268268
package=PackageURL(
269-
type="alpine",
270-
namespace=None,
269+
type="apk",
270+
namespace="alpine",
271271
name="apk-tools",
272272
version=None,
273273
qualifiers={"arch": "armhf", "distroversion": "v3.11", "reponame": "main"},
@@ -278,8 +278,8 @@ def test_process_record():
278278
),
279279
AffectedPackage(
280280
package=PackageURL(
281-
type="alpine",
282-
namespace=None,
281+
type="apk",
282+
namespace="alpine",
283283
name="apk-tools",
284284
version=None,
285285
qualifiers={"arch": "armv7", "distroversion": "v3.11", "reponame": "main"},
@@ -290,8 +290,8 @@ def test_process_record():
290290
),
291291
AffectedPackage(
292292
package=PackageURL(
293-
type="alpine",
294-
namespace=None,
293+
type="apk",
294+
namespace="alpine",
295295
name="apk-tools",
296296
version=None,
297297
qualifiers={
@@ -306,8 +306,8 @@ def test_process_record():
306306
),
307307
AffectedPackage(
308308
package=PackageURL(
309-
type="alpine",
310-
namespace=None,
309+
type="apk",
310+
namespace="alpine",
311311
name="apk-tools",
312312
version=None,
313313
qualifiers={"arch": "s390x", "distroversion": "v3.11", "reponame": "main"},
@@ -318,8 +318,8 @@ def test_process_record():
318318
),
319319
AffectedPackage(
320320
package=PackageURL(
321-
type="alpine",
322-
namespace=None,
321+
type="apk",
322+
namespace="alpine",
323323
name="apk-tools",
324324
version=None,
325325
qualifiers={"arch": "x86", "distroversion": "v3.11", "reponame": "main"},
@@ -330,8 +330,8 @@ def test_process_record():
330330
),
331331
AffectedPackage(
332332
package=PackageURL(
333-
type="alpine",
334-
namespace=None,
333+
type="apk",
334+
namespace="alpine",
335335
name="apk-tools",
336336
version=None,
337337
qualifiers={"arch": "x86_64", "distroversion": "v3.11", "reponame": "main"},
@@ -351,8 +351,8 @@ def test_process_record():
351351
affected_packages=[
352352
AffectedPackage(
353353
package=PackageURL(
354-
type="alpine",
355-
namespace=None,
354+
type="apk",
355+
namespace="alpine",
356356
name="apk-tools",
357357
version=None,
358358
qualifiers={
@@ -367,8 +367,8 @@ def test_process_record():
367367
),
368368
AffectedPackage(
369369
package=PackageURL(
370-
type="alpine",
371-
namespace=None,
370+
type="apk",
371+
namespace="alpine",
372372
name="apk-tools",
373373
version=None,
374374
qualifiers={"arch": "armhf", "distroversion": "v3.11", "reponame": "main"},
@@ -379,8 +379,8 @@ def test_process_record():
379379
),
380380
AffectedPackage(
381381
package=PackageURL(
382-
type="alpine",
383-
namespace=None,
382+
type="apk",
383+
namespace="alpine",
384384
name="apk-tools",
385385
version=None,
386386
qualifiers={"arch": "armv7", "distroversion": "v3.11", "reponame": "main"},
@@ -391,8 +391,8 @@ def test_process_record():
391391
),
392392
AffectedPackage(
393393
package=PackageURL(
394-
type="alpine",
395-
namespace=None,
394+
type="apk",
395+
namespace="alpine",
396396
name="apk-tools",
397397
version=None,
398398
qualifiers={
@@ -407,8 +407,8 @@ def test_process_record():
407407
),
408408
AffectedPackage(
409409
package=PackageURL(
410-
type="alpine",
411-
namespace=None,
410+
type="apk",
411+
namespace="alpine",
412412
name="apk-tools",
413413
version=None,
414414
qualifiers={"arch": "s390x", "distroversion": "v3.11", "reponame": "main"},
@@ -419,8 +419,8 @@ def test_process_record():
419419
),
420420
AffectedPackage(
421421
package=PackageURL(
422-
type="alpine",
423-
namespace=None,
422+
type="apk",
423+
namespace="alpine",
424424
name="apk-tools",
425425
version=None,
426426
qualifiers={"arch": "x86", "distroversion": "v3.11", "reponame": "main"},
@@ -431,8 +431,8 @@ def test_process_record():
431431
),
432432
AffectedPackage(
433433
package=PackageURL(
434-
type="alpine",
435-
namespace=None,
434+
type="apk",
435+
namespace="alpine",
436436
name="apk-tools",
437437
version=None,
438438
qualifiers={"arch": "x86_64", "distroversion": "v3.11", "reponame": "main"},

0 commit comments

Comments
 (0)