Merge branch 'feature/CH-226' of github.com:MetaCell/cloud-harness into feature/CH-226

filippomc · filippomc · commit 5378b58e2a2d · 2025-11-19T17:09:29.000+01:00
diff --git a/applications/common/server/common/__main__.py b/applications/common/server/common/__main__.py
@@ -4,7 +4,6 @@
 from cloudharness import log
 
 
-
 app = init_flask()
 
 if __name__ == '__main__':
diff --git a/applications/common/server/common/util.py b/applications/common/server/common/util.py
@@ -67,8 +67,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -87,8 +87,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
@@ -144,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
     :rtype: dict
     """
     return {k: _deserialize(v, boxed_type)
-            for k, v in data.items() }
+            for k, v in data.items()}
diff --git a/applications/samples/backend/samples/controllers/resource_controller.py b/applications/samples/backend/samples/controllers/resource_controller.py
@@ -20,7 +20,7 @@ def create_sample_resource(sample_resource=None):  # noqa: E501
     # Connexion 3.x with pythonic_params should auto-deserialize, but if not, get from Flask request
     if sample_resource is None:
         sample_resource = request.get_json()
-    
+
     if isinstance(sample_resource, dict):
         sample_resource = SampleResource.from_dict(sample_resource)
 
@@ -95,10 +95,10 @@ def update_sample_resource(sampleresource_id, sample_resource=None):  # noqa: E5
     # Connexion 3.x with pythonic_params should auto-deserialize, but if not, get from Flask request
     if sample_resource is None:
         sample_resource = request.get_json()
-    
+
     if isinstance(sample_resource, dict):
         sample_resource = SampleResource.from_dict(sample_resource)
-    
+
     try:
         resource = resource_service.update_sample_resource(
             int(sampleresource_id), sample_resource)
diff --git a/applications/samples/backend/samples/controllers/security_controller_.py b/applications/samples/backend/samples/controllers/security_controller_.py
@@ -21,25 +21,25 @@ def info_from_cookieAuth(api_key):
     """
     Check and retrieve authentication information from cookie-based API key.
     This function is called by Connexion when cookieAuth security is used.
-    
+
     :param api_key Token provided by the kc-access cookie
     :type api_key: str
     :return: Decoded token information or None if token is invalid
     :rtype: dict | None
     """
     if not api_key:
         return None
-    
+
     # Set the authentication token in the middleware context
     # so that get_authentication_token() can access it
     set_authentication_token(api_key)
-    
+
     # Decode and validate the token
     try:
         decoded = decode_token(api_key)
         if decoded:
             return decoded
     except Exception:
         pass
-    
+
     return None
diff --git a/applications/samples/backend/samples/util.py b/applications/samples/backend/samples/util.py
@@ -67,8 +67,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -87,8 +87,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
@@ -144,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
     :rtype: dict
     """
     return {k: _deserialize(v, boxed_type)
-            for k, v in data.items() }
+            for k, v in data.items()}
diff --git a/applications/volumemanager/server/volumemanager/util.py b/applications/volumemanager/server/volumemanager/util.py
@@ -67,8 +67,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -87,8 +87,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
@@ -144,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
     :rtype: dict
     """
     return {k: _deserialize(v, boxed_type)
-            for k, v in data.items() }
+            for k, v in data.items()}
diff --git a/applications/workflows/server/workflows_api/util.py b/applications/workflows/server/workflows_api/util.py
@@ -67,8 +67,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -87,8 +87,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
@@ -144,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
     :rtype: dict
     """
     return {k: _deserialize(v, boxed_type)
-            for k, v in data.items() }
+            for k, v in data.items()}
diff --git a/infrastructure/base-images/cloudharness-base/Dockerfile b/infrastructure/base-images/cloudharness-base/Dockerfile
@@ -3,6 +3,7 @@ FROM ${PARENT}
 
 RUN apt update && apt install -y --no-install-recommends \
     gcc \
