CheckmarxPythonSDK 1.0.2__tar.gz → 1.0.4__tar.gz

{checkmarxpythonsdk-1.0.2 → checkmarxpythonsdk-1.0.4}/CheckmarxPythonSDK/CxOne/projectsAPI.py

@@ -191,12 +191,12 @@ def get_last_scan_info(offset=0, limit=20, project_ids=None, application_id=None
     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)
+    relative_url += get_url_param("sast-status", sast_status)
+    relative_url += get_url_param("kics-status", kics_status)
+    relative_url += get_url_param("sca-status", sca_status)
+    relative_url += get_url_param("apisec-status", apisec_status)
+    relative_url += get_url_param("microengines-status", microengines_status)
+    relative_url += get_url_param("containers-status", containers_status)
 
     response = get_request(relative_url=relative_url)
     project_scan_map = response.json()

checkmarxpythonsdk-1.0.4/CheckmarxPythonSDK/CxOne/scaAPI.py

@@ -0,0 +1,40 @@
+from ..CxScaApiSDK.api import (
+    Sca
+)
+from .httpRequests import (
+    get_request as get_re,
+    post_request as post_re,
+    put_request as put_re,
+    delete_request as delete_re,
+)
+
+url_prefix = "/api/sca"
+
+
+def get(relative_url):
+    return get_re(relative_url=url_prefix + relative_url)
+
+
+def post(relative_url, data, files=None):
+    return post_re(relative_url=url_prefix + relative_url, data=data, files=files)
+
+
+def put(relative_url, data, files=None):
+    return put_re(relative_url=url_prefix + relative_url, data=data, files=files)
+
+
+def delete(relative_url, data=None):
+    return delete_re(relative_url=url_prefix + relative_url, data=data)
+
+
+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-1.0.2 → checkmarxpythonsdk-1.0.4}/CheckmarxPythonSDK/CxPortalSoapApiSDK/CxPortalWebService.py

@@ -15,7 +15,11 @@ def add_license_expiration_notification():
     """
 
     Returns:
-
+        CxWSBasicRepsonse
+        {
+            'IsSuccesfull': True,
+            'ErrorMessage': None
+        }
     """
 
     @retry_when_unauthorized
@@ -25,10 +29,7 @@ def add_license_expiration_notification():
 
     response = execute()
 
-    return {
-        "IsSuccesfull": response["IsSuccesfull"],
-        "ErrorMessage": response["ErrorMessage"]
-    }
+    return response
 
 
 def create_new_preset(query_ids, name):
@@ -39,21 +40,26 @@ def create_new_preset(query_ids, name):
         name (str):
 
     Returns:
-        dict
+        CxWSResponsePresetDetails
 
-        sample return:
         {
-            'queryIds':  [
-                    343
-            ],
-            'id': 110003,
-            'name': 'ddd',
-            'owningteam': 1,
-            'isPublic': True,
-            'owner': None,
-            'isUserAllowToUpdate': True,
-            'isUserAllowToDelete': True,
-            'IsDuplicate': False
+            'IsSuccesfull': True,
+            'ErrorMessage': None,
+            'preset': {
+                'queryIds': {
+                    'long': [
+                        343
+                    ]
+                },
+                'id': 100006,
+                'name': 'ddd10',
+                'owningteam': 1,
+                'isPublic': True,
+                'owner': None,
+                'isUserAllowToUpdate': True,
+                'isUserAllowToDelete': True,
+                'IsDuplicate': False
+            }
         }
     """
 
@@ -70,22 +76,7 @@ def create_new_preset(query_ids, name):
         return client.service.CreateNewPreset(sessionId="0", presrt=cx_preset_detail)
 
     response = execute()
-    preset = response.preset
-    return {
-        "IsSuccesfull": response["IsSuccesfull"],
-        "ErrorMessage": response["ErrorMessage"],
-        "preset": {
-            'queryIds': preset["queryIds"]["long"],
-            'id': preset["id"],
-            'name': preset["name"],
-            'owningteam': preset["owningteam"],
-            'isPublic': preset["isPublic"],
-            'owner': preset["owner"],
-            'isUserAllowToUpdate': preset["isUserAllowToUpdate"],
-            'isUserAllowToDelete': preset["isUserAllowToDelete"],
-            'IsDuplicate': preset["IsDuplicate"]
-        } if preset else None
-    }
+    return response
 
 
 def create_scan_report(scan_id, report_type, queries_all=True, queries_ids=None, results_severity_all=True,
@@ -150,7 +141,12 @@ def create_scan_report(scan_id, report_type, queries_all=True, queries_ids=None,
         results_display_option_snippets_mode (str): "None", "SourceAndDestination", "Full"
 
     Returns:
-
+        CxWSCreateReportResponse
+        {
+            'IsSuccesfull': True,
+            'ErrorMessage': None,
+            'ID': 336
+        }
     """
 
     @retry_when_unauthorized
