Merge branch 'main' into dependabot/pip/analytics-api/werkzeug-3.0.1

bcgov · Apr 4, 2024 · cf6598b · cf6598b
2 parents 8a0caa3 + 95f8231
commit cf6598b
Show file tree

Hide file tree

Showing 586 changed files with 30,911 additions and 12,157 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 # they will be requested for review when someone opens a pull request.
-*       @tiagograf-aot @jadmsaadaot @djnunez-aot @saravanpa-aot @VineetBala-AOT
+*       @bcgov/gdx-engagement-admin, @kshapka-bcgov
diff --git a/.github/workflows/analytics-api-cd.yml b/.github/workflows/analytics-api-cd.yml
@@ -13,10 +13,6 @@ on:
         description: "Environment (dev/test/prod)"
         required: true
         default: "dev"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "EAO" # Default value is EAO   
 
 defaults:
   run:
@@ -26,13 +22,12 @@ defaults:
 env:
   APP_NAME: "analytics-api"
   TAG_NAME: "${{github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default
 
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 jobs:
   analytics-api-cd:

diff --git a/.github/workflows/analytics-api-ci.yml b/.github/workflows/analytics-api-ci.yml
@@ -67,6 +67,8 @@ jobs:
       KEYCLOAK_TEST_BASE_URL: "http://localhost:8081"
       KEYCLOAK_TEST_REALMNAME: "demo"
       USE_TEST_KEYCLOAK_DOCKER: "YES"
+
+      SQLALCHEMY_DATABASE_URI: "postgresql://postgres:postgres@localhost:5432/postgres"
 
     runs-on: ubuntu-20.04
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,10 +7,6 @@ on:
         description: "Environment (test/prod)"
         required: true
         default: "test"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "GDX" # Default value is GDX 
 
 defaults:
   run:
@@ -19,12 +15,10 @@ defaults:
 
 env:
   TAG_NAME: "${{ github.event.inputs.environment || 'test' }}" # If the environment type is manually selected, use the input value; otherwise, use 'test' as default
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'GDX' }}" # If the project type is manually selected, use the input value; otherwise, use 'GDX' as default
 
