Merge branch 'main' into frontend

Author: bevalentin

.github/workflows/backend-development.yml

@@ -0,0 +1,35 @@
+name: Backend Development
+
+on:
+  push:
+    branches: [ "backend" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Django tests
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.12, 3.13]
+    defaults:
+      run:
+        working-directory: ./backend
+    steps:
+    - uses: actions/checkout@v4
+    - run: cat .env.github >> $GITHUB_ENV
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Run Tests
+      run: |
+        python manage.py collectstatic
+        python manage.py test

.github/workflows/frontend-development.yml

@@ -84,4 +84,4 @@ jobs:
         npm config list
         npm install --omit=dev
         # npx webpack
-        npm run build
+        npm run build

.gitignore

@@ -6,8 +6,7 @@ __pycache__
 # Backend files and folders
 
 # Old fixtures
-**/fixtures/2024-11-0*.json
-**/fixtures/2024-11-1*.json
+**/fixtures/2024*.json
 
 # Frontend files and folders
 build

application-quality-reference-deployment/values.yaml

@@ -18,18 +18,21 @@ global:
 application-quality:
   # Values for deploying the Application Quality Building Block in the EOEPCA Develop cluster.
 
+  publicUrl: "https://application-quality.develop.eoepca.org"
+
   namespace:
     application-quality
 
   # Application Quality backend
   api:
     image:
-      tag: 2025-01-10.1
+      tag: 2025-04-07.1
 
   # Application Quality frontend
   web:
     image:
-      tag: 2025-01-15.1
+      tag: 2025-04-07.2
+    publicUrl: "https://application-quality.develop.eoepca.org"
 
   persistence:
     enabled: true
@@ -46,7 +49,8 @@ application-quality:
     maxCores: "2"
     maxRam: "2Gi"
 
-  #db:
+  vclusters:
+    enabled: false
 
   opensearch:
     enabled: false
@@ -454,24 +458,20 @@ opensearch-dashboards:
 
       opensearch_security:
         # https://opensearch.org/docs/latest/security/authentication-backends/openid-connect/#configuration-settings
-        #auth.multiple_auth_enabled: true
-        #auth.type: ["basicauth", "openid"]
-        auth.type: basicauth
-        #auth.type: openid
-
-        # openid:
-        #   connect_url: https://auth.eoepca-testing.spaceapplications.com/realms/eoepca/.well-known/openid-configuration
-        #   base_redirect_url: https://application-quality.develop.eoepca.org/dashboards/
-        #   client_id: application-quality-develop-dashboards
-        #   client_secret: 2Oz8olwAgHD5oRuEmtFsYsnrdkeWEAln
-        #   # scope: openid profile email
-        #   scope: openid roles profile user_name email
-        #   header: Authorization
-        #   verify_hostnames: false
-        #   #root_ca: /usr/share/dashboards/root-ca/root.ca.crt
-        #   #root_ca: /etc/ssl/certs/ca-certificates.crt
-        #   #root_ca: /usr/share/opensearch-dashboards/certs/ca.crt
-        #   trust_dynamic_headers: "true"
+        auth.multiple_auth_enabled: true
+        auth.type: ["basicauth", "openid"]
+
+        openid:
+          # OIDC parameters provided using environment variables
+          connect_url: ${OPENSEARCH_SECURITY_OPENID_CONNECT_URL}
+          client_id: ${OPENSEARCH_SECURITY_OPENID_CLIENT_ID}
+          client_secret: ${OPENSEARCH_SECURITY_OPENID_CLIENT_SECRET}
+          base_redirect_url: ${OPENSEARCH_SECURITY_OPENID_BASE_REDIRECT_URL}
+          # scope: openid profile email
+          scope: openid roles profile user_name email
+          header: Authorization
+          verify_hostnames: false
+          trust_dynamic_headers: "true"
 
       opensearchDashboards:
         # The default application to load.
@@ -511,6 +511,13 @@ opensearch-dashboards:
         disableWelcomeScreen: false
         disableNewThemeModal: false
 
+  # Load environment variables from kubernetes secret or config map
+  envFrom:
+  - secretRef:
+      name: application-quality-opensearch-dashboards-openid-config
+  # - configMapRef:
+  #     name: application-quality-opensearch-dashboards-openid-config
+
   secretMounts:
     - name: certs
       secretName: opensearch-dashboards-tls-certificate

backend/.dockerignore

@@ -2,5 +2,4 @@
 **/__pycache__
 
 # old fixtures
-**/fixtures/2024-11-0*.json
-**/fixtures/2024-11-1*.json
+**/fixtures/2024*.json

backend/.env.github