+    g++ \
     python3-dev \
     libpq-dev \
     nfs-common \
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/middleware.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/middleware.py
@@ -17,30 +17,30 @@
 def _get_user(kc_user_id: str) -> User:
     """
     Get or create a Django user for the given Keycloak user ID.
-    
+
     CRITICAL SAFETY GUARANTEE: This function will NEVER return a User without a valid Member.
     If we cannot ensure a Member exists, we return None (which triggers anonymous user behavior).
-    
+
     Returns:
         User: A Django User with a guaranteed Member relationship, or None for anonymous
     """
     user = None
     if kc_user_id is None:
         return None
-    
+
     try:
         # Try to get existing user by member relationship
         try:
             user = User.objects.get(member__kc_id=kc_user_id)
-            
+
             # SAFETY CHECK: Verify member relationship is intact
             try:
                 _ = user.member  # Access to verify it exists
             except Member.DoesNotExist:
                 # Member was deleted between the query and now - return None for safety
                 log.error("User %s found but Member missing. Returning anonymous.", user.id)
                 return None
-                
+
         except User.DoesNotExist:
             # User doesn't exist - create it via sync_kc_user
             user_svc = get_user_service()
@@ -49,15 +49,15 @@ def _get_user(kc_user_id: str) -> User:
                 # sync_kc_user is atomic and guarantees Member creation
                 user = user_svc.sync_kc_user(kc_user)
                 user_svc.sync_kc_user_groups(kc_user)
-                
+
                 # SAFETY CHECK: Final verification that Member exists
                 try:
                     _ = user.member
                 except Member.DoesNotExist:
                     # This should NEVER happen due to sync_kc_user safety, but be defensive
                     log.error("sync_kc_user returned user %s without Member! Returning anonymous.", user.id)
                     return None
-                    
+
             except UniqueViolation as e:
                 # Race condition while creating the Member object
                 log.warning("UniqueViolation error for kc_id %s. Probably a race condition. %s", kc_user_id, str(e))
@@ -69,28 +69,28 @@ def _get_user(kc_user_id: str) -> User:
                 except (User.DoesNotExist, Member.DoesNotExist):
                     log.error("Failed to retrieve user after UniqueViolation. Returning anonymous.")
                     return None
-                    
+
         except User.MultipleObjectsReturned:
             # Race condition, multiple users created for the same kc_id
             log.warning("Multiple users found for kc_id %s, cleaning up...", kc_user_id)
             user = User.objects.filter(member__kc_id=kc_user_id).order_by('id').first()
             User.objects.filter(member__kc_id=kc_user_id).exclude(id=user.id).delete()
-            
+
             # SAFETY CHECK: Verify the kept user has a Member
             try:
                 _ = user.member
             except:
                 log.error("Cleaned up user %s has no Member. Returning anonymous.", user.id)
                 return None
-            
+
             return user
 
         except Exception as e:
             log.exception("User sync error, %s", kc_user.email)
             return None
-            
+
         return user
-        
+
     except KeycloakGetError:
         # KC user not found
         return None
@@ -120,7 +120,7 @@ def __call__(self, request):
             response = self.get_response(request)
             response.delete_cookie('kc-access')
             return response
-        
+
         if kc_user:
             if not user or user.is_anonymous or getattr(user, "member", None) is None or user.member.kc_id != kc_user_id:
                 user = _get_user(kc_user_id)
@@ -159,7 +159,7 @@ def authenticate(self, request):
             except Member.DoesNotExist:
                 log.error("Authenticated user %s has no Member! Falling back to _get_user.", user.id)
                 # Fall through to _get_user which will handle this safely
-        
+
         try:
             kc_user = AuthClient.decode_token(authentication_token.split(' ')[-1])
             kc_user_id = kc_user.get('sub')
@@ -175,5 +175,5 @@ def authenticate(self, request):
             except Member.DoesNotExist:
                 log.error("CRITICAL: _get_user returned user %s without Member! Returning None.", user.id)
                 return None
