holado 0.4.0__tar.gz → 0.4.1__tar.gz

{holado-0.4.0 → holado-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.4.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.4.1/packaging/VERSION

@@ -0,0 +1 @@
+0.4.1

{holado-0.4.0 → holado-0.4.1}/src/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-0.4.1/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
+Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
+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-0.4.1/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+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-0.4.0 → holado-0.4.1}/src/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-0.4.0 → holado-0.4.1}/src/holado_rest/api/rest/rest_client.py

@@ -66,15 +66,17 @@ class RestClient(object):
         self.__kwargs.update(ssl_kwargs)
         
     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}")
-        
         if "application/json" in response.headers['Content-Type']:
-            return response.json()
+            res = response.json()
         elif response.headers['Content-Type'].startswith('text'):
-            return response.text
+            res = response.text
         else:
-            return response.content
+            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)
@@ -117,7 +119,7 @@ class RestClient(object):
             # Ensure data is in json string format
             if 'data' in request_kwargs:
                 data = request_kwargs.pop('data')
-                if not isinstance(data, str):
+                if data is not None and not isinstance(data, str):
                     data = json.dumps(data)
                 res['data'] = data
             

{holado-0.4.0 → holado-0.4.1}/src/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):

{holado-0.4.0 → holado-0.4.1}/tests/behave/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
 

holado-0.4.1/upgrade_requirements_to_latest.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+pip install --upgrade --upgrade-strategy eager -r requirements.txt

holado-0.4.0/packaging/VERSION

@@ -1 +0,0 @@
-0.4.0

holado-0.4.0/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----

holado-0.4.0/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -1,28 +0,0 @@
------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==
------END PRIVATE KEY-----