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

Author: filippomc

applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py

@@ -40,7 +40,7 @@ def harness_hub():
     KubeSpawner.get_pod_manifest_base = KubeSpawner.get_pod_manifest
     KubeSpawner.get_pod_manifest = spawner_pod_manifest
     # to skip the profile selection form enable the line below
-    KubeSpawner.options_form = custom_options_form
+    # KubeSpawner.options_form = custom_options_form
     KubeSpawner.get_pvc_manifest_base = KubeSpawner.get_pvc_manifest
     KubeSpawner.get_pvc_manifest = spawner_pvc_manifest
 

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

@@ -87,6 +87,10 @@ def get_token(username, password):
 
 def is_uuid(s):
     import uuid
+    if not s:
+        return False
+    if type(s) == uuid.UUID:
+        return True
     try:
         uuid.UUID(s)
         return True