fixed unit test and changing logging to a named logger in the library

Author: Glenn Snyder

examples/get_bom_component_vulnerability_info.py

@@ -71,6 +71,9 @@
 response = hub.execute_get(vulnerable_components_url, custom_headers=custom_headers)
 vulnerable_bom_components = response.json().get('items', [])
 
+bdsa_records = set()
+cve_records = set()
+
 for i, vuln in enumerate(vulnerable_bom_components):
     source = vuln['vulnerabilityWithRemediation']['source']
     vuln_name = vuln['vulnerabilityWithRemediation']['vulnerabilityName']
@@ -87,18 +90,23 @@
     vuln_details_response = hub.execute_get(vuln_url, custom_headers={'Accept': 'application/json'})
     vuln_details = vuln_details_response.json()
 
-    import pdb; pdb.set_trace()
-    
     vuln['additional_vuln_info'] = vuln_details
+
     if source == 'BDSA':
+        bdsa_records.add(vuln_name)
+
         # get related vulnerability info, i.e. CVE
         # note: not all BDSA records will have a corresponding CVE record
         cve_url = hub.get_link(vuln_details, "related-vulnerability")
         if cve_url:
             cve_details_response = hub.execute_get(cve_url, custom_headers={'Accept': 'application/json'})
             cve_details = cve_details_response.json()
             vuln['related_vulnerability'] = cve_details
-
+            cve_records.add(cve_details['name'])
+    elif source == "NVD":
+        cve_records.add(vuln_name)
+    else:
+        logging.warning(f"source {source} was not recognized")
 
 if vulnerable_bom_components:
     vulnerable_bom_components = sorted(
@@ -137,7 +145,9 @@
 
 everything = {
     'counts': counts,
-    'vulnerabilities': vulnerable_bom_components
+    'vulnerabilities': vulnerable_bom_components,
+    'bdsa_records': list(bdsa_records),
+    'cve_records': list(cve_records),
 }
 
 print(json.dumps(everything))

test/test_hub_rest_api_python.py

@@ -158,7 +158,7 @@ def test_get_policy_url(mock_hub_instance):
 
 def test_get_parameter_string(mock_hub_instance):
     assert mock_hub_instance._get_parameter_string({"limit":"100"}) == "?limit=100"
-    assert mock_hub_instance._get_parameter_string({"limit":"100", "q":"name:my-name"}) == "?limit=100&q=name:my-name"
+    assert mock_hub_instance._get_parameter_string({"limit":"100", "q":"name:my-name"}) == "?limit=100&q=name%3Amy-name"
     assert mock_hub_instance._get_parameter_string({"limit":"100", "sort":"updatedAt"}) == "?limit=100&sort=updatedAt"
 
 def test_hub_instance_username_password_for_auth(mock_hub_instance):