feat: migrate compute engine postdeployment to cloud build triggers

README.md

@@ -68,13 +68,15 @@ The following dependencies must be available:
 A service account with the following roles must be used to provision
 the resources of this module:
 
+- roles/cloudbuild.builds.editor
 - roles/cloudsql.admin
 - roles/compute.admin
 - roles/compute.networkAdmin
 - roles/firebase.managementServiceAgent
 - roles/firebasehosting.admin
 - roles/iam.serviceAccountAdmin
 - roles/iam.serviceAccountUser
+- roles/pubsub.editor
 - roles/resourcemanager.projectIamAdmin
 - roles/run.admin
 - roles/secretmanager.admin

app/placeholder/Dockerfile

@@ -16,9 +16,10 @@
 # Execute with "docker run --build-arg PROJECT_ID=$PROJECT_ID ..."
 ARG PROJECT_ID=YOURPROJECTID
 FROM gcr.io/$PROJECT_ID/firebase
+WORKDIR /app
 
-RUN apk add gettext
+RUN apk add gettext curl
 RUN npm install -g json
-COPY . ./
+COPY . /app/
 
-ENTRYPOINT ./placeholder-deploy.sh
+ENTRYPOINT ["/app/placeholder-deploy.sh"]

app/placeholder/placeholder-deploy.sh

@@ -17,14 +17,32 @@
 # any errors? exit immediately.
 set -e
 
+# Ensure we got to the right directory. Cloud Build may start us in /workspace
+cd /app
+
+# escape if firebase_url not defined (mandatory, required later)
+if [[ -z $FIREBASE_URL ]]; then
+    echo "FIREBASE_URL not defined. Cannot deploy. Exiting."
+    exit 1
+fi
+
+# Only run the placeholder script if the site has been deployed before.
+# Check if the firebase url has "Site Not Found" (the pre-deployment state)
+if curl "$FIREBASE_URL" | grep -q "Site Not Found"; then
+    echo "Firebase site $FIREBASE_URL hasn't been deployed before, so it needs a placeholder."
+else
+    echo "Firebase site $FIREBASE_URL has been deployed before. Not going to deploy placeholder. Exiting."
+    exit 0
+fi
+
 # if deploying with a suffix (from infra/jobs.tf), adjust the config to suit the custom site
 # https://firebase.google.com/docs/hosting/multisites#set_up_deploy_targets
 if [[ -n $SUFFIX ]]; then
     json -I -f firebase.json -e "this.hosting.target='$SUFFIX'"
     UPDATED=true
 
     # Use template file to generate configuration
-    envsubst  < firebaserc.tmpl > .firebaserc
+    envsubst <firebaserc.tmpl >.firebaserc
     echo "Customised .firebaserc created to support site."
     cat .firebaserc
 fi
@@ -35,6 +53,10 @@ if [[ -n $UPDATED ]]; then
     cat firebase.json
 fi
 
+# Finally, deploy the application
 echo "Deploying placeholder to Firebase..."
-
 firebase deploy --project "$PROJECT_ID" --only hosting
+
+# Setup for greater chances of success by explicitly purging cache
+echo "Purging firebase cache"
+curl -X PURGE "${FIREBASE_URL}/"

infra/README.md

@@ -48,7 +48,7 @@ Functional examples are included in the
 | database\_name | Cloud SQL database name | `string` | `"django"` | no |
 | database\_username | Cloud SQL database name | `string` | `"server"` | no |
 | enable\_apis | Whether or not to enable underlying apis in this solution. | `bool` | `true` | no |
-| image\_version | Version of the Container Registry image to use | `string` | `"v1.8.2"` | no |
+| image\_version | Version of the Container Registry image to use | `string` | `"v1.9.0"` | no |
 | init | Initialize database? | `bool` | `true` | no |
 | instance\_name | Cloud SQL Instance name | `string` | `"psql"` | no |
 | labels | A set of key/value label pairs to assign to the resources deployed by this blueprint. | `map(string)` | `{}` | no |
@@ -89,13 +89,15 @@ The following dependencies must be available:
 A service account with the following roles must be used to provision
 the resources of this module:
 
+- roles/cloudbuild.builds.editor
 - roles/cloudsql.admin
 - roles/compute.admin
 - roles/compute.networkAdmin
 - roles/firebase.managementServiceAgent
 - roles/firebasehosting.admin
 - roles/iam.serviceAccountAdmin
 - roles/iam.serviceAccountUser
