Issue/django setup configuration tokens

bin/setup_configuration.sh

@@ -3,9 +3,12 @@
 # setup initial configuration using environment variables
 # Run this script from the root of the repository
 
-#set -e
-${SCRIPTPATH}/wait_for_db.sh
+set -e
 
-src/manage.py migrate
+if [[ "${RUN_SETUP_CONFIG,,}" =~ ^(true|1|yes)$ ]]; then
+    # wait for required services
+    ${SCRIPTPATH}/wait_for_db.sh
 
-src/manage.py setup_configuration --no-selftest
+    src/manage.py migrate
+    src/manage.py setup_configuration --yaml-file setup_configuration/data.yaml
+fi

docker-compose.yml

@@ -2,8 +2,8 @@ services:
   db:
     image: postgres:12-alpine
     environment:
-      - POSTGRES_USER=objecttypes
-      - POSTGRES_PASSWORD=objecttypes
+      POSTGRES_USER: objecttypes
+      POSTGRES_PASSWORD: objecttypes
     command: postgres -c max_connections=300 -c log_min_messages=LOG
 
   redis:
@@ -13,33 +13,41 @@ services:
     image: maykinmedia/objecttypes-api:latest
     build: .
     environment: &app-env
-      - DB_USER=objecttypes
-      - DB_PASSWORD=objecttypes
-      - DJANGO_SETTINGS_MODULE=objecttypes.conf.docker
-      - SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cyf15d}
-      - ALLOWED_HOSTS=*
-      - CACHE_DEFAULT=redis:6379/0
-      - CACHE_AXES=redis:6379/0
-      - DISABLE_2FA=yes
-      - SUBPATH=${SUBPATH:-/}
-      # setup_configuration env vars
-      - SITES_CONFIG_ENABLE=yes
-      - OBJECTTYPES_DOMAIN=web:8000
-      - OBJECTTYPES_ORGANIZATION=ObjectTypes
-      - OBJECTS_OBJECTTYPES_CONFIG_ENABLE=yes
-      - OBJECTS_OBJECTTYPES_TOKEN=some-random-string
-      - OBJECTS_OBJECTTYPES_PERSON=Some Person
-      - [email protected]
+      DB_USER: objecttypes
+      DB_PASSWORD: objecttypes
+      DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
+      SECRET_KEY: ${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cyf15d}
+      ALLOWED_HOSTS: '*'
+      CACHE_DEFAULT: redis:6379/0
+      CACHE_AXES: redis:6379/0
+      DISABLE_2FA: yes
+      SUBPATH: ${SUBPATH:-/}
+    volumes:
+      - media:/app/media
+      - private_media:/app/private_media
+      - log:/app/log
     ports:
       - 8000:8000
     depends_on:
       web-init:
         condition: service_completed_successfully
 
   web-init:
-    image: maykinmedia/objecttypes-api:latest
     build: .
-    environment: *app-env
+    environment:
+      <<: *app-env
+      #
+      # Django-setup-configuration
+      RUN_SETUP_CONFIG: ${RUN_SETUP_CONFIG:-true}
     command: /setup_configuration.sh
+    volumes:
+      - log:/app/log
+      - ./docker/setup_configuration:/app/setup_configuration
     depends_on:
-      - db
+      - db
+
+volumes:
+  db:
+  log:
+  media:
+  private_media:

docker/setup_configuration/data.yaml

@@ -0,0 +1,16 @@
+objecttypes_tokens_config_enable: true
+objecttypes_tokens:
+  items:
+    - identifier: token-1
+      token: 18b2b74ef994314b84021d47b9422e82b685d82f
+      contact_person: Person 1
+      email: [email protected]
+      organization: Organization 1
+      application: Application 1
+      administration: Administration 1
+
+objecttypes_sites_config_enable: true
+objecttypes_sites:
+  items:
+    - domain: example.com
+      name: example

requirements/base.in

@@ -7,7 +7,7 @@ furl
 # Framework libraries
 django-jsonsuit
 sharing-configs
-django-setup-configuration
+django-setup-configuration>=0.4.0
 
 # API libraries
 drf-nested-routers

requirements/base.txt

@@ -6,6 +6,8 @@
 #
 amqp==5.1.1
     # via kombu
+annotated-types==0.7.0
+    # via pydantic
 ape-pie==0.1.0
     # via
     #   commonground-api-common
@@ -154,7 +156,7 @@ django-sendfile2==0.7.0
     # via django-privates
 django-sessionprofile==3.0.0
     # via open-api-framework
-django-setup-configuration==0.1.0
+django-setup-configuration==0.4.0
     # via
     #   -r requirements/base.in
     #   open-api-framework
@@ -193,9 +195,7 @@ drf-nested-routers==0.94.1
     #   -r requirements/base.in
     #   commonground-api-common
 drf-spectacular[sidecar]==0.27.2
-    # via
-    #   drf-spectacular
-    #   open-api-framework
+    # via open-api-framework
 drf-spectacular-sidecar==2024.7.1
     # via drf-spectacular
 drf-yasg==1.21.7
@@ -266,6 +266,14 @@ psycopg2==2.9.9
     # via open-api-framework
 pycparser==2.21
     # via cffi
+pydantic==2.9.2
+    # via
+    #   django-setup-configuration
+    #   pydantic-settings
+pydantic-core==2.23.4
+    # via pydantic
+pydantic-settings[yaml]==2.6.1
+    # via django-setup-configuration
 pyjwt==2.7.0
     # via
     #   commonground-api-common
