Merge branch 'develop' of github.com:MetaCell/cloud-harness into develop

Author: filippomc

applications/events/deploy/templates/deployments.yml

@@ -62,11 +62,15 @@ spec:
           periodSeconds: 15
           timeoutSeconds: 5
         livenessProbe:
-          tcpSocket:
-            port: client
-          initialDelaySeconds: 30
+          exec:
+            command:
+            - /bin/sh
+            - -c
+            - timeout 10 /opt/kafka/bin/kafka-broker-api-versions.sh --bootstrap-server localhost:9092
+          initialDelaySeconds: 60
           periodSeconds: 30
-          timeoutSeconds: 5
+          timeoutSeconds: 15
+          failureThreshold: 3
         lifecycle:
           preStop:
             exec:

libraries/cloudharness-common/cloudharness/auth/keycloak.py

@@ -493,7 +493,10 @@ def get_user(self, user_id, with_details=False) -> User:
     def _add_related_to_user(self, user: User, with_details: bool, admin_client):
         user.user_groups = [UserGroup.from_dict(group) for group in admin_client.get_user_groups(user_id=user['id'], brief_representation=not with_details)]
         user.realm_roles = admin_client.get_realm_roles_of_user(user['id'])
-        user.organizations = [Organization.from_dict(org) for org in admin_client.get_user_organizations(user['id'])]
+        if hasattr(admin_client, 'get_user_organizations'):
+            user.organizations = [Organization.from_dict(org) for org in admin_client.get_user_organizations(user['id'])]
+        else:
+            user.organizations = []
         return user
 
     def get_current_user(self) -> User:

libraries/models/cloudharness_model/encoder.py

@@ -1,3 +1,4 @@
+from datetime import date, datetime
 from json import JSONEncoder
 
 
@@ -9,7 +10,8 @@ def encode(self, o):
         return super().encode(o)
 
     def default(self, o):
-        
+        if isinstance(o, (datetime, date)):
+            return o.isoformat()
         if hasattr(o, "to_dict"):
             return o.to_dict()
         return JSONEncoder.default(self, o)