try cloud build on GA

.github/workflows/cloud_build.yml

@@ -2,7 +2,7 @@ name: Push and Deploy to Cloud Run
 on: 
   push:
     branches:
-      - not_a_branch
+      - dev
 
 jobs:
   setup-build-deploy:

main.tf

@@ -118,19 +118,6 @@ resource "google_service_account_iam_binding" "workload_identity_user" {
   service_account_id = google_service_account.default.name
   role               = "roles/iam.workloadIdentityUser"
   members            = [
-    "principal://iam.googleapis.com/projects/${google_project.project.number}/locations/global/workloadIdentityPools/${google_iam_workload_identity_pool.pool.workload_identity_pool_id}/subject/${SUBJECT}"
+    "serviceAccount:${google_service_account.default.email}"
   ]
-}
-
-## We will use GitHub Actions to build and deploy the container image, so we actually don't need this
-# resource "google_cloudbuild_trigger" "default" {
-#   name = "burn-prod-trigger"
-#   github {
-#     owner = "SchmidtDSE"
-#     name  = "burn-severity-mapping-poc"
-#     push {
-#       branch = "prod"
-#     }
-#   }
-#   filename = "cloudbuild.yaml"
-# }
+}

terraform.tfstate

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.6.0",
-  "serial": 53,
+  "serial": 56,
   "lineage": "44075ebe-b91a-1e72-3b17-affdfb63c0f1",
   "outputs": {},
   "resources": [
@@ -403,16 +403,14 @@
             "etag": "BwYMzVAjNrY=",
             "id": "projects/dse-nps/serviceAccounts/[email protected]/roles/iam.workloadIdentityUser",
             "members": [
-              "principal://iam.googleapis.com/projects/113009620257/locations/global/workloadIdentityPools/github"
+              "serviceAccount:github-actions-service-account@dse-nps.iam.gserviceaccount.com"
             ],
             "role": "roles/iam.workloadIdentityUser",
             "service_account_id": "projects/dse-nps/serviceAccounts/[email protected]"
           },
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "data.google_project.project",
-            "google_iam_workload_identity_pool.pool",
             "google_service_account.default"
           ]
         }

terraform.tfstate.backup

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.6.0",
-  "serial": 51,
+  "serial": 55,
   "lineage": "44075ebe-b91a-1e72-3b17-affdfb63c0f1",
   "outputs": {},
   "resources": [
@@ -403,15 +403,14 @@
             "etag": "BwYMzVAjNrY=",
             "id": "projects/dse-nps/serviceAccounts/[email protected]/roles/iam.workloadIdentityUser",
             "members": [
-              "principal://iam.googleapis.com/projects/113009620257/locations/global/workloadIdentityPools/github/attribute.repository"
+              "principalSet://iam.googleapis.com/projects/dse-nps/locations/global/workloadIdentityPools/github/attribute.repository"
             ],
             "role": "roles/iam.workloadIdentityUser",
             "service_account_id": "projects/dse-nps/serviceAccounts/[email protected]"
           },
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "data.google_project.project",
             "google_iam_workload_identity_pool.pool",
             "google_service_account.default"
           ]