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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.3.0
+Version: 0.4.1
 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.1.dist-info}/RECORD

@@ -219,7 +219,7 @@ holado_keycloak/tools/keycloak/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 holado_keycloak/tools/keycloak/keycloak_client.py,sha256=QXAsf9rF0pKq1dHhXeZFZOxuEg_1uzp6vqXnwWDnegg,4019
 holado_logging/__init__.py,sha256=EMmwm_jHe739gftVCmf6lb_dT20IVseVg0bbGGADn8w,2176
 holado_logging/common/logging/holado_logger.py,sha256=vlU_q5jYD9Qf-xWFBogeNiIR9qpRri-68OfMofgbhy4,3320
-holado_logging/common/logging/log_config.py,sha256=aSq1PUgQZXsomhmCmJLdVNQrJjkRNaisjVLVbon9dnM,6549
+holado_logging/common/logging/log_config.py,sha256=DdYEW-2YSZ6QZDZCeVn_IZOKQlwWvqi2NWEbPhvExxw,6578
 holado_logging/common/logging/log_manager.py,sha256=gq92IAfnKEX-GKUHexNVgEI0UUrUdiWaC5GLcSTAaUE,13604
 holado_multitask/__init__.py,sha256=EwuwiBmp8ICbPZ8CKPju8tHRTh2rG68PB_wGXczY9rw,2143
 holado_multitask/multiprocessing/function_process.py,sha256=HFXjpnzWed5J1tjmWMQyRx8AGcY6D1laegHqZ5j1dco,4550
@@ -276,20 +276,20 @@ holado_python/standard_library/socket/echo_server.py,sha256=ntApbwcckiEEBw-qjE48
 holado_python/standard_library/socket/message_socket.py,sha256=r9cAs-HWGE0t1Dn09RA-HJ5pBExEjBwN_y9F-JYxno8,5638
 holado_python/standard_library/socket/non_blocking_socket.py,sha256=FGJHbSTTe5KgCBXva9YrU8Fxn7fGbckQy9jsBNtbQiI,7164
 holado_python/standard_library/socket/socket.py,sha256=K2EURF_C8FttqOy7bfiMkVR74W8y3yH5Wbg_wXhzzyM,15781
-holado_python/standard_library/ssl/ssl.py,sha256=LzCXS0qxRq4OiUMvr_2HG36mM7MLPvOPUIl2Ue6zGq4,10775
+holado_python/standard_library/ssl/ssl.py,sha256=S0t9uBy6t6MWGUXgvZk3APmjhNom74qaOHbFyfznY0Y,10987
 holado_python/standard_library/ssl/resources/certificates/NOTES.txt,sha256=GlPGGZT_lqV2fNeh-JKQZDC7xJOa3fLTYuwnC_-UYNg,384
 holado_python/standard_library/ssl/resources/certificates/localhost.crt,sha256=iLmZpDuOQVawUlbZkb72g2-uv1c4SAmRJOrm4Th5anY,1123
 holado_python/standard_library/ssl/resources/certificates/localhost.key,sha256=lP2NCvB9mr2E5sk8whA8FyQRcyU6H7sdWkJeKz80Hyc,1704
 holado_python/standard_library/ssl/resources/certificates/rootCACert.pem,sha256=ECQDZ8OHRfqpZHCu6JRLMUjiONaPIhKZQF0-kidVrWQ,1424
-holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=C7mk5fRBkwm_zeoLa6kymjWqliOO1vdwz0jxr7nDZcQ,1237
-holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=asKZXE3HbJseytFBBaRmBrXRHWn6LqYrJnMtrzIrT84,1708
+holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=dKBWzPBWggkaJcsa3gtVuwIuGpQ9sijHfoQa_Xo0kUY,1237
+holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=gm9RKRgXKofFe3Mvk_zykYH6Q6tmyLM6-vA5D7_Pm-U,1704
 holado_python/tests/behave/steps/__init__.py,sha256=TWEk-kBTTDHi9I4nuu48nufmNMdZ9FHAhPZv0A_cWzc,1661
 holado_python/tests/behave/steps/convert_steps.py,sha256=bZqRvJVp_u6fSPpdu4ne9NwVyZmui7R-AVdO2-H-I1A,2728
 holado_python/tests/behave/steps/iterable_steps.py,sha256=f4vGIWBH8Qnjq69Q-ZBluYyctQ8SKauazTc41dsktZA,4041
 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=a6CNXBEkuCF3MJnXRVhvBrVKBRqtV4NFohFsdFaInUc,5729
