Skip to content

Commit f7f2139

Browse files
committed
respect license detail exclusion, disable-blocking on API failures
Signed-off-by: lelia <2418071+lelia@users.noreply.github.com>
1 parent 06f673e commit f7f2139

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

socketsecurity/core/__init__.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,8 @@ def get_license_text_via_purl(self, packages: dict[str, Package], batch_size: in
919919
def get_added_and_removed_packages(
920920
self,
921921
head_full_scan_id: str,
922-
new_full_scan_id: str
922+
new_full_scan_id: str,
923+
include_license_details: bool = True
923924
) -> Tuple[Dict[str, Package], Dict[str, Package], Dict[str, Package]]:
924925
"""
925926
Get packages that were added and removed between scans.
@@ -936,17 +937,17 @@ def get_added_and_removed_packages(
936937
diff_start = time.time()
937938
try:
938939
diff_report = (
939-
self.sdk.fullscans.stream_diff
940-
(
940+
self.sdk.fullscans.stream_diff(
941941
self.config.org_slug,
942942
head_full_scan_id,
943943
new_full_scan_id,
944-
use_types=True
944+
use_types=True,
945+
include_license_details=str(include_license_details).lower()
945946
).data
946947
)
947948
except APIFailure as e:
948949
log.error(f"API Error: {e}")
949-
sys.exit(1)
950+
raise
950951
except Exception as e:
951952
import traceback
952953
log.error(f"Error getting diff report: {str(e)}")
@@ -1149,7 +1150,11 @@ def create_new_diff(
11491150
added_packages,
11501151
removed_packages,
11511152
packages
1152-
) = self.get_added_and_removed_packages(head_full_scan_id, new_full_scan.id)
1153+
) = self.get_added_and_removed_packages(
1154+
head_full_scan_id,
1155+
new_full_scan.id,
1156+
include_license_details=getattr(params, "include_license_details", True)
1157+
)
11531158

11541159
# Separate unchanged packages from added/removed for --strict-blocking support
11551160
unchanged_packages = {

0 commit comments

Comments
 (0)