Skip to content

Commit e438e19

Browse files
committed
add supporting requirements to pass dependabot locations via mappings
1 parent ae2a681 commit e438e19

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/ghastoolkit/octokit/dependabot.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ def getAlerts(
9595
),
9696
advisory=advisory,
9797
purl=f"pkg:{package.get('ecosystem')}/{package.get('name')}".lower(),
98+
manifest=alert.get("manifest_path"),
9899
)
99100
)
100101

@@ -148,4 +149,4 @@ def getAlertsGraphQL(self) -> list[DependencyAlert]:
148149
self.graphql.cursor = alerts.get("pageInfo", {}).get("endCursor", "")
149150

150151
logger.debug(f"Number of Dependabot Alerts :: {len(results)}")
151-
return results
152+
return results

src/ghastoolkit/octokit/dependencygraph.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ def getDependenciesInPR(self, base: str, head: str) -> Dependencies:
225225
summary=alert.get("advisory_summary"),
226226
url=alert.get("advisory_ghsa_url"),
227227
),
228+
manifest=alert.get("manifest"),
228229
)
229230
dep.alerts.append(dep_alert)
230231

@@ -262,4 +263,4 @@ def submitSbom(self, sbom: dict[Any, Any]):
262263
"/repos/{owner}/{repo}/dependency-graph/snapshots",
263264
sbom,
264265
expected=201,
265-
)
266+
)

src/ghastoolkit/supplychain/dependencies.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def getPurl(self, version: bool = True) -> str:
5151
if self.manager:
5252
result += f"{self.manager.lower()}/"
5353
if self.namespace:
54-
result += f"{self.namespace}/"
54+
result += f"{self.namespace}:"
5555
result += f"{self.name}"
5656
if version and self.version:
5757
result += f"@{self.version}"
@@ -231,4 +231,4 @@ def updateDependency(self, dependency: Dependency):
231231
def updateDependencies(self, dependencies: "Dependencies"):
232232
"""Update a list of dependencies."""
233233
for dep in dependencies:
234-
self.updateDependency(dep)
234+
self.updateDependency(dep)

src/ghastoolkit/supplychain/dependencyalert.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ class DependencyAlert(OctoItem):
2323
created_at: Optional[str] = None
2424
"""Created Timestamp"""
2525

26+
manifest: Optional[str] = None
27+
"""Manifest"""
28+
2629
def __init_post__(self):
2730
if not self.created_at:
2831
self.created_at = datetime.now().strftime("%Y-%m-%dT%XZ")
@@ -36,4 +39,4 @@ def createdAt(self) -> Optional[datetime]:
3639
return datetime.strptime(self.created_at, "%Y-%m-%dT%XZ")
3740

3841
def __str__(self) -> str:
39-
return f"DependencyAlert({self.advisory.ghsa_id}, {self.severity})"
42+
return f"DependencyAlert({self.advisory.ghsa_id}, {self.severity})"

0 commit comments

Comments
 (0)