From 5e57647b34ff9ce49ffeecd152a811a513267742 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Wed, 16 Oct 2024 10:22:41 +0200 Subject: [PATCH] wip connect minio --- src/backend/core/api/demo.py | 13 +++++++++++++ src/backend/meet/settings.py | 10 ++++++++++ src/backend/pyproject.toml | 1 + src/helm/env.d/staging/values.meet.yaml.gotmpl | 12 ++++++++++++ src/helm/meet/templates/secrets.yaml | 9 +++++++++ 5 files changed, 45 insertions(+) diff --git a/src/backend/core/api/demo.py b/src/backend/core/api/demo.py index d33f7728..fbd31126 100644 --- a/src/backend/core/api/demo.py +++ b/src/backend/core/api/demo.py @@ -1,6 +1,8 @@ from rest_framework.decorators import api_view from rest_framework.response import Response +from minio import Minio +from django.conf import settings MINIO_BUCKET = "livekit-staging-livekit-egress" @@ -25,4 +27,15 @@ def minio_webhook(request): print('file received', filename) + client = Minio( + settings.MINIO_URL, + access_key=settings.MINIO_ACCESS_KEY, + secret_key=settings.MINIO_SECRET_KEY, + ) + + room_id = filename.split("_")[2].split(".")[0] + + print('room_id', room_id, filename) + + return Response("") diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py index bf2deaa5..ba7d5fa1 100755 --- a/src/backend/meet/settings.py +++ b/src/backend/meet/settings.py @@ -386,6 +386,16 @@ class Base(Configuration): None, environ_name="ANALYTICS_KEY", environ_prefix=None ) + # todo - totally wip + MINIO_ACCESS_KEY = values.Value( + None, environ_name="MINIO_ACCESS_KEY", environ_prefix=None + ) + MINIO_SECRET_KEY = values.Value( + None, environ_name="MINIO_SECRET_KEY", environ_prefix=None + ) + MINIO_URL = values.Value( + None, environ_name="MINIO_URL", environ_prefix=None + ) # pylint: disable=invalid-name @property def ENVIRONMENT(self): diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index c71c5e78..6af2344b 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -58,6 +58,7 @@ dependencies = [ "whitenoise==6.7.0", "mozilla-django-oidc==4.0.1", "livekit-api==0.7.0", + "minio==7.2.9", ] [project.urls] diff --git a/src/helm/env.d/staging/values.meet.yaml.gotmpl b/src/helm/env.d/staging/values.meet.yaml.gotmpl index 58b43590..6eedb61e 100644 --- a/src/helm/env.d/staging/values.meet.yaml.gotmpl +++ b/src/helm/env.d/staging/values.meet.yaml.gotmpl @@ -97,6 +97,18 @@ backend: ALLOW_UNREGISTERED_ROOMS: False FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio-staging.beta.numerique.gouv.fr'}" FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}" + MINIO_ACCESS_KEY: + secretKeyRef: + name: backend + key: MINIO_ACCESS_KEY + MINIO_SECRET_KEY: + secretKeyRef: + name: backend + key: MINIO_SECRET_KEY + MINIO_URL: + secretKeyRef: + name: backend + key: MINIO_URL createsuperuser: command: diff --git a/src/helm/meet/templates/secrets.yaml b/src/helm/meet/templates/secrets.yaml index 14cf213d..44b2c5e4 100644 --- a/src/helm/meet/templates/secrets.yaml +++ b/src/helm/meet/templates/secrets.yaml @@ -15,3 +15,12 @@ stringData: OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }} LIVEKIT_API_SECRET: {{ .Values.livekitApi.secret }} LIVEKIT_API_KEY: {{ .Values.livekitApi.key }} +{{- if .Values.minioAccessKey }} + MINIO_ACCESS_KEY: {{ .Values.minioAccessKey }} +{{- end }} +{{- if .Values.minioSecretKey }} + MINIO_SECRET_KEY: {{ .Values.minioSecretKey }} +{{- end }} +{{- if .Values.minioUrl }} + MINIO_URL: {{ .Values.minioUrl }} +{{- end }}