+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
@@ -388,7 +388,7 @@ holado_sftp/tools/sftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 holado_sftp/tools/sftp/sftp_client.py,sha256=ExpIQoImZt9KpHuGLuZmxZetvuzK426-DQ67pDPenOM,4486
 holado_sftp/tools/sftp/sftp_server.py,sha256=N_Ym3Rm8w_QS6E0id543LZXfQ7G38DeKjVwCRH2irKA,1969
 holado_swagger/__init__.py,sha256=VSOq3mr1SaTEnceP_4kwYBYAMTuyVE9_61wOdKKasis,1664
-holado_swagger/swagger_hub/mockserver/mockserver_client.py,sha256=gLb1n9Jl9UjxznvXvQbgNB4QBvRHJ8--kGVGqKK7QsQ,4052
+holado_swagger/swagger_hub/mockserver/mockserver_client.py,sha256=L7P8aNi5Zuh2xRURbTLkMKeS3XcMENdgvb5BbOb3La0,4067
 holado_swagger/swagger_hub/mockserver/mockserver_manager.py,sha256=5ubBMgtNNaoXcgDjPNM0BcJ0N_QaE_hvmy4i05Pq53w,1646
 holado_swagger/tests/behave/steps/__init__.py,sha256=joCT_nKaotXBBMNTXxOBcmr98gjmjDkY1Zbu5lCL8B4,1290
 holado_swagger/tests/behave/steps/swagger_hub/mockserver_steps.py,sha256=_M5WyF35qBjvDnXbohhMA9kV3D1H1aRnTBQ1iOtmxHA,3749
@@ -451,7 +451,7 @@ test_holado/__init__.py,sha256=TIHAHrF05rvz6-VDKuDBSBjasD6PxTxXvcXjMEC3D6E,54
 test_holado/__main__.py,sha256=PVdCX8V_RGRzbQQKVxf7eyt8a10XfUJ1pcaajGgIlus,1509
 test_holado/build_docker_image_to_test_holado_in_docker.sh,sha256=B3hbi0yKnEC-t9S18o6ZR27AU1bqiuptwOqm6H7tv8s,142
 test_holado/environment.py,sha256=X4a6q9Km_Ya8XFIjwlDULgEQOkucumXxjIrIRtK1GDY,2294
-test_holado/logging.conf,sha256=lXttFc6GDYbUoM_u0_V27Rhs4AQ3G7dD2Xkzz7F11t0,1174
+test_holado/logging.conf,sha256=lPN0DwMK18nVcnVolVS32cFLHhv6NkWLo6fQW0BRDnk,1202
 test_holado/test_holado_session_context.py,sha256=qOB_i2k8mYjkR3-q2uv0B04xFc1K3p-K20ttYwe1Z18,1364
 test_holado/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test_holado/features/NonReg/api/REST.feature,sha256=ouaDdgXulNlXcZ7fSrSGCX-qDmQoCpXWnR_hKcKh8M4,469
@@ -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.1.dist-info/METADATA,sha256=LkyjyCuo6hjHK4mtZwHiTHiz0P0L0YFAiwepTDC7dQg,6043
+holado-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.4.1.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.4.1.dist-info/RECORD,,

holado_logging/common/logging/log_config.py

@@ -32,6 +32,10 @@ class LogConfig(object):
             logging.warning(f"Logging was already configured, it is not possible to configure it twice. This new configuration is skipped.")
             return
         
+        # Use holado loggers
+        if use_holado_logger:
+            cls.__set_holado_loggers()
+        
         # HolAdo needs at least to add logging level TRACE and PRINT
         cls.add_logging_level_trace()
         cls.add_logging_level_print()
@@ -58,9 +62,6 @@ class LogConfig(object):
                 log_in_file = True if log_in_file == "True" else False
             cls.log_in_file = log_in_file
         
-        if use_holado_logger:
-            cls.__set_holado_loggers()
-        
         cls.__is_configured = True
     
     @classmethod

holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -2,20 +2,20 @@
 MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
 Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
-SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUwNTI4MTMxODIwWhcN
-MjUwNTI5MTMxODIwWjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANvo9G/86es6qoCHTum0RAoqAAiY
-qnOCLgXmamgfQgbfYoBIkNTBBVzsZyoZIY4QuuO8E07VmbrnH23czCSAO5akPb7D
-teotATqDf4My0Ybht62nLoxhHBb9jrzSgv4+04gy/W6wu5diyfeY8BNopHkUkmEN
-WhmGkP9s9npUGaEfEeasuiB1JMkAEOWnw+kHqE3Us+4Av4Mht6srswst3B90WCIV
-Rry48gRJS4qZoAk1dwZHIcYSOfMJ8Pu69wS1qjRwRPLc3dfnUs2E3dAx1FDxDBkK
-eQ73VUm64A5AXLYRk3PvgPwbcgerkLAnYAb5o8YJmyufGXKQNhmZxcCt+t0CAwEA
-AaNCMEAwHQYDVR0OBBYEFDgjXXI6juiInalFSZEZM6BcEW9UMB8GA1UdIwQYMBaA
-FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQAu6SJ3OT6D
-fhjfg4wRMHZVsaYSF6Kwe0RNt6izRkv5MUGi6Ew0SK1Mm+qxE51G3aaVCE4G+P1e
-ACOiBL55saWDJtdng2VTKhUsFxIk2c/t+tuh7ttV7i0yGbaLGDP0N2FveBhKj/5d
-SaPpAQvZ1rFhXpUU1jQr+xi5pP/iOPH02O8A8VgHyGebDVXs8iWMHjozOrRhgQVJ
-YAl5lyYs+aj199p9ixwY3RPPWbUcggvAipv9bu6uEEIWMOMMERM2P7yFYaWJBcw5
-A/Uqu2bBLmOu9/qmlEj2uQfTeVhnoT/bZBfmPcrL64tHjw7G5u0WuooPNTI23z28
-3ttcr+fDbDR4
+SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUwNjI2MTYxMzE3WhcN
+MjUwNjI3MTYxMzE3WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4WKCcsF4eCjLUeUT3/3IbM8m0N
+Z5Fgmqe3K9lDOXFQa/dX98/gGPswQiWkJ3ALspYgDGnfqEQEc5kBrTNpom0xoWPD
+vgv7M4O222bMtVvXyvE5/Absw/VYGhW5KGln2k/4hEl0Xl2kS7P0KMlrczrjDyqW
+NhGMvgWfSSF1D1fP1tx4E/74TnCrUQy332wlprxB567kIlPLUe4zbNT1PvAhXXj1
+r9kKYBy6ontb+VWnrYraD3YhLOsez3OocY32JfvB8jFgjaxKTFMCchOJaFuFZEl8
+/wCPawwCdG8aIvC+EVuttbA3F/s3vDjQRTKW9WJ1KoJhRIwYbwwmvNIycMkCAwEA
+AaNCMEAwHQYDVR0OBBYEFMXW798gAD4iFP15opS+N49NX/9HMB8GA1UdIwQYMBaA
+FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQAtxMjai8tc
+VEA0TTPeDplTyDUYZqwnb+wbxOmb8+CTwt7hj/o1vDS82QGoKINiHyRGhyJrfiTQ
+6TqBRxZMt52IdYwQoAMDnxyjxLdeVr0RNbxGziWBs3fjjahaEX/BMqzu5wd4mcpi
+UUmauULmYtY3vKiw8wsUEEkzzMM3fNJklMdMcR47cbH783FuJ7clhYaE/pJlq8RD
+wNIgume1u3BstRpIHafuZOy4Rg2nDiIuQoIORq7n8eRfgU9ZxVL7kZOgPFiTuokq
+0EgnEhwOTUahO6aFpN9j/wCIANLrf1bZWw7v80bno7aFQ1XOm2RW5yJywkc7LFqi
+Dia/obmoNitb
 -----END CERTIFICATE-----

holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDb6PRv/OnrOqqA
-h07ptEQKKgAImKpzgi4F5mpoH0IG32KASJDUwQVc7GcqGSGOELrjvBNO1Zm65x9t
-3MwkgDuWpD2+w7XqLQE6g3+DMtGG4betpy6MYRwW/Y680oL+PtOIMv1usLuXYsn3
-mPATaKR5FJJhDVoZhpD/bPZ6VBmhHxHmrLogdSTJABDlp8PpB6hN1LPuAL+DIber
-K7MLLdwfdFgiFUa8uPIESUuKmaAJNXcGRyHGEjnzCfD7uvcEtao0cETy3N3X51LN
-hN3QMdRQ8QwZCnkO91VJuuAOQFy2EZNz74D8G3IHq5CwJ2AG+aPGCZsrnxlykDYZ
-mcXArfrdAgMBAAECggEAe76UfcfloTY752M8ZonHl6iWqD+v+puQZkWILtsX/mIJ
-PYKX7QBIkkd8rdXCafzEDY4xlzTe8qtHpjyOqyN1ZIk7LXNXlFSK0nBYem1INgwh
-nZfru5aRheZcQah7ibG0unlm3riYdtFiMO9geKtzkaafz/kBcEemo/SepatZWK3m
-DQX6okkpHh04GZNIO52K2QCaYpmj14fXIi2p5M4+KD+gmYbXhkmzNdcjz2l/wkqo
-SziZf31nzuoHd6FuQ6vAsmXU/m6jW7Nll0wsxTm5Ynw5SoIrAbreJJmSSD8o2Shj
-mvzWlurk1SgOhtoHP+AaVAn454x/Fn7+8u0f5ptNyQKBgQDvKc/3etCi22ntlgQM
-dIwxbUPnmSvwejpMPOq3kMGTQWUJcKFinbPC28s/lJGzVjMsH5VisjiprCt3TXGN
-XwmLNaUycWN3po9HyLSndAjHWM4aQ3yTOFKfLFEDUhKi8Dxy995KmHhgSSHd65qM
-PvnPhITZWfKLkItCOmNEULxE8wKBgQDrZCji91ztgNyN3MHDGN2o854lAvWc1l6s
-4L8ZwU/RCNYyvMkdhadASzLwVC44q/6txGjTHGjnJPdkzV2u+WsPVWG2uCaD9PV1
-3L8wyG9sJ2YoJE5QcAQ+1J+rRN3fluzSKFiQNDpf7C5YqCPvk7C7lXFllGHM6FmF
-hoYbyIb07wKBgQDKaF+qulViz0FqIwFQLT8NAcVrd7W5MyitpwyayLcbUkgZYioj
-lQYzDuOH7swUtApg+GXsfpr39k9fC7rjg6BHIeKqu04MUHmIrjM+WTSoyd68WYtP
-6WX7cn0py0ccgScXwfFuvnV6P8qaz7Afq5iuaSAp9zcPqQhCx7mFcrKzwwKBgQCo
-VH3woNgxd59BS4a8j8GjmmOTMCSYPayCkE3Yiyca4ujaa6qek/9guOX6exh6qnR7
-qyMTJRPXh9XqnfnKsM5grrwrwFC6uKf32x5WMl+LxjkFp8DhQNmoXMC554uK4xED
-0JpUtSSxh+I0wDjCkKkn29y1uYCe2eF63RJ2N9ZavQKBgQCbHI/bMIZw/fsaijg3
-676mpQqFPiQdXTogw8UWzZBAvP6eQOnqQ9aw4tJt6OZWnwCDMwXrEYk3H8qisZl7
-ou63o5t8bTrU4C6e1VIQ1XuQM4FEpx6/TFwBG2FXkgzGHUpHlR9+woxqvmQgfsiW
-tEJ/TZv7bU6s9FRLTzMspp+tIA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDuFignLBeHgoy1
+HlE9/9yGzPJtDWeRYJqntyvZQzlxUGv3V/fP4Bj7MEIlpCdwC7KWIAxp36hEBHOZ
+Aa0zaaJtMaFjw74L+zODtttmzLVb18rxOfwG7MP1WBoVuShpZ9pP+IRJdF5dpEuz
+9CjJa3M64w8qljYRjL4Fn0khdQ9Xz9bceBP++E5wq1EMt99sJaa8Qeeu5CJTy1Hu
+M2zU9T7wIV149a/ZCmAcuqJ7W/lVp62K2g92ISzrHs9zqHGN9iX7wfIxYI2sSkxT
+AnITiWhbhWRJfP8Aj2sMAnRvGiLwvhFbrbWwNxf7N7w40EUylvVidSqCYUSMGG8M
+JrzSMnDJAgMBAAECggEAB6aan7ehAe/GCcPxpGZmdcZ8O9jkbR2HmsAeHps0a1nE
+PmyLQBjZdKj2VzNROR6HHJ/nBjfztkvWUyJkqHRKjeu8XfJaVxQ5cZAcuM73PP5Q
+PTQ5zxcorOep3uzWSZzWvR8lUR72MVgoPp4n+WEEkO3e/OVa03GMYa3esb6LQa0S
+QcPkMwsxgPZQ1V9s85IIyVBn2ebbOhDbU1mz0FhzWtJ18Jikm0KhJuHUwwXAwO4H
+aINMbSkckOtyJwQ2Iu2Me8/ZiFLUTCMkdym2fb3jkWS+uiHxJye0Pg4AnXtIZE+W
+cUwwrZE+TnhodiqoAc3CgD0ZkqIpp07KMl7FM9jGaQKBgQD7vQHHBHKLFbW6e9dT
+ruZR+4kwOeTA1jzKlr2D8/Y6XJAPVG2UCn1oxfMTp6NkqC9nmalct4FH6lzpleZG
+Duwm2kxhmI+kxPj5MXH/MDlMSL3nw06mQD8tWUM9u6M73Rm6DMg5VMH3WqcUzycl
+4FZDl0LcABDZsP+3f2A34l30uwKBgQDyHfxC5bA93cbvVzo3Qd5I611oKgg9J3vh
+/5I2bT3HKCIb7ruAthbDIO5/5K0ufIIzKAxcI9EJd2ViSO2MHhMQOfkrcKh6Kzb+
+u61r52ZRKN1aI2UiZzqtUTpkOetevRh1WMmH0CmItxZ/OpqDq/2OyQ6XedZWvd5t
+/PockMZaSwKBgBtZXWgRw5/4q9Wmvq4Iwl0FxtHGeGO64r/fwJclWgrdI4mG0qDS
+wu0vFEl+XPICk6Pdvdik1xbJD28RKgNSe7V84e94c6KjA6mPBaODybXP8VHMli7Z
+rANxPyzlxcYrLzBXUylnW+tTnfNUzhv/U1/kfw8HsszzvdRhskJgBXUhAoGBAIHU
+sHwS/PH/5fhcFvyglpkVlS4RM//PF3A2Auqqo7ETBU9jMiqv+f7CvwHX10IRRCQ4
+eoBCOIrR+oy8vJ0hV2mhHMs9iyqP19q7OyCcolItDp2SU14iauWbpCswn9Vaoy3x
+4YexiUQloaux+j9XUA1sJSX3EIfNIuRp/piozaSHAoGAWODO4Ug0aU3SxHoj3muQ
+dgQmAcwNKif7UOWCcB/6qQFDMqDqiWuqPX1x7sUYjN61Dd2AwoOanI8phDsp2R4/
+7ywBy2es5ePrk5Ma332QA/6rxkLVXGaGEV4mCVziF4PEGsbMZzx7YDIZoXUwuKw0
+JLVTXQhAmlEnNoMi1T/zLB8=
 -----END PRIVATE KEY-----

