holado 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

{holado-0.3.0.dist-info → holado-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.3.0
+Version: 0.4.0
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

{holado-0.3.0.dist-info → holado-0.4.0.dist-info}/RECORD

@@ -289,7 +289,7 @@ holado_python/tests/behave/steps/iterable_steps.py,sha256=f4vGIWBH8Qnjq69Q-ZBluY
 holado_python/tests/behave/steps/builtins/str_steps.py,sha256=ugNIz5v5EpkiRBDmwDl2JtAq5RWXu6UnLv7HH73WiXw,2101
 holado_python/tests/behave/steps/standard_library/csv_steps.py,sha256=VJ5wmr0CQ8voBSgnXQUBAdYkEGFOCs95JKcV52tVMOo,7460
 holado_python/tests/behave/steps/standard_library/datetime_steps.py,sha256=mWbYb-CjSVKKWNcBaBzL24jP86C0v-NZ8W3hfrzHlbc,7815
-holado_python/tests/behave/steps/standard_library/hashlib_steps.py,sha256=zhLtKeHhLED-s-67chSqG9asCdOG9fRBUWbF8deKBoU,2979
+holado_python/tests/behave/steps/standard_library/hashlib_steps.py,sha256=j1NmcvFAFKYAhWeYWc6Xf32M0CPGTgk2fHcaBBbav8o,2978
 holado_python/tests/behave/steps/standard_library/multiprocessing_steps.py,sha256=DD--5bxCvFTXY6KBqKzKAuOrOK0aZdPjbRR5SO0PZBo,2519
 holado_python/tests/behave/steps/standard_library/queue_steps.py,sha256=GdHKKIka5tzFxVTBYPJNywyVLDtggZF2RB_mFIbyLdI,17429
 holado_python/tests/behave/steps/standard_library/socket_steps.py,sha256=IkZ88bR9QK3ji3JhnfKbEBWL1lDje2bzKv1iCaXUg4A,17742
@@ -326,11 +326,11 @@ holado_report/report/reports/feature_report.py,sha256=i0wpk3LQLArVjWDsP9UcNSJzAU
 holado_report/report/reports/scenario_report.py,sha256=eMyqw9EzaKMmX3pGFJN1rqAOQ5eqO2ISZdxAfK3XQR4,2945
 holado_rest/__init__.py,sha256=BOeE6t6ejeqRYd44SE4vYJVTNz01BwcVCIWfwRQ5axg,1526
 holado_rest/api/rest/TODO.txt,sha256=2hhmTDatpplFhgv8fkBPM4WOa6pow-978-0pmN51cU0,59
-holado_rest/api/rest/rest_client.py,sha256=DPKvGuXC4DTsVqlVp5PebUHAW6z2H94fLmygfYm8CY8,4980
-holado_rest/api/rest/rest_manager.py,sha256=JA1yzXIn3KEMhBzYs7HqN47xh4JaWA_UULkopYaqu2o,3392
+holado_rest/api/rest/rest_client.py,sha256=jFn0V3qbXsLqBintzD9fVVBgULkGGRkBJhhN_9dzNAw,5666
+holado_rest/api/rest/rest_manager.py,sha256=nekokAwN73n7Dn3nLhwf22XaKDW1sYjy4-JLWdfGxBQ,3559
 holado_rest/tests/behave/steps/__init__.py,sha256=lEH5NYkKtpgDV2ZAO1qAGNN4ipwILWMpgvQgnamgYKk,1283
 holado_rest/tests/behave/steps/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado_rest/tests/behave/steps/api/rest_client_steps.py,sha256=jL-8rYicYxrkQVUIzxybxgbb_a5TWZE7P-nB-_Yvxh8,7584
+holado_rest/tests/behave/steps/api/rest_client_steps.py,sha256=-msAniL0tBxhwPGIIWMryxuvVCfzQS_B2TngIdluVZg,9793
 holado_rest/tests/behave/steps/private/__init__.py,sha256=TGsd7qLZpPQRxphFzgepFa22NhHSoZgxAWSIqwvA4L8,1276
 holado_rest/tests/behave/steps/private/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_rest/tests/behave/steps/private/api/rest_steps.py,sha256=Sca0EM6uuzG-Zk976vz-EKvbwViha2vABAOpkXp9gTg,3360
@@ -539,7 +539,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
 test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
 test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado-0.3.0.dist-info/METADATA,sha256=6_P7Ukb6sh53S603UEpYVACcVgWDWrun95rGLaJOMFo,6043
-holado-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.3.0.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.3.0.dist-info/RECORD,,
+holado-0.4.0.dist-info/METADATA,sha256=PZDIHDuLFY830G2HzgDA7fBQ3C4eDwADIhnCN-xzAVo,6043
+holado-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.4.0.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.4.0.dist-info/RECORD,,

holado_python/tests/behave/steps/standard_library/hashlib_steps.py

@@ -40,7 +40,7 @@ def __get_variable_manager():
 def step_impl(context, var_name, code_size, content, prefix):
     """Return a code computed with content as input.
     Dynamic part of the code is computed with blake2b hash algorithm.
-    If code_size (minus length of prefix if defined) is not a multiple of 2, it is rounded to the multiple of 2 juste below.
+    If code_size (minus length of prefix if defined) is not a multiple of 2, it is rounded to the multiple of 2 just below.
     """
     var_name = StepTools.evaluate_variable_name(var_name)
     code_size = StepTools.evaluate_scenario_parameter(code_size)

holado_rest/api/rest/rest_client.py

@@ -15,6 +15,7 @@ from holado_core.common.exceptions.functional_exception import FunctionalExcepti
 from holado_core.common.exceptions.technical_exception import TechnicalException
 import logging
 from holado_core.common.tools.tools import Tools
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -56,6 +57,13 @@ class RestClient(object):
         if Tools.do_log(logger, logging.DEBUG):
             logger.debug(f"[{self.name}] Authenticate with token type '{token_type}' and access token '{access_token}'")
         self.__headers['Authorization'] = f'{token_type} {access_token}'
+    
+    def with_ssl(self, ssl_kwargs):
+        unexpected_keys = set(ssl_kwargs.keys()).difference(['verify', 'cert'])
+        if len(unexpected_keys) > 0:
+            raise TechnicalException(f"Unmanaged SSL arguments: {unexpected_keys}")
+        
+        self.__kwargs.update(ssl_kwargs)
         
     def response_result(self, response, status_ok=200):
         if response.status_code != status_ok:
@@ -63,8 +71,10 @@ class RestClient(object):
         
         if "application/json" in response.headers['Content-Type']:
             return response.json()
-        else:
+        elif response.headers['Content-Type'].startswith('text'):
             return response.text
+        else:
+            return response.content
     
     def request(self, method, path, **kwargs):
         url = self.__build_url(path=path)
@@ -104,6 +114,13 @@ class RestClient(object):
         if self.__headers:
             res['headers'] = self.__headers
         if request_kwargs:
+            # Ensure data is in json string format
+            if 'data' in request_kwargs:
+                data = request_kwargs.pop('data')
+                if not isinstance(data, str):
+                    data = json.dumps(data)
+                res['data'] = data
+            
             for key in list(request_kwargs.keys()):
                 if key in res and isinstance(res[key], dict):
                     res[key].update(request_kwargs.pop(key))

holado_rest/api/rest/rest_manager.py

@@ -33,6 +33,7 @@ class RestManager(object):
         url = kwargs.pop("url")
         headers = Tools.pop_sub_kwargs(kwargs, "headers.")
         authentication = Tools.pop_sub_kwargs(kwargs, "authentication.")
+        ssl_kwargs = Tools.pop_sub_kwargs(kwargs, "ssl.")
         if len(kwargs) > 0:
             raise TechnicalException(f"Unmanaged arguments: {kwargs}")
     
@@ -53,6 +54,10 @@ class RestManager(object):
             else:
                 raise TechnicalException(f"Unmanaged authentication type '{authentication.keys()}' (possible authentication types: 'user', 'token'")
         
+        # Manage ssl if needed
+        if len(ssl_kwargs) > 0:
+            res.with_ssl(ssl_kwargs)
+        
         return res
     
     def _new_rest_client(self, name, url, headers):

holado_rest/tests/behave/steps/api/rest_client_steps.py

@@ -63,21 +63,62 @@ if RestClient.is_available():
         var_name = StepTools.evaluate_variable_name(var_name)
         path = StepTools.evaluate_scenario_parameter(path)
         client = StepTools.evaluate_variable_value(var_client)
+        
+        # Manage request arguments as step table
+        request_kwargs = {}
+        if hasattr(context, "table") and context.table is not None:
+            table = BehaveStepTools.convert_step_table_2_value_table_with_header(context.table)
+            request_kwargs = ValueTableConverter.convert_name_value_table_2_json_object(table)
+        
+        # Manage request arguments as json text
+        # Manage data as json text
+        text = BehaveStepTools.get_step_multiline_text(context, raise_exception_if_none=False)
+        if text is not None:
+            if len(request_kwargs) > 0:
+                raise TechnicalException(f"Request kwargs are already set to {request_kwargs}")
+            request_kwargs = json.loads(text)
+        
+        # Process request
+        res = client.request(request_method, path, **request_kwargs)
+        
+        # Store result
+        if Tools.do_log(logger, logging.DEBUG):
+            res_table = TableManager.convert_object_attributes_2_name_value_table(res)
+            logger.debug(f"Response of {request_method} {path}:\n{res_table.represent(4)}")
+        __get_variable_manager().register_variable(var_name, res)
+    
+    @Step(r"(?P<var_name>{Variable}) = (?P<request_method>delete|get|patch|post|put) (?P<path>{Str}) \(REST client: (?P<var_client>{Variable})\)")
+    def step_impl(context, var_name, request_method, path, var_client):
+        var_name = StepTools.evaluate_variable_name(var_name)
+        client = StepTools.evaluate_variable_value(var_client)
 
-        # Manage data as table
+        execute_steps(format_step_with_context(context, 
+                u"__RESPONSE__@ = response of {request_method} {path} (REST client: {var_client})"
+                    .format(request_method=request_method, path=path, var_client=var_client) ))
+        
+        response = __get_variable_manager().get_variable_value("__RESPONSE__@")
+        res = client.response_result(response)
+        
+        __get_variable_manager().register_variable(var_name, res)
+    
+    @Step(r"(?P<var_name>{Variable}) = response of (?P<request_method>delete|get|patch|post|put) (?P<path>{Str}) with data \(REST client: (?P<var_client>{Variable})\)")
+    def step_impl(context, var_name, request_method, path, var_client):
+        var_name = StepTools.evaluate_variable_name(var_name)
+        path = StepTools.evaluate_scenario_parameter(path)
+        client = StepTools.evaluate_variable_value(var_client)
+        
         data = None
+        
+        # Manage request arguments as step table
         if hasattr(context, "table") and context.table is not None:
             table = BehaveStepTools.convert_step_table_2_value_table_with_header(context.table)
-            data_obj = ValueTableConverter.convert_name_value_table_2_json_object(table)
-            data = json.dumps(data_obj)
-            if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
-                logger.trace(f"Transformed parameters to JSON is: {data}")
-            
+            json_obj = ValueTableConverter.convert_name_value_table_2_json_object(table)
+            data = json.dumps(json_obj)
+        
+        # Manage request arguments as json text
         # Manage data as json text
         text = BehaveStepTools.get_step_multiline_text(context, raise_exception_if_none=False)
         if text is not None:
-            if request_method in ['delete', 'get']:
-                raise TechnicalException(f"Unexpected json text for request method '{request_method}'")
             if data is not None:
                 raise TechnicalException(f"Data is already set to [{data}]")
             data = text
@@ -91,13 +132,13 @@ if RestClient.is_available():
             logger.debug(f"Response of {request_method} {path}:\n{res_table.represent(4)}")
         __get_variable_manager().register_variable(var_name, res)
     
-    @When(r"(?P<var_name>{Variable}) = (?P<request_method>delete|get|patch|post|put) (?P<path>{Str}) \(REST client: (?P<var_client>{Variable})\)")
+    @Step(r"(?P<var_name>{Variable}) = (?P<request_method>delete|get|patch|post|put) (?P<path>{Str}) with data \(REST client: (?P<var_client>{Variable})\)")
     def step_impl(context, var_name, request_method, path, var_client):
         var_name = StepTools.evaluate_variable_name(var_name)
         client = StepTools.evaluate_variable_value(var_client)
 
         execute_steps(format_step_with_context(context, 
-                u"__RESPONSE__@ = response of {request_method} {path} (REST client: {var_client})"
+                u"__RESPONSE__@ = response of {request_method} {path} with data (REST client: {var_client})"
                     .format(request_method=request_method, path=path, var_client=var_client) ))
         
         response = __get_variable_manager().get_variable_value("__RESPONSE__@")