Refactor database naming

OpenSourcePolitics · Aug 21, 2024 · 1a05517 · 1a05517
1 parent bcd4ac6
commit 1a05517
Show file tree

Hide file tree

Showing 38 changed files with 61 additions and 50 deletions.
diff --git a/.github/workflows/angers_models_run.yml b/.github/workflows/angers_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 5 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.ANGERS_DBNAME_PROD }}
+  DBNAME: ${{ secrets.ANGERS_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/cese_models_run.yml b/.github/workflows/cese_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 8 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.CESE_DBNAME_PROD }}
+  DBNAME: ${{ secrets.CESE_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/cour_des_comptes_models_run.yml b/.github/workflows/cour_des_comptes_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 8 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.COUR_DES_COMPTES_DBNAME_PROD }}
+  DBNAME: ${{ secrets.COUR_DES_COMPTES_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/demo_models_run.yml b/.github/workflows/demo_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '30 9 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.DEMO_DBNAME_PROD }}
+  DBNAME: ${{ secrets.DEMO_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Configure db name and participation host name
       run: |
-        echo "DBNAME_DEV=${{ secrets[env.DB_SECRET_NAME] }}" >> $GITHUB_ENV
+        echo "DBNAME=${{ secrets[env.DB_SECRET_NAME] }}" >> $GITHUB_ENV
         echo "PARTICIPATION_HOST_NAME=${{ secrets[env.PARTICIPATION_HOST_NAME] }}" >> $GITHUB_ENV
 
     - name: Run dbt test

diff --git a/.github/workflows/grand_nancy_models_run.yml b/.github/workflows/grand_nancy_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '30 6 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.GRAND_NANCY_DBNAME_PROD }}
+  DBNAME: ${{ secrets.GRAND_NANCY_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/lyon_models_run.yml b/.github/workflows/lyon_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 5 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.LYON_DBNAME_PROD }}
+  DBNAME: ${{ secrets.LYON_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/marseille_models_run.yml b/.github/workflows/marseille_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '30 7 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.MARSEILLE_DBNAME_PROD }}
+  DBNAME: ${{ secrets.MARSEILLE_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/sytral_models_run.yml b/.github/workflows/sytral_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '30 7 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.SYTRAL_DBNAME_PROD }}
+  DBNAME: ${{ secrets.SYTRAL_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/thionville_models_run.yml b/.github/workflows/thionville_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '30 7 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.THIONVILLE_DBNAME_PROD }}
+  DBNAME: ${{ secrets.THIONVILLE_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/toulouse_models_run.yml b/.github/workflows/toulouse_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 5 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.TOULOUSE_DBNAME_PROD }}
+  DBNAME: ${{ secrets.TOULOUSE_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/tours_models_run.yml b/.github/workflows/tours_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 8 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.TOURS_DBNAME_PROD }}
+  DBNAME: ${{ secrets.TOURS_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/.github/workflows/valbonne_models_run.yml b/.github/workflows/valbonne_models_run.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '0 5 * * *'
 
 env:
-  DBNAME_PROD: ${{ secrets.valbonne_DBNAME_PROD }}
+  DBNAME: ${{ secrets.valbonne_DBNAME_PROD }}
   HOST: ${{ secrets.HOST }}
   PASSWORD: ${{ secrets.PASSWORD }}
   PORT: ${{ secrets.PORT }}

diff --git a/projects/angers/dbt_project.yml b/projects/angers/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/angers/profiles.yml b/projects/angers/profiles.yml
@@ -2,7 +2,7 @@ angers:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ angers:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/cese/dbt_project.yml b/projects/cese/dbt_project.yml
@@ -24,6 +24,7 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "dbt_packages"
 
 vars:
+  dbname: "{{ env_var('DBNAME') }}"
   target_schema: "{{ env_var('TARGET_SCHEMA') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 

diff --git a/projects/cese/profiles.yml b/projects/cese/profiles.yml
@@ -2,7 +2,7 @@ cese:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ cese:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/cour_des_comptes/dbt_project.yml b/projects/cour_des_comptes/dbt_project.yml
@@ -22,7 +22,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/cour_des_comptes/profiles.yml b/projects/cour_des_comptes/profiles.yml
@@ -2,7 +2,7 @@ cour_des_comptes:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ cour_des_comptes:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/demo/.env.example b/projects/demo/.env.example
@@ -1,4 +1,4 @@
-DBNAME_DEV=
+DBNAME=
 HOST=
 PASSWORD=
 PORT=

diff --git a/projects/demo/dbt_project.yml b/projects/demo/dbt_project.yml
@@ -24,6 +24,7 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "dbt_packages"
 
 vars:
+  dbname: "{{ env_var('DBNAME') }}"
   target_schema: "{{ env_var('TARGET_SCHEMA') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 

diff --git a/projects/demo/profiles.yml b/projects/demo/profiles.yml
@@ -2,7 +2,7 @@ demo:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,12 +11,11 @@ demo:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
       schema: "{{ env_var('TARGET_SCHEMA') }}"
       threads: 1
       type: postgres
-      user: "{{ env_var('USER') }}"
-
+      user: "{{ env_var('USER') }}"
diff --git a/projects/grand_nancy/dbt_project.yml b/projects/grand_nancy/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/grand_nancy/profiles.yml b/projects/grand_nancy/profiles.yml
@@ -2,7 +2,7 @@ grand_nancy:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ grand_nancy:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/lyon/dbt_project.yml b/projects/lyon/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/lyon/profiles.yml b/projects/lyon/profiles.yml
@@ -2,7 +2,7 @@ lyon:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ lyon:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/marseille/dbt_project.yml b/projects/marseille/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/marseille/profiles.yml b/projects/marseille/profiles.yml
@@ -2,7 +2,7 @@ marseille:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ marseille:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/sytral/dbt_project.yml b/projects/sytral/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/sytral/profiles.yml b/projects/sytral/profiles.yml
@@ -2,7 +2,7 @@ sytral:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ sytral:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/thionville/dbt_project.yml b/projects/thionville/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models

diff --git a/projects/thionville/profiles.yml b/projects/thionville/profiles.yml
@@ -2,7 +2,7 @@ thionville:
   target: dev
   outputs:
     dev:
-      dbname: "{{ env_var('DBNAME_DEV') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"
@@ -11,7 +11,7 @@ thionville:
       type: postgres
       user: "{{ env_var('USER') }}"
     prod:
-      dbname: "{{ env_var('DBNAME_PROD') }}"
+      dbname: "{{ env_var('DBNAME') }}"
       host: "{{ env_var('HOST') }}"
       pass: "{{ env_var('PASSWORD') }}"
       port: "{{ env_var('PORT') | as_number }}"

diff --git a/projects/toulouse/dbt_project.yml b/projects/toulouse/dbt_project.yml
@@ -23,7 +23,8 @@ clean-targets:         # directories to be removed by `dbt clean`
   - "target"
   - "dbt_packages"
 
-vars: 
+vars:
+  dbname: "{{ env_var('DBNAME') }}"
   host: "{{ env_var('PARTICIPATION_HOST_NAME') }}"
 
 # Configuring models