cleanup

Author: max-ostapenko

terraform/dev/main.tf

@@ -36,7 +36,7 @@ provider "docker" {
 }
 
 module "gateway" {
-  source                = "./../modules/api-gateway"
+  source                = "../modules/api-gateway"
   project               = var.project
   environment           = var.environment
   region                = var.region
@@ -130,12 +130,11 @@ EOF
 }
 
 module "endpoints" {
-  source                      = "./../modules/run-service"
-  entry_point                 = "app"
+  source                      = "../modules/run-service"
   project                     = var.project
   environment                 = var.environment
   source_directory            = "../../src"
-  function_name               = "tech-report-api"
+  service_name               = "tech-report-api"
   region                      = var.region
   service_account_email       = var.google_service_account_cloud_functions
   service_account_api_gateway = var.google_service_account_api_gateway

terraform/modules/api-gateway/variables.tf

@@ -6,10 +6,12 @@ variable "environment" {
 variable "project" {
   description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
   type        = string
+  default     = "httparchive"
 }
 variable "region" {
   description = "The Region of this resource"
   type        = string
+  default     = "us-central1"
 }
 variable "service_account_email" {
   description = "Email of the service account associated with and to run the API Gateway"

terraform/modules/run-service/docker.tf

@@ -7,12 +7,33 @@ terraform {
   }
 }
 
+# Calculate hash of source files to determine if rebuild is needed
+locals {
+  source_files = fileset(path.root, "${var.source_directory}/*")
+  source_hash  = substr(sha1(join("", [for f in local.source_files : filesha1(f)])), 0, 8)
+}
+
+# Build Docker image
+resource "docker_image" "function_image" {
+  name = "${var.region}-docker.pkg.dev/${var.project}/tech-report-api/${var.service_name}:${local.source_hash}"
+
+  build {
+    context    = var.source_directory
+    dockerfile = "Dockerfile"
+    platform   = "linux/amd64"
+  }
+}
+
+resource "docker_registry_image" "registry_image" {
+  name = docker_image.function_image.name
+}
+
 resource "google_cloud_run_v2_service" "service" {
-  name     = "${var.function_name}-${var.environment}"
+  name     = "${var.service_name}-${var.environment}"
   location = var.region
 
   deletion_protection = false
-  ingress             = var.ingress_settings
+  ingress             = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
 
   template {
     service_account = var.service_account_email
@@ -32,16 +53,11 @@ resource "google_cloud_run_v2_service" "service" {
           value = env.value
         }
       }
-
     }
-
-
     timeout                          = var.timeout
     max_instance_request_concurrency = var.max_instance_request_concurrency
-
   }
   scaling {
-
     min_instance_count = var.min_instances
   }
   traffic {

terraform/modules/run-service/main.tf

@@ -5,19 +5,16 @@ variable "region" {
 variable "environment" {
   description = "The 'Environment' that is being created/deployed. Applied as a suffix to many resources."
   type        = string
+  default     = "dev"
 }
 variable "source_directory" {
   description = "The folder of the package containing function that will be executed when the Google Cloud Function is triggered!"
   type        = string
 }
-variable "function_name" {
+variable "service_name" {
   description = "Optional: Can be used to create more than function from the same package"
   type        = string
 }
-variable "entry_point" {
-  description = "The entry point; This is either what is registered with 'http' or exported from the code as a handler!"
-  type        = string
-}
 variable "available_memory_gb" {
   default     = "2Gi"
   type        = string
@@ -28,19 +25,10 @@ variable "available_cpu" {
   type        = string
   description = "The amount of CPU for the Cloud Function"
 }
-variable "ingress_settings" {
-  type        = string
-  default     = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
-  description = "String value that controls what traffic can reach the function. Allowed values are ALLOW_ALL, ALLOW_INTERNAL_AND_GCLB and ALLOW_INTERNAL_ONLY. Check ingress documentation to see the impact of each settings value. Changes to this field will recreate the cloud function."
-}
-variable "vpc_connector_egress_settings" {
-  type        = string
-  default     = null
-  description = "The egress settings for the connector, controlling what traffic is diverted through it. Allowed values are ALL_TRAFFIC and PRIVATE_RANGES_ONLY. Defaults to PRIVATE_RANGES_ONLY. If unset, this field preserves the previously set value."
-}
 variable "project" {
   description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
   type        = string
+  default     = "httparchive"
 }
 variable "timeout" {
   default     = "60s"
@@ -55,11 +43,7 @@ variable "service_account_api_gateway" {
   type        = string
   description = "API Gateway service account who can invoke this function. This is required!"
 }
-variable "max_instances" {
-  default     = 10
-  type        = number
-  description = "(Optional) The limit on the maximum number of function instances that may coexist at a given time."
-}
+
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number

terraform/modules/run-service/variables.tf

@@ -22,7 +22,6 @@ provider "google-beta" {
   region  = var.region
 }
 
-
 # Get current Google Cloud access token
 data "google_client_config" "default" {}
 
@@ -35,13 +34,9 @@ provider "docker" {
   }
 }
 
-
-
 module "gateway" {
-  source                = "./../modules/api-gateway"
-  project               = var.project
+  source                = "../modules/api-gateway"
   environment           = var.environment
-  region                = var.region
   service_account_email = var.google_service_account_api_gateway
   spec_yaml             = <<EOF
 swagger: "2.0"
@@ -125,13 +120,10 @@ EOF
 }
 
 module "endpoints" {
-  source                      = "./../modules/run-service"
-  entry_point                 = "app"
-  project                     = var.project
+  source                      = "../modules/run-service"
   environment                 = var.environment
   source_directory            = "../../src"
-  function_name               = "tech-report-api"
-  region                      = var.region
+  service_name               = "tech-report-api"
   service_account_email       = var.google_service_account_cloud_functions
   service_account_api_gateway = var.google_service_account_api_gateway
   min_instances               = var.min_instances
@@ -141,7 +133,6 @@ module "endpoints" {
   }
 }
 
-
 moved {
   from = google_api_gateway_api.api
   to   = module.gateway.google_api_gateway_api.api