@@ -0,0 +1,2 @@
+OIDC_ENABLED=false
+PUBLIC_URL=http://host

backend/Dockerfile

@@ -1,11 +1,15 @@
-FROM python:slim
+FROM python:3.13.3-slim
 
 WORKDIR /app
 
 COPY requirements.txt .
 
 RUN apt-get update \
-	&& apt-get install -y gcc libpq-dev postgresql-client redis-server supervisor \
+	&& apt-get install -y gcc libpq-dev postgresql-client redis-server supervisor curl \
+	&& curl -fSLo /usr/local/bin/kubectl https://dl.k8s.io/release/$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl \
+	&& chmod +x /usr/local/bin/kubectl \
+	&& curl -fSLo /usr/local/bin/vcluster https://github.com/loft-sh/vcluster/releases/download/v0.24.1/vcluster-linux-amd64 \
+	&& chmod +x /usr/local/bin/vcluster \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& pip install --no-cache-dir -r requirements.txt
 

backend/application_quality/settings.py

@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/5.1/ref/settings/
 """
 import os
+import sys
 
 from pathlib import Path
 
@@ -127,6 +128,9 @@
     }
 }
 
+if 'test' in sys.argv:
+    DATABASES['default'] = {'ENGINE': 'django.db.backends.sqlite3'}
+
 
 # Password validation
 # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
@@ -177,6 +181,7 @@
     "DEFAULT_AUTHENTICATION_CLASSES": [
         "rest_framework.authentication.SessionAuthentication",
         "rest_framework.authentication.TokenAuthentication",
+        'rest_framework_simplejwt.authentication.JWTAuthentication',
     ],
     #'DEFAULT_PERMISSION_CLASSES': [
     #    'rest_framework.permissions.AllowAny',
@@ -190,7 +195,7 @@
 CELERY_WORKER_REDIRECT_STDOUTS = False
 
 # OpenID Connect configuration
-OIDC_ENABLED = os.getenv("OIDC_ENABLED")
+OIDC_ENABLED = os.getenv("OIDC_ENABLED", 'false')
 if OIDC_ENABLED.lower() == "true":
     OIDC_CONNECT_CONFIG_URL = os.getenv("OIDC_CONNECT_CONFIG_URL")
     OIDC_RP_CLIENT_ID = os.getenv("OIDC_RP_CLIENT_ID")
@@ -221,12 +226,10 @@
 
 
 CORS_ORIGIN_ALLOW_ALL = True
-CORS_ALLOWED_ORIGINS = [
-    os.getenv("LOGIN_REDIRECT_URL").strip("/"), # Frontend URL
-]
+CORS_ALLOWED_ORIGINS = [os.getenv("PUBLIC_URL")] # Frontend URL
 
 CORS_ALLOW_HEADERS = "*"
 
 #CSRF_COOKIE_SECURE = False
 #CSRF_USE_SESSIONS = True
-CSRF_TRUSTED_ORIGINS = [os.getenv("LOGIN_REDIRECT_URL").strip("/")]  # (Api Base Url)
+CSRF_TRUSTED_ORIGINS = [os.getenv("PUBLIC_URL")]  # (Api Base Url)

backend/application_quality/urls.py

@@ -14,12 +14,16 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 import os
 
 from django.contrib import admin
 from django.contrib.auth.views import LoginView, LogoutView
 from django.urls import path, include
-from rest_framework.authtoken.views import ObtainAuthToken
+from rest_framework_simplejwt.views import (
+    TokenObtainPairView,
+    TokenRefreshView,
+)
 
 from application_quality.views import user_details
 
@@ -28,9 +32,10 @@
     path("api/", include("backend.urls")),
     path("login/", LoginView.as_view(), name="login"),
     path("logout/", LogoutView.as_view(), name="logout"),
-    path("api/token-auth/", ObtainAuthToken.as_view(), name="token-auth"),
+    path("api/token/", TokenObtainPairView.as_view(), name="token_obtain_pair"),
+    path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
 ]
 
-if os.getenv("OIDC_ENABLED").lower() == "true":
+if os.getenv("OIDC_ENABLED", "false").lower() == "true":
     urlpatterns.append(path("oidc/", include("mozilla_django_oidc.urls")))
     urlpatterns.append(path("oidc/user-details/", user_details, name="user_details"))

backend/backend/admin.py

@@ -4,7 +4,6 @@
 admin.site.register(models.Pipeline)
 admin.site.register(models.PipelineRun)
 admin.site.register(models.JobReport)
-# admin.site.register(models.Tool)
 admin.site.register(models.Tag)
 admin.site.register(models.Subworkflow)
 admin.site.register(models.CommandLineTool)