Merge branch 'develop' into staging

Author: sandstromviktor

api/views.py

@@ -854,8 +854,13 @@ def update_app_status(request):
 
             # Required input
             release = request.data["release"]
+
             new_status = request.data["new-status"]
 
+            if len(new_status) > 15:
+                print(f"DEBUG: Status code is longer than 15 chars so shortening: {new_status}")
+                new_status = new_status[:15]
+
             event_ts = datetime.strptime(request.data["event-ts"], "%Y-%m-%dT%H:%M:%S.%fZ")
             event_ts = utc.localize(event_ts)
 

apps/helpers.py

@@ -192,6 +192,9 @@ def create_app_instance(user, project, app, app_settings, data=[], wait=False):
     status.info = app_instance.parameters["release"]
     if "appconfig" in app_instance.parameters:
         if "path" in app_instance.parameters["appconfig"]:
+            # remove trailing / in all cases
+            if app_instance.parameters["appconfig"]["path"] != "/":
+                app_instance.parameters["appconfig"]["path"] = app_instance.parameters["appconfig"]["path"].rstrip("/")
             if app_deps:
                 if not created_by_admin:
                     app_instance.parameters["appconfig"]["path"] = (
@@ -235,17 +238,21 @@ def handle_update_status_request(
     request should be performed or ignored.
 
     :param release str: The release id of the app instance, stored in the AppInstance.parameters dict.
-    :param new_status str: The new status code.
+    :param new_status str: The new status code. Trimmed to max 15 chars if needed.
     :param event_ts timestamp: A JSON-formatted timestamp in UTC, e.g. 2024-01-25T16:02:50.00Z.
     :param event_msg json dict: An optional json dict containing pod-msg and/or container-msg.
     :returns: A value from the HandleUpdateStatusResponseCode enum.
               Raises an ObjectDoesNotExist exception if the app instance does not exist.
     """
 
+    if len(new_status) > 15:
+        new_status = new_status[:15]
+
     try:
         # Begin by verifying that the requested app instance exists
         # We wrap the select and update tasks in a select_for_update lock
         # to avoid race conditions.
+
         with transaction.atomic():
             app_instance = (
                 AppInstance.objects.select_for_update().filter(parameters__contains={"release": release}).last()

apps/tests/test_update_status_handler.py

@@ -139,6 +139,25 @@ def test_handle_missing_app_status_should_create_and_update_status(self):
         assert actual_appstatus.status_type == new_status
         assert actual_appstatus.time == newer_ts
 
+    def test_handle_long_status_text_should_trim_status(self):
+        newer_ts = self.INITIAL_EVENT_TS + timedelta(seconds=1)
+        new_status = "LongStatusText-ThisPartLongerThan15Chars"
+        expected_status_text = new_status[:15]
+        assert len(expected_status_text) == 15
+        actual = handle_update_status_request(self.ACTUAL_RELEASE_NAME, new_status, newer_ts)
+
+        assert actual == HandleUpdateStatusResponseCode.CREATED_FIRST_STATUS
+
+        # Fetch the app instance and status objects and verify values
+        actual_app_instance = AppInstance.objects.filter(
+            parameters__contains={"release": self.ACTUAL_RELEASE_NAME}
+        ).last()
+
+        assert actual_app_instance.state == expected_status_text
+        actual_appstatus = actual_app_instance.status.latest()
+        assert actual_appstatus.status_type == expected_status_text
+        assert actual_appstatus.time == newer_ts
+
 
 @pytest.mark.skip(
     reason="This test requires a modification to the handle_update_status_request function to add a delay parameter."

apps/views.py

@@ -77,10 +77,10 @@ def post(self, request, user, project):
             try:
                 url = settings.LOKI_SVC + "/loki/api/v1/query_range"
                 app_params = app.parameters
-                if app.app.slug == "customapp":
-                    log_query = '{release="' + app_params["release"] + '",container="' + container + '"}'
+                if app.app.slug == "shinyproxyapp":
+                    log_query = '{release="' + app_params["release"] + '",container="' + "serve" + '"}'
                 else:
-                    log_query = '{release="' + app_params["release"] + '"}'
+                    log_query = '{release="' + app_params["release"] + '",container="' + container + '"}'
                 print(log_query)
                 query = {
                     "query": log_query,
@@ -255,7 +255,6 @@ def post(self, request, user, project, ai_id):
 
         app = appinstance.app
         app_settings = app.settings
-        print("SETTINGSSS: ", appinstance.parameters["appconfig"])
         body = request.POST.copy()
 
         if not app.user_can_edit:
@@ -307,6 +306,9 @@ def update_app_instance(self, request, project, appinstance, app_settings, body)
         appinstance.app_dependencies.set(app_deps)
         appinstance.model_dependencies.set(model_deps)
         if "appconfig" in appinstance.parameters and appinstance.app.slug == "customapp":
+            # remove trailing / in all cases
+            if appinstance.parameters["appconfig"]["path"] != "/":
+                appinstance.parameters["appconfig"]["path"] = appinstance.parameters["appconfig"]["path"].rstrip("/")
             appinstance.parameters["created_by_admin"] = created_by_admin
             # if app is created by admin but admin user is not updating it dont change path.
             if created_by_admin:

charts/apps/custom-app/chart/templates/deployment.yaml

@@ -48,7 +48,14 @@ spec:
         command:
           - /bin/sh
           - -c
-          - cp -r -n {{ $.Values.appconfig.path }}/* /tmp
+          - |
+            if [ -n "$(ls -A {{ $.Values.appconfig.path }})" ]; then
+              echo "Copying data..." && cp -r -n {{ $.Values.appconfig.path }}/* /tmp && echo "Done Copying";
+            elif [ -d "{{ $.Values.appconfig.path }}" ]; then
+              echo "Empty directory. Nothing to copy.";
+            else
+              echo "Directory does not exist" && cp -r -n {{ $.Values.appconfig.path }}/* /tmp;
+            fi
         volumeMounts:
         {{- range $key, $value := .Values.apps.volumeK8s }}
         - name: {{ $key }}

charts/apps/minio/chart/templates/deployment.yaml

@@ -82,7 +82,7 @@ spec:
                 sleep 5
                 mc alias set local http://127.0.0.1:9000 ${MINIO_ROOT_USER} ${MINIO_ROOT_PASSWORD}
                 mc admin user add local {{ .Values.credentials.access_key }} {{ .Values.credentials.secret_key }}
-                mc mb local/data-bucket
+                mc mb local/data-bucket || true
                 mc admin policy attach local readwrite --user {{ .Values.credentials.access_key }} || true
       hostname: {{ .Release.Name }}-minio
       restartPolicy: Always

projects/admin.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib import admin
 
 from .models import (
@@ -27,6 +28,11 @@
 class ProjectAdmin(admin.ModelAdmin):
     list_display = ("name", "owner", "status", "updated_at")
     list_filter = ["owner", "status"]
+    actions = ["update_app_limits"]
+
+    @admin.action(description="Reset app limits")
+    def update_app_limits(self, request, queryset):
+        queryset.update(apps_per_project=settings.APPS_PER_PROJECT_LIMIT)
 
 
 @admin.register(Flavor)