ci: Revert DB provisionning

.github/workflows/continuous_delivery.yaml

@@ -2,16 +2,17 @@ name: Continuous Delivery
 
 on:
   workflow_run:
-    workflows: ["Continous Delivery (Infrastructure)", "Continuous Integration"]
+    workflows: ["Continuous Integration", "Continous Delivery (Infrastructure)"]
     types:
       - completed
   workflow_dispatch:
 
 jobs:
   release:
     if: |
-      github.event.workflow_run.conclusion == 'success'
-      && github.event.workflow_run.head_branch == 'main'
+      github.event.workflow_run.conclusion == 'success' &&
+      contains(fromJson('["Continuous Integration", "Continous Delivery (Infrastructure)"]'), github.event.workflow_run.name) &&
+      github.event.workflow_run.event == 'push'
     name: Create GitHub Release
     runs-on: ubuntu-24.04
     concurrency: release
@@ -36,8 +37,9 @@ jobs:
     runs-on: ubuntu-24.04
     needs: release
     if: |
-      github.event.workflow_run.conclusion == 'success'
-      && github.event.workflow_run.head_branch == 'main'
+      github.event.workflow_run.conclusion == 'success' &&
+      contains(fromJson('["Continuous Integration", "Continous Delivery (Infrastructure)"]'), github.event.workflow_run.name) &&
+      github.event.workflow_run.event == 'push'
 
     steps:
       - name: Checkout code

.github/workflows/update_infrastructure.yaml

@@ -27,11 +27,11 @@ jobs:
       - name: Setup terraform.tfvars
         run: |
           cat <<EOF > terraform.tfvars
-          db_password        = "${{ secrets.DB_PASSWORD }}"
           project_id         = "${{ secrets.TF_PROJECT_ID }}"
           terraform_sa_email = "${{ secrets.TF_SA_EMAIL }}"
 
           cloud_run_env_vars = {
+            DATABASE_URL   = "${{ secrets.DATABASE_URL }}"
             ENV            = "production"
             OPENAI_API_KEY = "${{ secrets.OPENAI_API_KEY_PROD }}"
           }

.vscode/settings.json

@@ -57,6 +57,5 @@
             "username": "postgres",
             "password": "password"
         }
-    ],
-    "windsurfPyright.disableLanguageServices": true
+    ]
 }

terraform/cloud_run.tf

@@ -8,14 +8,6 @@ resource "google_cloud_run_service" "fastapi" {
   location = var.region
   project  = var.project_id
 
-  metadata {
-    annotations = {
-      "run.googleapis.com/cloudsql-instances"   = google_sql_database_instance.sql_instance_sightcall_qa_api.connection_name
-      "run.googleapis.com/vpc-access-connector" = google_vpc_access_connector.serverless_connector.id
-      "run.googleapis.com/vpc-access-egress"    = "all-traffic"
-    }
-  }
-
   template {
     spec {
       service_account_name = google_service_account.cloudrun_sa.email
@@ -34,11 +26,6 @@ resource "google_cloud_run_service" "fastapi" {
             value = env.value
           }
         }
-
-        env {
-          name  = "DATABASE_URL"
-          value = local.database_url
-        }
       }
     }
 

terraform/terraform.tfvars.example

@@ -1,8 +1,8 @@
-db_password = "password"
 project_id = "sightcall-qa-api"
 terraform_sa_email = "terraform@example.iam.gserviceaccount.com"
 
 cloud_run_env_vars = {
+    DATABASE_URL = "postgresql://postgres:password@vector_db:5432/vectordb"
     ENV = "production"
     OPENAI_API_KEY = "sk-"
 }

terraform/variables.tf

@@ -9,12 +9,6 @@ variable "cloud_run_env_vars" {
   default     = {}
 }
 
-variable "db_password" {
-  type        = string
-  description = "Password for the database"
-  sensitive   = true
-}
-
 variable "enabled_apis" {
   type = list(string)
   default = [
@@ -26,8 +20,7 @@ variable "enabled_apis" {
     "iam.googleapis.com",
     "serviceusage.googleapis.com",
     "logging.googleapis.com",
-    "monitoring.googleapis.com",
-    "vpcaccess.googleapis.com"
+    "monitoring.googleapis.com"
   ]
 }