holado_python/standard_library/ssl/ssl.py

@@ -90,7 +90,11 @@ class SslManager(object):
                                 f"Note: step 'Given CACERTS_PATH = CA certs file path (from certifi package)' can be used to get the path to CA file coming with 'certifi' package that is supposed to be installed when using ssl module",
                                 ]
                     raise TechnicalException("\n".join(msg_list))
-                logger.debug(f"Loaded CA certificates: {res.get_ca_certs()})")
+                try:
+                    logger.debug(f"Loaded CA certificates: {res.get_ca_certs()})")
+                except NotImplementedError:
+                    # Depending on environment, get_ca_certs can be not implemented (ex: python 3.10 and pip v25.1.1)
+                    pass
                 logger.debug(f"Loaded ciphers: {res.get_ciphers()})")
                 
         except Exception as exc:

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,15 +57,26 @@ 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}")
         
-    def response_result(self, response, status_ok=200):
-        if response.status_code != status_ok:
-            raise FunctionalException(f"[{self.name}] Request failed with status {response.status_code} (expected success status: {status_ok}")
+        self.__kwargs.update(ssl_kwargs)
         
+    def response_result(self, response, status_ok=200):
         if "application/json" in response.headers['Content-Type']:
-            return response.json()
+            res = response.json()
+        elif response.headers['Content-Type'].startswith('text'):
+            res = response.text
         else:
-            return response.text
+            res = response.content
+        
+        if response.status_code != status_ok:
+            raise FunctionalException(f"[{self.name}] Request failed with status {response.status_code} (expected success status: {status_ok}) on error: {res}")
+        
+        return res
     
     def request(self, method, path, **kwargs):
         url = self.__build_url(path=path)
@@ -104,6 +116,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 data is not None and 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__@")

holado_swagger/swagger_hub/mockserver/mockserver_client.py

@@ -45,7 +45,7 @@ class MockServerClient(RestClient):
             params['format'] = format_
             
         result = self.put('/mockserver/retrieve', params=params)
-        res = result.json()
+        res = self.response_result(result)
         
         if since_datetime is not None:
             if not isinstance(since_datetime, datetime.datetime):

test_holado/logging.conf

@@ -22,6 +22,7 @@ holado_multitask=WARNING
 #holado_protobuf.ipc.protobuf=DEBUG
 #holado_protobuf.ipc.protobuf.protobuf_messages=TRACE
 #holado_python.standard_library.socket=DEBUG
+#holado_rest.api/rest=DEBUG
 #holado_value.common.tables.value_table_cell=TRACE
 holado_s3.tools.s3.minio_client.trace=INFO