@@ -247,12 +243,7 @@ def create_scan_report(scan_id, report_type, queries_all=True, queries_ids=None,
         return client.service.CreateScanReport(SessionID="0", Report=filtered_report_request)
 
     response = execute()
-
-    return {
-        "IsSuccesfull": response["IsSuccesfull"],
-        "ErrorMessage": response["ErrorMessage"],
-        "ID": response["ID"]
-    }
+    return response
 
 
 def delete_preset(preset_id):
@@ -262,7 +253,11 @@ def delete_preset(preset_id):
         preset_id (int):
 
     Returns:
-
+        CxWSBasicRepsonse
+        {
+            'IsSuccesfull': True,
+            'ErrorMessage': None
+        }
     """
 
     @retry_when_unauthorized
@@ -271,10 +266,7 @@ def delete_preset(preset_id):
         return client.service.DeletePreset(sessionId="0", id=preset_id)
 
     response = execute()
-    return {
-        "IsSuccesfull": response["IsSuccesfull"],
-        "ErrorMessage": response["ErrorMessage"]
-    }
+    return response
 
 
 def delete_project(project_id):
@@ -284,7 +276,17 @@ def delete_project(project_id):
         project_id (int):
 
     Returns:
-
+        CxWSResponseDeleteProjects
+        {
+            'IsSuccesfull': True,
+            'ErrorMessage': None,
+            'IsConfirmation': False,
+            'Flags': [
+                'None'
+            ],
+            'UndeletedProjects': None,
+            'NumOfDeletedProjects': 1
+        }
     """
 
     @retry_when_unauthorized
@@ -293,10 +295,7 @@ def delete_project(project_id):
         return client.service.DeleteProject(sessionID="0", projectID=project_id)
 
     response = execute()
-    return {
-        "IsSuccesfull": response["IsSuccesfull"],
-        "ErrorMessage": response["ErrorMessage"]
-    }
+    return response
 
 
 def delete_projects(project_ids, flag="None"):

checkmarxpythonsdk-1.0.4/CheckmarxPythonSDK/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.0.4'

{checkmarxpythonsdk-1.0.2 → checkmarxpythonsdk-1.0.4}/CheckmarxPythonSDK/utilities/httpRequests.py

@@ -354,7 +354,7 @@ def check_response(response):
     text = response.text
     if True in [
         method in ['GET', 'HEAD'] and status_code not in [OK, UNAUTHORIZED],
-        method == 'POST' and status_code not in [OK, CREATED, UNAUTHORIZED, ACCEPTED],
+        method == 'POST' and status_code not in [OK, NO_CONTENT, CREATED, UNAUTHORIZED, ACCEPTED],
         method in ['PUT', 'PATCH', 'DELETE'] and status_code not in [OK, NO_CONTENT, ACCEPTED, UNAUTHORIZED],
     ]:
         raise ValueError("HttpStatusCode: {code}".format(code=status_code),

{checkmarxpythonsdk-1.0.2 → checkmarxpythonsdk-1.0.4}/CheckmarxPythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheckmarxPythonSDK
-Version: 1.0.2
+Version: 1.0.4
 Summary: Checkmarx Python SDK
 Home-page: https://github.com/checkmarx-ts/checkmarx-python-sdk
 Author: Happy Yang

{checkmarxpythonsdk-1.0.2 → checkmarxpythonsdk-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheckmarxPythonSDK
-Version: 1.0.2
+Version: 1.0.4
 Summary: Checkmarx Python SDK
 Home-page: https://github.com/checkmarx-ts/checkmarx-python-sdk
 Author: Happy Yang

checkmarxpythonsdk-1.0.2/CheckmarxPythonSDK/CxOne/scaAPI.py

@@ -1,22 +0,0 @@
-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-1.0.2/CheckmarxPythonSDK/__version__.py

@@ -1 +0,0 @@
-__version__ = '1.0.2'