Skip to content

Commit 981a7d4

Browse files
wagoodmanwagoodman
committed
fix amazon field name
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
1 parent 435ec59 commit 981a7d4

4 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎src/vunnel/providers/amazon/parser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def __init__(self):
236236
self.NamespaceName = None
237237
self.VersionFormat = None
238238
self.Version = None
239-
self.OperatingSystem = None
239+
self.OS = None
240240

241241

242242
class OperatingSystem(JsonifierMixin):
@@ -324,7 +324,7 @@ def map_to_vulnerability(version, alas, fixed_in, description):
324324
f.NamespaceName = v.NamespaceName
325325
f.VersionFormat = "rpm"
326326
f.Version = item.ver
327-
f.OperatingSystem = OperatingSystem(identifier=namespace, version=version)
327+
f.OS = OperatingSystem(identifier=namespace, version=version)
328328
v.FixedIn.append(f)
329329

330330
return v

‎tests/unit/providers/amazon/test-fixtures/snapshots/amzn:2/alas-2018-939.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"Name": "kernel",
99
"NamespaceName": "amzn:2",
10-
"OperatingSystem": {
10+
"OS": {
1111
"ID": "amzn",
1212
"Version": "2"
1313
},
@@ -17,7 +17,7 @@
1717
{
1818
"Name": "kernel-debuginfo",
1919
"NamespaceName": "amzn:2",
20-
"OperatingSystem": {
20+
"OS": {
2121
"ID": "amzn",
2222
"Version": "2"
2323
},
@@ -27,7 +27,7 @@
2727
{
2828
"Name": "kernel-debuginfo-common-x86_64",
2929
"NamespaceName": "amzn:2",
30-
"OperatingSystem": {
30+
"OS": {
3131
"ID": "amzn",
3232
"Version": "2"
3333
},
@@ -37,7 +37,7 @@
3737
{
3838
"Name": "kernel-devel",
3939
"NamespaceName": "amzn:2",
40-
"OperatingSystem": {
40+
"OS": {
4141
"ID": "amzn",
4242
"Version": "2"
4343
},
@@ -47,7 +47,7 @@
4747
{
4848
"Name": "kernel-doc",
4949
"NamespaceName": "amzn:2",
50-
"OperatingSystem": {
50+
"OS": {
5151
"ID": "amzn",
5252
"Version": "2"
5353
},
@@ -57,7 +57,7 @@
5757
{
5858
"Name": "kernel-headers",
5959
"NamespaceName": "amzn:2",
60-
"OperatingSystem": {
60+
"OS": {
6161
"ID": "amzn",
6262
"Version": "2"
6363
},
@@ -67,7 +67,7 @@
6767
{
6868
"Name": "kernel-tools",
6969
"NamespaceName": "amzn:2",
70-
"OperatingSystem": {
70+
"OS": {
7171
"ID": "amzn",
7272
"Version": "2"
7373
},
@@ -77,7 +77,7 @@
7777
{
7878
"Name": "kernel-tools-debuginfo",
7979
"NamespaceName": "amzn:2",
80-
"OperatingSystem": {
80+
"OS": {
8181
"ID": "amzn",
8282
"Version": "2"
8383
},
@@ -87,7 +87,7 @@
8787
{
8888
"Name": "kernel-tools-devel",
8989
"NamespaceName": "amzn:2",
90-
"OperatingSystem": {
90+
"OS": {
9191
"ID": "amzn",
9292
"Version": "2"
9393
},
@@ -97,7 +97,7 @@
9797
{
9898
"Name": "perf",
9999
"NamespaceName": "amzn:2",
100-
"OperatingSystem": {
100+
"OS": {
101101
"ID": "amzn",
102102
"Version": "2"
103103
},
@@ -107,7 +107,7 @@
107107
{
108108
"Name": "perf-debuginfo",
109109
"NamespaceName": "amzn:2",
110-
"OperatingSystem": {
110+
"OS": {
111111
"ID": "amzn",
112112
"Version": "2"
113113
},
@@ -117,7 +117,7 @@
117117
{
118118
"Name": "python-perf",
119119
"NamespaceName": "amzn:2",
120-
"OperatingSystem": {
120+
"OS": {
121121
"ID": "amzn",
122122
"Version": "2"
123123
},
@@ -127,7 +127,7 @@
127127
{
128128
"Name": "python-perf-debuginfo",
129129
"NamespaceName": "amzn:2",
130-
"OperatingSystem": {
130+
"OS": {
131131
"ID": "amzn",
132132
"Version": "2"
133133
},

‎tests/unit/providers/amazon/test-fixtures/snapshots/amzn:2022/alas-2021-001.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"Name": "vim",
99
"NamespaceName": "amzn:2022",
10-
"OperatingSystem": {
10+
"OS": {
1111
"ID": "amzn",
1212
"Version": "2022"
1313
},
@@ -17,7 +17,7 @@
1717
{
1818
"Name": "vim-X11",
1919
"NamespaceName": "amzn:2022",
20-
"OperatingSystem": {
20+
"OS": {
2121
"ID": "amzn",
2222
"Version": "2022"
2323
},
@@ -27,7 +27,7 @@
2727
{
2828
"Name": "vim-X11-debuginfo",
2929
"NamespaceName": "amzn:2022",
30-
"OperatingSystem": {
30+
"OS": {
3131
"ID": "amzn",
3232
"Version": "2022"
3333
},
@@ -37,7 +37,7 @@
3737
{
3838
"Name": "vim-common",
3939
"NamespaceName": "amzn:2022",
40-
"OperatingSystem": {
40+
"OS": {
4141
"ID": "amzn",
4242
"Version": "2022"
4343
},
@@ -47,7 +47,7 @@
4747
{
4848
"Name": "vim-common-debuginfo",
4949
"NamespaceName": "amzn:2022",
50-
"OperatingSystem": {
50+
"OS": {
5151
"ID": "amzn",
5252
"Version": "2022"
5353
},
@@ -57,7 +57,7 @@
5757
{
5858
"Name": "vim-debuginfo",
5959
"NamespaceName": "amzn:2022",
60-
"OperatingSystem": {
60+
"OS": {
6161
"ID": "amzn",
6262
"Version": "2022"
6363
},
@@ -67,7 +67,7 @@
6767
{
6868
"Name": "vim-debugsource",
6969
"NamespaceName": "amzn:2022",
70-
"OperatingSystem": {
70+
"OS": {
7171
"ID": "amzn",
7272
"Version": "2022"
7373
},
@@ -77,7 +77,7 @@
7777
{
7878
"Name": "vim-default-editor",
7979
"NamespaceName": "amzn:2022",
80-
"OperatingSystem": {
80+
"OS": {
8181
"ID": "amzn",
8282
"Version": "2022"
8383
},
@@ -87,7 +87,7 @@
8787
{
8888
"Name": "vim-enhanced",
8989
"NamespaceName": "amzn:2022",
90-
"OperatingSystem": {
90+
"OS": {
9191
"ID": "amzn",
9292
"Version": "2022"
9393
},
@@ -97,7 +97,7 @@
9797
{
9898
"Name": "vim-enhanced-debuginfo",
9999
"NamespaceName": "amzn:2022",
100-
"OperatingSystem": {
100+
"OS": {
101101
"ID": "amzn",
102102
"Version": "2022"
103103
},
@@ -107,7 +107,7 @@
107107
{
108108
"Name": "vim-filesystem",
109109
"NamespaceName": "amzn:2022",
110-
"OperatingSystem": {
110+
"OS": {
111111
"ID": "amzn",
112112
"Version": "2022"
113113
},
@@ -117,7 +117,7 @@
117117
{
118118
"Name": "vim-minimal",
119119
"NamespaceName": "amzn:2022",
120-
"OperatingSystem": {
120+
"OS": {
121121
"ID": "amzn",
122122
"Version": "2022"
123123
},
@@ -127,7 +127,7 @@
127127
{
128128
"Name": "vim-minimal-debuginfo",
129129
"NamespaceName": "amzn:2022",
130-
"OperatingSystem": {
130+
"OS": {
131131
"ID": "amzn",
132132
"Version": "2022"
133133
},

‎tests/unit/providers/amazon/test-fixtures/snapshots/amzn:2023/alas-2023-126.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"Name": "device-mapper-multipath",
99
"NamespaceName": "amzn:2023",
10-
"OperatingSystem": {
10+
"OS": {
1111
"ID": "amzn",
1212
"Version": "2023"
1313
},
@@ -17,7 +17,7 @@
1717
{
1818
"Name": "device-mapper-multipath-debuginfo",
1919
"NamespaceName": "amzn:2023",
20-
"OperatingSystem": {
20+
"OS": {
2121
"ID": "amzn",
2222
"Version": "2023"
2323
},
@@ -27,7 +27,7 @@
2727
{
2828
"Name": "device-mapper-multipath-debugsource",
2929
"NamespaceName": "amzn:2023",
30-
"OperatingSystem": {
30+
"OS": {
3131
"ID": "amzn",
3232
"Version": "2023"
3333
},
@@ -37,7 +37,7 @@
3737
{
3838
"Name": "device-mapper-multipath-devel",
3939
"NamespaceName": "amzn:2023",
40-
"OperatingSystem": {
40+
"OS": {
4141
"ID": "amzn",
4242
"Version": "2023"
4343
},
@@ -47,7 +47,7 @@
4747
{
4848
"Name": "device-mapper-multipath-libs",
4949
"NamespaceName": "amzn:2023",
50-
"OperatingSystem": {
50+
"OS": {
5151
"ID": "amzn",
5252
"Version": "2023"
5353
},
@@ -57,7 +57,7 @@
5757
{
5858
"Name": "device-mapper-multipath-libs-debuginfo",
5959
"NamespaceName": "amzn:2023",
60-
"OperatingSystem": {
60+
"OS": {
6161
"ID": "amzn",
6262
"Version": "2023"
6363
},
@@ -67,7 +67,7 @@
6767
{
6868
"Name": "kpartx",
6969
"NamespaceName": "amzn:2023",
70-
"OperatingSystem": {
70+
"OS": {
7171
"ID": "amzn",
7272
"Version": "2023"
7373
},
@@ -77,7 +77,7 @@
7777
{
7878
"Name": "kpartx-debuginfo",
7979
"NamespaceName": "amzn:2023",
80-
"OperatingSystem": {
80+
"OS": {
8181
"ID": "amzn",
8282
"Version": "2023"
8383
},
@@ -87,7 +87,7 @@
8787
{
8888
"Name": "libdmmp",
8989
"NamespaceName": "amzn:2023",
90-
"OperatingSystem": {
90+
"OS": {
9191
"ID": "amzn",
9292
"Version": "2023"
9393
},
@@ -97,7 +97,7 @@
9797
{
9898
"Name": "libdmmp-debuginfo",
9999
"NamespaceName": "amzn:2023",
100-
"OperatingSystem": {
100+
"OS": {
101101
"ID": "amzn",
102102
"Version": "2023"
103103
},
@@ -107,7 +107,7 @@
107107
{
108108
"Name": "libdmmp-devel",
109109
"NamespaceName": "amzn:2023",
110-
"OperatingSystem": {
110+
"OS": {
111111
"ID": "amzn",
112112
"Version": "2023"
113113
},

0 commit comments

Comments
 (0)