CheckmarxPythonSDK 0.9.4__tar.gz → 0.9.6__tar.gz

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxOne/projectsAPI.py

@@ -147,7 +147,8 @@ def get_all_project_tags():
 
 
 def get_last_scan_info(offset=0, limit=20, project_ids=None, application_id=None, scan_status=None,
-                       branch=None, engine=None):
+                       branch=None, engine=None, sast_status=None, kics_status=None, sca_status=None,
+                       apisec_status=None, microengines_status=None, containers_status=None):
     """
     Get a key-value map, key=[project id], value=[last scan (based on the filter)]
 
@@ -161,6 +162,13 @@ def get_last_scan_info(offset=0, limit=20, project_ids=None, application_id=None
         scan_status (str): Scan status, please look at the scans API description for status options
         branch (str): Git branch of the scan
         engine (str): Engine type of the scan
+        sast_status (str): Sast engine status, please look at the scans API description for status options
+        kics_status (str): Kics engine status, please look at the scans API description for status options
+        sca_status (str): Sca engine status, please look at the scans API description for status options
+        apisec_status (str): APISec engine status, please look at the scans API description for status options
+        microengines_status (str): Micro Engines engine status, please look at the scans API description for status
+                            options
+        containers_status (str): Containers engine status, please look at the scans API description for status options
 
     Returns:
         dict
@@ -181,6 +189,14 @@ def get_last_scan_info(offset=0, limit=20, project_ids=None, application_id=None
     relative_url += get_url_param("scan-status", scan_status)
     relative_url += get_url_param("branch", branch)
     relative_url += get_url_param("engine", engine)
+
+    relative_url += get_url_param("sast-status", engine)
+    relative_url += get_url_param("kics-status", engine)
+    relative_url += get_url_param("sca-status", engine)
+    relative_url += get_url_param("apisec-status", engine)
+    relative_url += get_url_param("microengines-status", engine)
+    relative_url += get_url_param("containers-status", engine)
+
     response = get_request(relative_url=relative_url)
     project_scan_map = response.json()
     return {
@@ -195,7 +211,7 @@ def get_last_scan_info(offset=0, limit=20, project_ids=None, application_id=None
             engines=value.get("engines"),
             source_type=value.get("sourceType"),
             source_origin=value.get("sourceOrigin")
-        )
+        ) if value else None
         for key, value in project_scan_map.items()
     }
 

checkmarxpythonsdk-0.9.6/CheckmarxPythonSDK/CxOne/scaAPI.py

@@ -0,0 +1,22 @@
+from ..CxScaApiSDK.api import (
+    Sca
+)
+from .httpRequests import (
+    get_request as get,
+    post_request as post,
+    put_request as put,
+    delete_request as delete,
+)
+
+
+class ScaAPI(Sca):
+
+    def __init__(self, get_request=get, post_request=post, put_request=put, delete_request=delete):
+        Sca.__init__(self, get_request=get, post_request=post, put_request=put, delete_request=delete)
+        self.get_request = get_request
+        self.post_request = post_request
+        self.put_request = put_request
+        self.delete_request = delete_request
+
+    def __str__(self):
+        return """ScaAPI()"""

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxReporting/api.py

@@ -37,7 +37,7 @@ def create_a_new_report_request(report_request):
     """
     report_id = None
 
-    if not isinstance(report_request, CreateReportDTO):
+    if report_request and not isinstance(report_request, CreateReportDTO):
         return report_id
 
     relative_url = "/api/reports"

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxReporting/dto/CreateReportDTO.py