-        
+
         return None
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py
@@ -113,7 +113,7 @@ def sync_kc_user(self, kc_user: ch_models.User, is_superuser=False, delete=False
 
             # Create user and member atomically
             user, user_created = User.objects.get_or_create(username=username)
-            
+
             # CRITICAL: Ensure Member exists before proceeding
             try:
                 member = Member.objects.get(user=user)
@@ -129,15 +129,15 @@ def sync_kc_user(self, kc_user: ch_models.User, is_superuser=False, delete=False
         user = self._map_kc_user(user, kc_user, is_superuser, delete)
         self.sync_kc_user_groups(kc_user)
         user.save()
-        
+
         # FINAL SAFETY CHECK: Verify Member exists before returning
         # This ensures we never return a user without a Member
         try:
             _ = user.member  # Access member to trigger DoesNotExist if missing
         except:
             # This should never happen, but if it does, create Member immediately
             Member.objects.create(kc_id=kc_user.id, user=user)
-        
+
         return user
 
     def sync_kc_user_groups(self, kc_user: ch_models.User):
diff --git a/libraries/cloudharness-common/cloudharness/__init__.py b/libraries/cloudharness-common/cloudharness/__init__.py
@@ -41,8 +41,6 @@ def dumps(o, *args, **kwargs):
         raise
 
 
-
-
 class NotCorrectlyInitialized(Exception):
     pass
 
diff --git a/libraries/cloudharness-common/cloudharness/utils/server.py b/libraries/cloudharness-common/cloudharness/utils/server.py
@@ -35,11 +35,11 @@ def default(self, o):
                 attr = o.attribute_map[attr]
                 dikt[attr] = value
             return dikt
-        return DefaultJSONProvider.default(self, o)
-    
+        return super().default(o)
+
     def dumps(self, obj, **kwargs):
         """Override dumps to ensure our default method is used
-        
+
         Uses stdlib_json to avoid issues with cloudharness monkeypatch
         """
         kwargs.setdefault('default', self.default)
@@ -86,7 +86,7 @@ def after_request(response):
             response.headers.add('Access-Control-Allow-Headers', 'Content-Type,Authorization')
             response.headers.add('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS')
         return response
-    
+
     @app.before_request
     def handle_preflight():
         if flask.request.method == "OPTIONS" and flask.request.path.startswith('/api/'):
@@ -164,10 +164,10 @@ def handle_exception(request, exc: Exception):
             except Exception as general_error:
                 logging.error(f"Error in error handler: {general_error}", exc_info=True)
                 data['trace'] = traceback.format_exc()
-            
+
             logging.error(str(exc), exc_info=True)
             return json.dumps(data), 500
-        
+
         # Register error handler with Flask app directly for better compatibility
         @app.errorhandler(Exception)
         def flask_handle_exception(*args):
@@ -179,8 +179,8 @@ def flask_handle_exception(*args):
                 exc = args[0] if isinstance(args[0], Exception) else args[1]
             else:
                 exc = Exception("Unknown error")
-            
-            # For Flask error handlers, we don't get the request object, 
+
+            # For Flask error handlers, we don't get the request object,
             # but we can access it via flask.request if needed
             try:
                 import flask
@@ -197,7 +197,7 @@ def main():
     import inspect
     frm = inspect.stack()[1]
     mod = inspect.getmodule(frm[0])
-    
+
     # Get the connexion app variable from the calling module
     connexion_app = getattr(mod, 'app', None)
     if connexion_app and hasattr(connexion_app, 'run'):
diff --git a/libraries/models/pyproject.toml b/libraries/models/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cloudharness_model"
-version = "1.0.0"
+version = "3.0.0"
 description = "cloudharness"
 authors = ["OpenAPI Generator Community <team@openapitools.org>"]
 license = "NoLicense"
diff --git a/libraries/models/requirements.txt b/libraries/models/requirements.txt
@@ -1,3 +1,3 @@
 pydantic >= 2
-typing-extensions >= 4.7.1
+typing-extensions >= 4.7.2
 pyhumps >= 3.8.0
diff --git a/libraries/models/setup.py b/libraries/models/setup.py
diff --git a/tools/deployment-cli-tools/tests/test_codefresh.py b/tools/deployment-cli-tools/tests/test_codefresh.py
diff --git a/tools/deployment-cli-tools/tests/test_dockercompose.py b/tools/deployment-cli-tools/tests/test_dockercompose.py
diff --git a/tools/deployment-cli-tools/tests/test_helm.py b/tools/deployment-cli-tools/tests/test_helm.py
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
