Skip to content

Commit bfcd5b2

Browse files
Hritik14Hritik14
committed
Refactor:packageurl repr,is_release,rm added_files
1. The package url call should have order similar to it's string repr (type comes first). 2. Upper casing a function variable is just misleading. Upper case means it's some global dataish thing (is_release) 3. Remove added_files function Reference: #395 (comment) Signed-off-by: Hritik Vijay <hritikxx8@gmail.com>
1 parent 6e9e324 commit bfcd5b2

2 files changed

Lines changed: 25 additions & 30 deletions

File tree

‎vulnerabilities/importers/istio.py‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from vulnerabilities.data_source import Advisory, GitDataSource, Reference
3232
from vulnerabilities.package_managers import GitHubTagsAPI
3333

34-
IS_RELEASE = re.compile(r"^[\d.]+$", re.IGNORECASE).match
34+
is_release = re.compile(r"^[\d.]+$", re.IGNORECASE).match
3535

3636

3737
class IstioDataSource(GitDataSource):
@@ -48,13 +48,8 @@ def __enter__(self):
4848
def set_api(self):
4949
asyncio.run(self.version_api.load_api(["istio/istio"]))
5050

51-
def added_advisories(self) -> Set[Advisory]:
52-
return self._load_advisories(self._added_files)
53-
5451
def updated_advisories(self) -> Set[Advisory]:
55-
return self._load_advisories(self._updated_files)
56-
57-
def _load_advisories(self, files) -> Set[Advisory]:
52+
files = self._added_files.union(self._updated_files)
5853
advisories = []
5954
for f in files:
6055
processed_data = self.process_file(f)
@@ -138,7 +133,7 @@ def process_file(self, path):
138133
ubound = "<=" + release[2]
139134
releases.append(lbound + "," + ubound)
140135
# If it is a single release
141-
elif IS_RELEASE(release):
136+
elif is_release(release):
142137
releases.append(release)
143138

144139
data["release_ranges"] = releases
@@ -162,23 +157,23 @@ def process_file(self, path):
162157
)
163158

164159
safe_purls_golang = {
165-
PackageURL(name="golang", type="istio", version=version)
160+
PackageURL(type="istio", name="golang", version=version)
166161
for version in safe_pkg_versions
167162
}
168163

169164
safe_purls_github = {
170-
PackageURL(name="github", type="istio", version=version)
165+
PackageURL(type="istio", name="github", version=version)
171166
for version in safe_pkg_versions
172167
}
173168
safe_purls = safe_purls_github.union(safe_purls_golang)
174169

175170
vuln_purls_golang = {
176-
PackageURL(name="golang", type="istio", version=version)
171+
PackageURL(type="istio", name="golang", version=version)
177172
for version in vuln_pkg_versions
178173
}
179174

180175
vuln_purls_github = {
181-
PackageURL(name="github", type="istio", version=version)
176+
PackageURL(type="istio", name="github", version=version)
182177
for version in vuln_pkg_versions
183178
}
184179
vuln_purls = vuln_purls_github.union(vuln_purls_golang)

‎vulnerabilities/tests/test_istio.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,95 +81,95 @@ def test_process_file(self):
8181
summary=("Incorrect access control."),
8282
impacted_package_urls={
8383
PackageURL(
84-
name="golang",
8584
type="istio",
85+
name="golang",
8686
version="1.1.0-snapshot.2",
8787
),
8888
PackageURL(
89-
name="golang",
9089
type="istio",
90+
name="golang",
9191
version="1.1.0-snapshot.3",
9292
),
9393
PackageURL(
94-
name="github",
9594
type="istio",
95+
name="github",
9696
version="1.1.0-snapshot.2",
9797
),
9898
PackageURL(
99-
name="github",
10099
type="istio",
100+
name="github",
101101
version="1.1.0-snapshot.3",
102102
),
103103
},
104104
resolved_package_urls={
105105
PackageURL(
106-
name="golang",
107106
type="istio",
107+
name="golang",
108108
version="1.1.0-rc.2",
109109
),
110110
PackageURL(
111-
name="golang",
112111
type="istio",
112+
name="golang",
113113
version="1.1.0-rc.4",
114114
),
115115
PackageURL(
116-
name="golang",
117116
type="istio",
117+
name="golang",
118118
version="1.1.0-rc.3",
119119
),
120120
PackageURL(
121-
name="golang",
122121
type="istio",
122+
name="golang",
123123
version="1.1.0-rc.0",
124124
),
125125
PackageURL(
126-
name="golang",
127126
type="istio",
127+
name="golang",
128128
version="1.1.0-rc.5",
129129
),
130130
PackageURL(
131-
name="golang",
132131
type="istio",
132+
name="golang",
133133
version="1.1.0-rc.1",
134134
),
135135
PackageURL(
136-
name="golang",
137136
type="istio",
137+
name="golang",
138138
version="1.1.0-rc.6",
139139
),
140140
PackageURL(
141-
name="github",
142141
type="istio",
142+
name="github",
143143
version="1.1.0-rc.2",
144144
),
145145
PackageURL(
146-
name="github",
147146
type="istio",
147+
name="github",
148148
version="1.1.0-rc.4",
149149
),
150150
PackageURL(
151-
name="github",
152151
type="istio",
152+
name="github",
153153
version="1.1.0-rc.3",
154154
),
155155
PackageURL(
156-
name="github",
157156
type="istio",
157+
name="github",
158158
version="1.1.0-rc.0",
159159
),
160160
PackageURL(
161-
name="github",
162161
type="istio",
162+
name="github",
163163
version="1.1.0-rc.5",
164164
),
165165
PackageURL(
166-
name="github",
167166
type="istio",
167+
name="github",
168168
version="1.1.0-rc.1",
169169
),
170170
PackageURL(
171-
name="github",
172171
type="istio",
172+
name="github",
173173
version="1.1.0-rc.6",
174174
),
175175
},

0 commit comments

Comments
 (0)