@@ -32,22 +32,22 @@ class CreateReportDTO(object):
             filters (list of FilterDTO): nullable: true,
                         Filters to be applied in the report creation.
         """
-        if not isinstance(template_id, int):
+        if template_id and not isinstance(template_id, int):
             raise ValueError("parameter template_id type should be int")
-        if not isinstance(output_format, str):
+        if output_format and not isinstance(output_format, str):
             raise ValueError("parameter output type should be str")
-        if not isinstance(entity_id, (list, tuple)):
+        if entity_id and not isinstance(entity_id, (list, tuple)):
             raise ValueError("parameter entity_id type should be list or tuple")
         for entity in entity_id:
-            if not isinstance(entity, str):
+            if entity and not isinstance(entity, str):
                 raise ValueError("All entity id should be str")
-        if not isinstance(report_name, str):
+        if report_name and not isinstance(report_name, str):
             raise ValueError("parameter report_name type should be str")
         if filters:
             if not isinstance(filters, (list, tuple)):
                 raise ValueError("parameter filters type should be list or tuple")
             for a_filter in filters:
-                if not isinstance(a_filter, FilterDTO):
+                if a_filter and not isinstance(a_filter, FilterDTO):
                     raise ValueError("all filters should be FilterDTO")
 
         if not (1 <= template_id <= 7):

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxReporting/dto/FilterDTO.py

@@ -46,7 +46,7 @@ class FilterDTO(object):
             included_values (list of str, optional):
             pattern (str, optional):
         """
-        if not isinstance(filter_type, int):
+        if filter_type and not isinstance(filter_type, int):
             raise ValueError("parameter filter_type type should be int")
         if excluded_values and not isinstance(excluded_values, (list, tuple)):
             raise ValueError("parameter excluded_values type should be list or tuple")

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxRestAPISDK/EnginesAPI.py

@@ -106,7 +106,7 @@ class EnginesAPI(object):
             if not isinstance(dedications, list):
                 raise ValueError("parameter dedications should be a list of CxEngineDedication")
             for dedication in dedications:
-                if not isinstance(dedication, CxEngineDedication):
+                if dedication and not isinstance(dedication, CxEngineDedication):
                     raise ValueError("member of dedications should be CxEngineDedication")
 
         post_data = json.dumps(
@@ -216,7 +216,7 @@ class EnginesAPI(object):
             if not isinstance(dedications, list):
                 raise ValueError("parameter dedications should be a list of CxEngineDedication")
             for dedication in dedications:
-                if not isinstance(dedication, CxEngineDedication):
+                if dedication and not isinstance(dedication, CxEngineDedication):
                     raise ValueError("member of dedications should be CxEngineDedication")
         relative_url = "/cxrestapi/sast/engineServers/{id}".format(id=engine_id)
         put_data = json.dumps(
@@ -274,7 +274,7 @@ class EnginesAPI(object):
             if not isinstance(dedications, list):
                 raise ValueError("parameter dedications should be a list of CxEngineDedication")
             for dedication in dedications:
-                if not isinstance(dedication, CxEngineDedication):
+                if dedication and not isinstance(dedication, CxEngineDedication):
                     raise ValueError("member of dedications should be CxEngineDedication")
         relative_url = "/cxrestapi/sast/engineServers/{id}".format(id=engine_id)
         data = {}

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxRestAPISDK/GeneralAPI.py

@@ -351,10 +351,10 @@ class GeneralAPI:
             Id of result state(int)
         """
         result = None
-        if not isinstance(translation_inputs, (list, tuple)):
+        if translation_inputs and not isinstance(translation_inputs, (list, tuple)):
             raise ValueError("translation_inputs should be list or tuple")
         for item in translation_inputs:
-            if not isinstance(item, CxTranslationInput):
+            if item and not isinstance(item, CxTranslationInput):
                 raise ValueError("member of translation_inputs should be CxTranslationInput")
 
         result = None
@@ -384,10 +384,10 @@ class GeneralAPI:
             bool
         """
         is_successful = False
-        if not isinstance(translation_inputs, (list, tuple)):
+        if translation_inputs and not isinstance(translation_inputs, (list, tuple)):
             raise ValueError("translation_inputs should be list or tuple")
         for item in translation_inputs:
-            if not isinstance(item, CxTranslationInput):
+            if item and not isinstance(item, CxTranslationInput):
                 raise ValueError("member of translation_inputs should be CxTranslationInput")
         patch_data = json.dumps(
             {
@@ -448,10 +448,10 @@ class GeneralAPI:
         Returns:
             list
         """
-        if not isinstance(persistence_keys, list):
+        if persistence_keys and not isinstance(persistence_keys, list):
             raise ValueError("parameter persistence_keys should be a list of str")
         for item in persistence_keys:
-            if not isinstance(item, str):
+            if item and not isinstance(item, str):
                 raise ValueError("all member in persistence_keys should be a str")
         result = None
         relative_url = "/cxrestapi/userPersistence?"
@@ -474,10 +474,10 @@ class GeneralAPI:
 
         """
         is_successful = False
-        if not isinstance(persistence_items, list):
+        if persistence_items and not isinstance(persistence_items, list):
             raise ValueError("parameter persistence_items should be a list of CxUserPersistence")
         for item in persistence_items:
-            if not isinstance(item, CxUserPersistence):
+            if item and not isinstance(item, CxUserPersistence):
                 raise ValueError("member in parameter persistence_items should be CxUserPersistence")
         result = None
         relative_url = "/cxrestapi/userPersistence"

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxRestAPISDK/ProjectsAPI.py

@@ -168,7 +168,7 @@ class ProjectsAPI(object):
         """
         result = False
         relative_url = "/cxrestapi/projects/{id}".format(id=project_id)
-        if not isinstance(custom_fields, (list, tuple)):
+        if custom_fields and not isinstance(custom_fields, (list, tuple)):
             raise ValueError("parameter custom_fields should be a list of CxCustomField")
         put_data = json.dumps(
             {

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxRestAPISDK/ScansAPI.py

@@ -595,11 +595,11 @@ class ScansAPI(object):
             CxError
         """
         result = None
-        if not isinstance(failed_scan_emails, list):
+        if failed_scan_emails and not isinstance(failed_scan_emails, list):
             raise ValueError("failed_scan_emails should be a list")
-        if not isinstance(before_scan_emails, list):
+        if before_scan_emails and not isinstance(before_scan_emails, list):
             raise ValueError("before_scan_emails should be a list")
-        if not isinstance(after_scan_emails, list):
+        if after_scan_emails and not isinstance(after_scan_emails, list):
             raise ValueError("after_scan_emails should be a list")
         relative_url = "/cxrestapi/sast/scanSettings"
         post_data = json.dumps(
@@ -668,11 +668,11 @@ class ScansAPI(object):
         """
         result = None
         relative_url = "/cxrestapi/sast/scanSettings"
-        if not isinstance(failed_scan_emails, list):
+        if failed_scan_emails and not isinstance(failed_scan_emails, list):
             raise ValueError("failed_scan_emails should be a list")
-        if not isinstance(before_scan_emails, list):
+        if before_scan_emails and not isinstance(before_scan_emails, list):
             raise ValueError("before_scan_emails should be a list")
-        if not isinstance(after_scan_emails, list):
+        if after_scan_emails and not isinstance(after_scan_emails, list):
             raise ValueError("after_scan_emails should be a list")
         put_data = json.dumps(
             {

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxRestAPISDK/sast/engines/dto/CxEngineServer.py

@@ -34,7 +34,7 @@ class CxEngineServer(object):
             if not isinstance(dedications, list):
                 raise ValueError("parameter dedications should be a list of CxEngineDedication")
             for item in dedications:
-                if not isinstance(item, CxEngineDedication):
+                if item and not isinstance(item, CxEngineDedication):
                     raise ValueError("member of dedications should be CxEngineDedication")
 
         self.id = engine_server_id

{checkmarxpythonsdk-0.9.4 → checkmarxpythonsdk-0.9.6}/CheckmarxPythonSDK/CxRestAPISDK/sast/general/dto/CxUserPersistence.py

@@ -7,9 +7,9 @@ class CxUserPersistence(object):
             key (str):
             value (str):
         """
-        if not isinstance(key, str):
+        if key and not isinstance(key, str):
             raise ValueError("parameter key should be str")
-        if not isinstance(value, str):
+        if value and not isinstance(value, str):
             raise ValueError("parameter value should be str")
         self.key = key
         self.value = value