+- roles/pubsub.editor
 - roles/resourcemanager.projectIamAdmin
 - roles/run.admin
 - roles/secretmanager.admin

infra/apis.tf

@@ -50,6 +50,7 @@ module "project_services" {
     "compute.googleapis.com",
     "firebase.googleapis.com",
     "firebasehosting.googleapis.com",
+    "pubsub.googleapis.com",
     "iam.googleapis.com",
     "run.googleapis.com",
     "secretmanager.googleapis.com",

infra/containers.tf

@@ -19,5 +19,5 @@
 locals {
   server_image      = "gcr.io/${var.server_image_host}/server:${var.image_version}"
   client_image      = "gcr.io/${var.client_image_host}/client:${var.image_version}"
-  placeholder_image = "gcr.io/hsa-public/avocano-placeholder:latest"
+  placeholder_image = "gcr.io/hsa-public/avocano-placeholder:postjsstrigger" # TODO(glasnt): revert to tag "latest"
 }

infra/iam.tf

@@ -14,15 +14,31 @@
  * limitations under the License.
  */
 
-# Service Accounts
-
 locals {
-  # Helpers for the clunky formatting of these values
-  automation_SA = "serviceAccount:${google_service_account.automation.email}"
-  server_SA     = "serviceAccount:${google_service_account.server.email}"
-  client_SA     = "serviceAccount:${google_service_account.client.email}"
+  # Lists of required roles
+  server_iam_members = [
+    "roles/cloudsql.client",
+    "roles/run.viewer",
+    "roles/cloudtrace.agent"
+  ]
+  client_iam_members = [
+    "roles/run.viewer",
+    "roles/firebasehosting.admin",
+  ]
+  automation_iam_members = [
+    "roles/cloudsql.client"
+  ]
+  init_iam_members = [
+    "roles/logging.logWriter",
+    "roles/cloudbuild.builds.builder",
+    "roles/iam.serviceAccountUser",
+    "roles/run.developer",
+    "roles/firebasehosting.admin"
+  ]
 }
 
+# Accounts
+
 resource "google_service_account" "server" {
   account_id   = var.random_suffix ? "api-backend-${random_id.suffix.hex}" : "api-backend"
   display_name = "API Backend service account"
@@ -41,66 +57,44 @@ resource "google_service_account" "automation" {
   depends_on   = [module.project_services]
 }
 
-resource "google_service_account" "compute" {
-  account_id   = var.random_suffix ? "compute-startup-${random_id.suffix.hex}" : "compute-startup"
-  display_name = "Head Start App Compute Instance SA"
+
+resource "google_service_account" "init" {
+  account_id   = var.random_suffix ? "init-startup-${random_id.suffix.hex}" : "init-startup"
+  display_name = "Jump Start App Init SA"
   depends_on   = [module.project_services]
   count        = var.init ? 1 : 0
 }
 
-# The Cloud Run server can access the database
+# Permissions
+
 resource "google_project_iam_member" "server_permissions" {
-  project    = var.project_id
-  role       = "roles/cloudsql.client"
-  member     = local.server_SA
-  depends_on = [google_service_account.server]
-}
+  count = length(local.server_iam_members)
 
-# Cloud Build can access the database
-resource "google_project_iam_member" "build_permissions" {
-  project    = var.project_id
-  role       = "roles/cloudsql.client"
-  member     = local.automation_SA
-  depends_on = [google_service_account.automation]
+  project = var.project_id
+  role    = local.server_iam_members[count.index]
+  member  = "serviceAccount:${google_service_account.server.email}"
 }
 
-# Server needs introspection permissions
-resource "google_project_iam_member" "server_introspection" {
-  project    = var.project_id
-  role       = "roles/run.viewer"
-  member     = local.server_SA
-  depends_on = [google_service_account.server]
-}
+resource "google_project_iam_member" "client_permissions" {
+  count = length(local.client_iam_members)
 
-# Client needs introspection permissions
-resource "google_project_iam_member" "client_introspection" {
-  project    = var.project_id
-  role       = "roles/run.viewer"
-  member     = local.client_SA
-  depends_on = [google_service_account.client]
+  project = var.project_id
+  role    = local.client_iam_members[count.index]
+  member  = "serviceAccount:${google_service_account.client.email}"
 }
 
-# Client may need permission to deploy the front end
-resource "google_project_iam_member" "client_permissions" {
-  project    = var.project_id
-  role       = "roles/firebasehosting.admin"
-  member     = local.client_SA
-  depends_on = [google_service_account.client]
-}
+resource "google_project_iam_member" "automation_permissions" {
+  count = length(local.automation_iam_members)
 
-# GCE instance needs access to start Jobs
-resource "google_project_iam_member" "computestartup_permissions" {
-  project    = var.project_id
-  role       = "roles/run.developer"
-  member     = "serviceAccount:${google_service_account.compute[0].email}"
-  depends_on = [google_service_account.compute]
-  count      = var.init ? 1 : 0
+  project = var.project_id
+  role    = local.automation_iam_members[count.index]
+  member  = "serviceAccount:${google_service_account.automation.email}"
 }
 
-# Server needs to write to Cloud Trace
-resource "google_project_iam_member" "server_traceagent" {
-  project    = var.project_id
-  role       = "roles/cloudtrace.agent"
-  member     = local.server_SA
-  depends_on = [google_service_account.server]
+resource "google_project_iam_member" "init_permissions" {
+  count = length(local.init_iam_members)
+
+  project = var.project_id
+  role    = local.init_iam_members[count.index]
+  member  = "serviceAccount:${google_service_account.init[0].email}"
 }

infra/jobs.tf

@@ -14,54 +14,7 @@
  * limitations under the License.
  */
 
-resource "google_cloud_run_v2_job" "setup" {
-  name     = var.random_suffix ? "setup-${random_id.suffix.hex}" : "setup"
-  location = var.region
-
-  labels = var.labels
-
-  template {
-    template {
-      service_account = google_service_account.automation.email
-      containers {
-        image   = local.server_image
-        command = ["setup"]
-        env {
-          name = "DJANGO_ENV"
-          value_source {
-            secret_key_ref {
-              secret  = google_secret_manager_secret.django_settings.secret_id
-              version = "latest"
-            }
-          }
-        }
-        env {
-          name = "DJANGO_SUPERUSER_PASSWORD"
-          value_source {
-            secret_key_ref {
-              secret  = google_secret_manager_secret.django_admin_password.secret_id
-              version = "latest"
-            }
-          }
-        }
-        volume_mounts {
-          name       = "cloudsql"
-          mount_path = "/cloudsql"
-        }
-      }
-      volumes {
-        name = "cloudsql"
-        cloud_sql_instance {
-          instances = [google_sql_database_instance.postgres.connection_name]
-        }
-      }
-    }
-  }
-  depends_on = [
-    google_secret_manager_secret_version.django_settings
-  ]
-}
-
+# Job to apply server database updates
 resource "google_cloud_run_v2_job" "migrate" {
   name     = var.random_suffix ? "migrate-${random_id.suffix.hex}" : "migrate"
   location = var.region
@@ -101,75 +54,4 @@ resource "google_cloud_run_v2_job" "migrate" {
   ]
 }
 
-
-
-resource "google_cloud_run_v2_job" "client" {
-
-  name     = var.random_suffix ? "client-${random_id.suffix.hex}" : "client"
-  location = var.region
-
-  labels = var.labels
-
-  template {
-    template {
-      service_account = google_service_account.client.email
-      containers {
-        image = local.client_image
-
-        # Variables used to customise Firebase configuration on deployment
-        # https://github.com/GoogleCloudPlatform/avocano/blob/main/client/docker-deploy.sh
-        env {
-          name  = "SUFFIX"
-          value = var.random_suffix ? random_id.suffix.hex : ""
-        }
-        env {
-          name  = "SERVICE_NAME"
-          value = google_cloud_run_v2_service.server.name
-        }
-        env {
-          name  = "REGION"
-          value = var.region
-        }
-        env {
-          name  = "PROJECT_ID"
-          value = var.project_id
-        }
-
-      }
-    }
-  }
-
-  depends_on = [
-    module.project_services
-  ]
-}
-
-
-resource "google_cloud_run_v2_job" "placeholder" {
-  name     = var.random_suffix ? "placeholder-${random_id.suffix.hex}" : "placeholder"
-  location = var.region
-
-  labels = var.labels
-
-  template {
-    template {
-      service_account = google_service_account.client.email
-      containers {
-        image = local.placeholder_image
-        env {
-          name  = "PROJECT_ID"
-          value = var.project_id
-        }
-
-        env {
-          name  = "SUFFIX"
-          value = var.random_suffix ? random_id.suffix.hex : ""
-        }
-      }
-    }
-  }
-
-  depends_on = [
-    module.project_services
-  ]
-}
+# Other jobs defined in postdeployment.tf