From e4a66071d8eccfad02616ac28eb9d645150604a6 Mon Sep 17 00:00:00 2001
From: Ash Davies <1892070+ashdavies@users.noreply.github.com>
Date: Sun, 19 Jan 2025 20:48:06 +0100
Subject: [PATCH] Provide artifact endpoint definitions (#1448)

Co-authored-by: Ashley Davies <ashdavies@users.noreply.github.com>
---
 terraform/modules.tf                          | 14 +++--
 .../modules/google/cloud-run-build/main.tf    | 13 +++--
 .../google/cloud-run-build/variables.tf       | 10 ++--
 .../modules/google/cloud-run-endpoint/main.tf | 57 ++++++++++---------
 .../scripts/gcloud_build_image                |  0
 .../google/cloud-run-endpoint/variables.tf    | 18 +++---
 6 files changed, 64 insertions(+), 48 deletions(-)
 mode change 100644 => 100755 terraform/modules/google/cloud-run-endpoint/scripts/gcloud_build_image

diff --git a/terraform/modules.tf b/terraform/modules.tf
index 43d0d03d7..ea0ed8348 100644
--- a/terraform/modules.tf
+++ b/terraform/modules.tf
@@ -8,18 +8,20 @@ module "api-gateway" {
 }
 
 module "cloud-run-build" {
-  docker_image = "${var.project_region}-docker.pkg.dev/${var.project_id}/cloud-run-source-deploy/api.ashdavies.dev"
-  source       = "./modules/google/cloud-run-build"
-  service_name = "playground-service"
-  location     = var.project_region
-  project      = var.project_id
+  image_name    = "api.ashdavies.dev"
+  location      = var.project_region
+  project       = var.project_id
+  repository_id = "cloud-run-source-deploy"
+  service_name  = "playground-service"
+  source        = "./modules/google/cloud-run-build"
 }
 
 # module.cloud-run-endpoint is deprecated
 module "cloud-run-endpoint" {
   source             = "./modules/google/cloud-run-endpoint"
   config_id          = module.cloud-run-endpoint.config_id
-  container_image    = "${var.project_region}-docker.pkg.dev/${var.project_id}/endpoints-release/endpoints-runtime-serverless:latest"
+  image_name         = "endpoints-runtime-serverless"
+  repository_id      = "endpoints-release"
   endpoint_name      = "api.ashdavies.dev"
   image_repository   = "${var.project_region}-docker.pkg.dev/${var.project_id}/endpoints-release"
   location           = var.project_region
diff --git a/terraform/modules/google/cloud-run-build/main.tf b/terraform/modules/google/cloud-run-build/main.tf
index 6904b7ebb..92b41d6e5 100644
--- a/terraform/modules/google/cloud-run-build/main.tf
+++ b/terraform/modules/google/cloud-run-build/main.tf
@@ -1,12 +1,11 @@
 resource "google_cloud_run_service" "main" {
-  name                       = var.service_name
-  location                   = var.location
-  autogenerate_revision_name = true
+  name     = var.service_name
+  location = var.location
 
   template {
     spec {
       containers {
-        image = "${var.docker_image}:latest"
+        image = data.google_artifact_registry_docker_image.main.self_link
       }
     }
   }
@@ -16,3 +15,9 @@ resource "google_cloud_run_service" "main" {
     percent         = var.percent
   }
 }
+
+data "google_artifact_registry_docker_image" "main" {
+  location      = var.location
+  repository_id = var.repository_id
+  image_name    = var.image_name
+}
diff --git a/terraform/modules/google/cloud-run-build/variables.tf b/terraform/modules/google/cloud-run-build/variables.tf
index 8ae761ed2..ed957e249 100644
--- a/terraform/modules/google/cloud-run-build/variables.tf
+++ b/terraform/modules/google/cloud-run-build/variables.tf
@@ -1,8 +1,6 @@
-variable "docker_image" {
+variable "image_name" {
   description = <<EOT
-  Docker image name. This is most often a reference to a container located in the container
-  registry, such as europe-west1-docker.pkg.dev/project/cloud-run-source-deploy/artifact.
-  More info: https://kubernetes.io/docs/concepts/containers/images
+  "The image name to fetch. If no digest or tag is provided, then the latest modified image will be used."
   EOT
 }
 
@@ -28,6 +26,10 @@ variable "project" {
   description = "The project for the resource."
 }
 
+variable "repository_id" {
+  description = "The last part of the repository name to fetch from."
+}
+
 variable "service_name" {
   description = <<EOT
   Name must be unique within a namespace, within a Cloud Run region. Is required when creating
diff --git a/terraform/modules/google/cloud-run-endpoint/main.tf b/terraform/modules/google/cloud-run-endpoint/main.tf
index ecc13a79d..79fad1d53 100644
--- a/terraform/modules/google/cloud-run-endpoint/main.tf
+++ b/terraform/modules/google/cloud-run-endpoint/main.tf
@@ -1,27 +1,5 @@
-
-data "external" "esp_version" {
-  program = ["bash", "${path.module}/scripts/esp_full_version", "${var.esp_version}"]
-}
-
-resource "null_resource" "main" {
-  provisioner "local-exec" {
-    command = <<EOS
-    bash ${path.module}/scripts/gcloud_build_image \
-      -g ${var.image_repository} \
-      -s ${var.endpoint_name} \
-      -c ${var.config_id} \
-      -p ${var.project} \
-      -v ${var.esp_version}
-    EOS
-  }
-
-  triggers = {
-    config_id   = google_endpoints_service.main.config_id
-    esp_version = data.external.esp_version.result.esp_full_version
-  }
-}
-
 resource "google_cloud_run_service" "main" {
+  depends_on = [null_resource.main]
   name       = var.service_name
   location   = var.location
   project    = var.project
@@ -29,7 +7,7 @@ resource "google_cloud_run_service" "main" {
   template {
     spec {
       containers {
-        image = var.container_image
+        image = data.google_artifact_registry_docker_image.main.self_link
       }
     }
   }
@@ -39,15 +17,42 @@ resource "google_cloud_run_service" "main" {
     latest_revision = true
   }
 
-  autogenerate_revision_name = true
-
   lifecycle {
     prevent_destroy = true
   }
 }
 
+data "google_artifact_registry_docker_image" "main" {
+  depends_on    = [null_resource.main]
+  location      = var.location
+  repository_id = var.repository_id
+  image_name    = var.image_name
+}
+
+resource "null_resource" "main" {
+  provisioner "local-exec" {
+    command = <<EOS
+    bash ${path.module}/scripts/gcloud_build_image \
+      -g ${var.image_repository} \
+      -s ${var.endpoint_name} \
+      -c ${var.config_id} \
+      -p ${var.project} \
+      -v ${var.esp_version}
+    EOS
+  }
+
+  triggers = {
+    config_id   = google_endpoints_service.main.config_id
+    esp_version = data.external.esp_version.result.esp_full_version
+  }
+}
+
 resource "google_endpoints_service" "main" {
   openapi_config = var.openapi_config
   service_name   = var.endpoint_name
   project        = var.project
 }
+
+data "external" "esp_version" {
+  program = ["bash", "${path.module}/scripts/esp_full_version", var.esp_version]
+}
diff --git a/terraform/modules/google/cloud-run-endpoint/scripts/gcloud_build_image b/terraform/modules/google/cloud-run-endpoint/scripts/gcloud_build_image
old mode 100644
new mode 100755
diff --git a/terraform/modules/google/cloud-run-endpoint/variables.tf b/terraform/modules/google/cloud-run-endpoint/variables.tf
index 54d1b32ce..45f98c7d5 100644
--- a/terraform/modules/google/cloud-run-endpoint/variables.tf
+++ b/terraform/modules/google/cloud-run-endpoint/variables.tf
@@ -2,14 +2,6 @@ variable "config_id" {
   description = "The id of the service configuration resource."
 }
 
-variable "container_image" {
-  description = <<EOT
-  Docker image name. This is most often a reference to a container located in the container
-  registry, such as europe-west1-docker.pkg.dev/project/cloud-run-source-deploy/artifact.
-  More info: https://kubernetes.io/docs/concepts/containers/images
-  EOT
-}
-
 variable "endpoint_name" {
   description = ""
 }
@@ -20,6 +12,12 @@ variable "esp_version" {
   default     = "2.40.0"
 }
 
+variable "image_name" {
+  description = <<EOT
+  "The image name to fetch. If no digest or tag is provided, then the latest modified image will be used."
+  EOT
+}
+
 variable "image_repository" {
   description = ""
 }
@@ -43,3 +41,7 @@ variable "service_name" {
 variable "project" {
   description = "The project for the resource."
 }
+
+variable "repository_id" {
+  description = "The last part of the repository name to fetch from."
+}