Skip to content

Commit c64ad1a

Browse files
committed
fix: remove value error rising that disable generating VEX for well formed sboms
1 parent 7ddc2aa commit c64ad1a

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

app/domain/vex_generation/processors/sbom_processor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ async def process_new_sboms(
125125
vex_list = []
126126
tix_list = []
127127

128-
for sbom_file, (vex, tix) in zip(sboms_to_process, results, strict=True):
128+
for sbom_file, vex, tix in results:
129129
sbom_path = PathHelper.get_relative_path(sbom_file, directory)
130130
await self.save_vex_tix(vex, tix, sbom_path)
131131
vex_list.append(vex)

app/domain/vex_generation/processors/vex_tix_initializer.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
from .statement_generator import StatementsGenerator
1212

13+
from app.logger import logger
14+
1315

1416
class VEXTIXInitializer:
1517
def __init__(self, directory: str):
@@ -20,13 +22,17 @@ async def init_vex_tix(
2022
self,
2123
owner: str,
2224
sbom_files: list[str],
23-
) -> list[tuple[dict[str, Any], dict[str, Any]]]:
25+
) -> list[tuple[str, dict[str, Any], dict[str, Any]]]:
2426
timestamp = datetime.now(UTC).isoformat()
2527
results = []
2628

2729
for sbom_file in sbom_files:
28-
vex_tix = await self.process_single_sbom(sbom_file, owner, timestamp)
29-
results.append(vex_tix)
30+
try:
31+
vex_tix = await self.process_single_sbom(sbom_file, owner, timestamp)
32+
results.append((sbom_file, vex_tix[0], vex_tix[1]))
33+
except ValueError as e:
34+
logger.warning(f"Skipping invalid SBOM file {sbom_file}: {e}")
35+
continue
3036

3137
return results
3238

0 commit comments

Comments
 (0)