@@ -283,16 +291,19 @@ python-dateutil==2.8.2
 python-decouple==3.8
     # via open-api-framework
 python-dotenv==1.0.0
-    # via open-api-framework
+    # via
+    #   open-api-framework
+    #   pydantic-settings
 pytz==2023.3
     # via
     #   drf-yasg
     #   flower
-pyyaml==6.0
+pyyaml==6.0.2
     # via
     #   drf-spectacular
     #   drf-yasg
     #   oyaml
+    #   pydantic-settings
 qrcode==6.1
     # via django-two-factor-auth
 redis==4.5.5
@@ -330,6 +341,8 @@ tornado==6.4.1
 typing-extensions==4.11.0
     # via
     #   mozilla-django-oidc-db
+    #   pydantic
+    #   pydantic-core
     #   zgw-consumers
 tzdata==2024.1
     # via celery

requirements/ci.txt

@@ -8,6 +8,10 @@ amqp==5.1.1
     # via
     #   -r requirements/base.txt
     #   kombu
+annotated-types==0.7.0
+    # via
+    #   -r requirements/base.txt
+    #   pydantic
 ape-pie==0.1.0
     # via
     #   -r requirements/base.txt
@@ -238,7 +242,7 @@ django-sessionprofile==3.0.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-django-setup-configuration==0.1.0
+django-setup-configuration==0.4.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
@@ -258,7 +262,6 @@ django-solo==2.0.0
 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via
     #   -r requirements/base.txt
-    #   django-two-factor-auth
     #   maykin-2fa
 django-webtest==1.9.10
     # via -r requirements/test-tools.in
@@ -293,7 +296,6 @@ drf-nested-routers==0.94.1
 drf-spectacular[sidecar]==0.27.2
     # via
     #   -r requirements/base.txt
-    #   drf-spectacular
     #   open-api-framework
 drf-spectacular-sidecar==2024.7.1
     # via
@@ -448,6 +450,19 @@ pycparser==2.21
     # via
     #   -r requirements/base.txt
     #   cffi
+pydantic==2.9.2
+    # via
+    #   -r requirements/base.txt
+    #   django-setup-configuration
+    #   pydantic-settings
+pydantic-core==2.23.4
+    # via
+    #   -r requirements/base.txt
+    #   pydantic
+pydantic-settings[yaml]==2.6.1
+    # via
+    #   -r requirements/base.txt
+    #   django-setup-configuration
 pyflakes==3.2.0
     # via flake8
 pyjwt==2.7.0
@@ -481,17 +496,19 @@ python-dotenv==1.0.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
+    #   pydantic-settings
 pytz==2023.3
     # via
     #   -r requirements/base.txt
     #   drf-yasg
     #   flower
-pyyaml==6.0
+pyyaml==6.0.2
     # via
     #   -r requirements/base.txt
     #   drf-spectacular
     #   drf-yasg
     #   oyaml
+    #   pydantic-settings
     #   vcrpy
 qrcode==6.1
     # via
@@ -551,6 +568,8 @@ typing-extensions==4.11.0
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
+    #   pydantic
+    #   pydantic-core
     #   zgw-consumers
 tzdata==2024.1
     # via

requirements/dev.txt

@@ -10,6 +10,10 @@ amqp==5.1.1
     # via
     #   -r requirements/base.txt
     #   kombu
+annotated-types==0.7.0
+    # via
+    #   -r requirements/base.txt
+    #   pydantic
 ape-pie==0.1.0
     # via
     #   -r requirements/base.txt
@@ -249,7 +253,7 @@ django-sessionprofile==3.0.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-django-setup-configuration==0.1.0
+django-setup-configuration==0.4.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
@@ -269,7 +273,6 @@ django-solo==2.0.0
 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via
     #   -r requirements/base.txt
-    #   django-two-factor-auth
     #   maykin-2fa
 django-webtest==1.9.10
     # via -r requirements/test-tools.in
@@ -308,7 +311,6 @@ drf-nested-routers==0.94.1
 drf-spectacular[sidecar]==0.27.2
     # via
     #   -r requirements/base.txt
-    #   drf-spectacular
     #   open-api-framework
 drf-spectacular-sidecar==2024.7.1
     # via
@@ -470,6 +472,19 @@ pycparser==2.21
     # via
     #   -r requirements/base.txt
     #   cffi
+pydantic==2.9.2
+    # via
+    #   -r requirements/base.txt
+    #   django-setup-configuration
+    #   pydantic-settings
+pydantic-core==2.23.4
+    # via
+    #   -r requirements/base.txt
+    #   pydantic
+pydantic-settings[yaml]==2.6.1
+    # via
+    #   -r requirements/base.txt
+    #   django-setup-configuration
 pyflakes==3.0.1
     # via flake8
 pygments==2.15.1
@@ -507,17 +522,19 @@ python-dotenv==1.0.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
+    #   pydantic-settings
 pytz==2023.3
     # via
     #   -r requirements/base.txt
     #   drf-yasg
     #   flower
-pyyaml==6.0
+pyyaml==6.0.2
     # via
     #   -r requirements/base.txt
     #   drf-spectacular
     #   drf-yasg
     #   oyaml
+    #   pydantic-settings
     #   vcrpy
 qrcode==6.1
     # via
@@ -601,6 +618,8 @@ typing-extensions==4.11.0
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
+    #   pydantic
+    #   pydantic-core
     #   zgw-consumers
 tzdata==2024.1
     # via