- # Set OpenShift related variables based on PROJECT_TYPE
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ (github.event.inputs.project_type == 'EAO') && secrets.OPENSHIFT_SA_TOKEN_EAO || secrets.OPENSHIFT_SA_TOKEN }}
-  OPENSHIFT_REPOSITORY: ${{ (github.event.inputs.project_type == 'EAO') && secrets.OPENSHIFT_REPOSITORY_EAO || secrets.OPENSHIFT_REPOSITORY }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 jobs:
   met-deployment:

diff --git a/.github/workflows/met-api-cd.yml b/.github/workflows/met-api-cd.yml
@@ -12,11 +12,7 @@ on:
       environment:
         description: "Environment (dev/test/prod)"
         required: true
-        default: "dev"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "EAO" # Default value is EAO     
+        default: "dev"   
 
 defaults:
   run:
@@ -26,14 +22,12 @@ defaults:
 env:
   APP_NAME: "met-api"
   TAG_NAME: "${{ github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default
 
-  # Set OpenShift related variables based on PROJECT_TYPE
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 
 jobs:

diff --git a/.github/workflows/met-api-ci.yml b/.github/workflows/met-api-ci.yml
@@ -65,13 +65,23 @@ jobs:
       JWT_OIDC_TEST_CLIENT_SECRET: "1111111111"
       JWT_OIDC_TEST_JWKS_CACHE_TIMEOUT: "6000"
 
+
+      KEYCLOAK_ADMIN_CLIENTID: "met-admin"
+      KEYCLOAK_ADMIN_SECRET: "2222222222"
+      KEYCLOAK_AUTH_AUDIENCE: "met-web"
+      KEYCLOAK_AUTH_CLIENT_SECRET: "1111111111"
+      KEYCLOAK_BASE_URL: "http://localhost:8081/auth"
+      KEYCLOAK_REALMNAME: "demo"
+      USE_KEYCLOAK_DOCKER: "YES"
+
       KEYCLOAK_TEST_ADMIN_CLIENTID: "met-admin"
       KEYCLOAK_TEST_ADMIN_SECRET: "2222222222"
       KEYCLOAK_TEST_AUTH_AUDIENCE: "met-web"
       KEYCLOAK_TEST_AUTH_CLIENT_SECRET: "1111111111"
-      KEYCLOAK_TEST_BASE_URL: "http://localhost:8081"
+      KEYCLOAK_TEST_BASE_URL: "http://localhost:8081/auth"
       KEYCLOAK_TEST_REALMNAME: "demo"
       USE_TEST_KEYCLOAK_DOCKER: "YES"
+      SQLALCHEMY_DATABASE_URI: "postgresql://postgres:postgres@localhost:5432/postgres"
 
     runs-on: ubuntu-20.04
 

diff --git a/.github/workflows/met-cron-cd.yml b/.github/workflows/met-cron-cd.yml
@@ -13,11 +13,7 @@ on:
       environment:
         description: "Environment (dev/test/prod)"
         required: true
-        default: "dev"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "EAO" # Default value is EAO         
+        default: "dev"     
 
 defaults:
   run:
@@ -27,13 +23,12 @@ defaults:
 env:
   APP_NAME: "met-cron"
   TAG_NAME: "${{github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default
 
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 
 jobs:

diff --git a/.github/workflows/met-etl-cd.yml b/.github/workflows/met-etl-cd.yml
@@ -13,11 +13,7 @@ on:
       environment:
         description: "Environment (dev/test/prod)"
         required: true
-        default: "dev"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "EAO" # Default value is EAO    
+        default: "dev"  
 
 defaults:
   run:
@@ -28,14 +24,12 @@ env:
   APP_NAME: "dagster-etl"
   DEPLOYMENT_NAME: "dagster-dagster-user-deployments-etl"
   TAG_NAME: "dev"
-
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default
 
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 jobs:
   met-cron-cd:

diff --git a/.github/workflows/met-web-cd.yml b/.github/workflows/met-web-cd.yml
@@ -13,10 +13,6 @@ on:
         description: "Environment (dev/test/prod)"
         required: true
         default: "dev"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "EAO" # Default value is EAO    
 
 defaults:
   run:
@@ -26,14 +22,12 @@ defaults:
 env:
   APP_NAME: "met-web"
   TAG_NAME: "${{ github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default
-
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default
 
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 jobs:
   met-web-cd:

diff --git a/.github/workflows/notify-api-cd.yml b/.github/workflows/notify-api-cd.yml
@@ -13,10 +13,6 @@ on:
         description: "Environment (dev/test/prod)"
         required: true
         default: "dev"
-      project_type:
-        description: "Project Type (EAO/GDX)"
-        required: false
-        default: "EAO" # Default value is EAO  
 
 defaults:
   run:
@@ -27,13 +23,11 @@ env:
   APP_NAME: "notify-api"
   TAG_NAME: "${{ github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default
 
-  PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default
-
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
 
 jobs:
   notify-api-cd:

diff --git a/.gitignore b/.gitignore
@@ -68,6 +68,9 @@ instance/
 # Scrapy stuff:
 .scrapy
 
+# Colima
+met-api/colima.yaml
+
 # Sphinx documentation
 docs/_build/
 
@@ -137,5 +140,6 @@ met-api/.DS_Store
 /.idea/modules.xml
 /.idea/met-public.iml
 
-# VSCode Chrome extension user data
-.vscode/chrome
+# VSCode config and Chrome extension user data
+.vscode/chrome
+met-web/.vscode/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,14 @@
   "makefile.extensionOutputFolder": "./.vscode",
   "python.defaultInterpreterPath": "${workspaceFolder}/met-api/venv/bin/python",
   "python.envFile": "${workspaceFolder}/met-api/.env",
-  "python.analysis.extraPaths": ["./met-api/src", "./met-cron/src", "./analytics-api/src"]
+  "python.analysis.extraPaths": [
+    "./analytics-api/src",
+    "./met-cron/src",
+    "./met-api/src",
+  ],
+  "pylint.args": [
+    "--load-plugins",
+    "pylint_flask_sqlalchemy",
+    "pylint_flask"],
+  "python.analysis.autoImportCompletions": true
 }