Merge branch 'release/2.7.0-alpha.3'

project-docs/release-notes/version-2.7.0.md

@@ -205,3 +205,11 @@ Bugs Fixed
   opaque data secret. This issue was inadvertantly introduced when support was
   added for providing the CA secret as an actual secret rather than being
   enmbedded in the data values file when deploying Educates.
+
+* Addressed possible issue with training portal whereby if a transient error
+  occurred when looking up workshop environment using Kubernetes REST API
+  immediately after creation, that database update would be rolled back but
+  the workshop environment in the cluster would still exist, meaning that an
+  attempt would me made to use the same workshop environment name the next
+  time one is created, resulting in a conflict and inability to create any
+  new workshop environments against that training portal.

session-manager/handlers/analytics.py

@@ -23,6 +23,8 @@ def send_event_to_webhook(url, message):
 def report_analytics_event(event, data={}):
     message = None
 
+    logging.info("Reporting analytics event %s with data %s.", event, data)
+
     if not ANALYTICS_WEBHOOK_URL:
         return
 

session-manager/requirements.txt

@@ -4,4 +4,4 @@ aiohttp==3.9.2
 PyYAML==6.0.1
 pykube-ng==23.6.0
 wrapt==1.15.0
-cryptography==42.0.2
+cryptography==42.0.4

training-portal/src/project/apps/workshops/manager/analytics.py

@@ -19,6 +19,8 @@ def send_event_to_webhook(url, message):
 def report_analytics_event(entity, event, data={}):
     message = None
 
+    logging.info("Reporting analytics event %s with data %s.", event, data)
+
     if not settings.ANALYTICS_WEBHOOK_URL:
         return
 

training-portal/src/project/apps/workshops/manager/environments.py

@@ -521,9 +521,14 @@ def process_workshop_environment(portal, workshop, position):
     resource = K8SWorkshopEnvironment(api, environment_body)
     resource.create()
 
-    instance = K8SWorkshopEnvironment.objects(api).get(name=environment.name)
+    environment.uid = resource.metadata["uid"]
 
-    environment.uid = instance.metadata["uid"]
+    logging.info(
+        "Successfully created workshop environment %s for workshop %s with uid %s.",
+        environment.name,
+        workshop["name"],
+        resource.metadata["uid"]
+    )
 
     # Finally save the record again. The workshop environment is left in
     # starting state. It will only be progressed to running state when we