Merge branch 'main' into tech-sort-and-versions

Author: max-ostapenko

terraform/dev/main.tf

@@ -1,34 +1,34 @@
 terraform {
+  required_version = ">=1.11.0"
+
   backend "gcs" {
     bucket = "tfstate-httparchive"
     prefix = "tech-report-apis/dev"
   }
   required_providers {
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.6.2"
+      version = ">=3.6.2"
     }
     google = {
       source = "hashicorp/google"
+      version = ">=7.13.0"
     }
   }
 }
 
 provider "google" {
   project         = var.project
   region          = var.region
-  request_timeout = "60m"
 }
 
 module "endpoints" {
   source           = "./../modules/run-service"
-  entry_point      = "app"
   project          = var.project
   environment      = var.environment
   source_directory = "../../src"
-  service_name    = "tech-report-api"
+  service_name    = "report-api"
   region           = var.region
-  min_instances    = var.min_instances
   environment_variables = {
     "PROJECT"  = var.project
     "DATABASE" = var.project_database

terraform/dev/variables.tf

@@ -17,8 +17,3 @@ variable "project_database" {
   description = "The database name"
   default     = "tech-report-api-dev"
 }
-variable "min_instances" {
-  description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
-  type        = number
-  default     = 0
-}

terraform/modules/cdn-glb/variables.tf

@@ -2,7 +2,6 @@ variable "project" {
   description = "The GCP project ID"
   type        = string
 }
-
 variable "region" {
   description = "The GCP region for the Cloud Run service"
   type        = string
@@ -12,23 +11,19 @@ variable "environment" {
   description = "The 'Environment' that is being created/deployed. Applied as a suffix to many resources."
   type        = string
 }
-
 variable "cloud_run_service_name" {
   description = "The name of the Cloud Run service to route traffic to"
   type        = string
 }
-
 variable "domain" {
   description = "The domain name for the SSL certificate"
   type        = string
 }
-
 variable "name_prefix" {
   description = "Prefix for naming resources"
   type        = string
   default     = "report-api"
 }
-
 variable "load_balancer_name" {
   description = "Name for the load balancer (URL map)"
   type        = string
@@ -40,37 +35,31 @@ variable "enable_cdn" {
   type        = bool
   default     = true
 }
-
 variable "cdn_cache_mode" {
   description = "CDN cache mode (CACHE_ALL_STATIC, USE_ORIGIN_HEADERS, FORCE_CACHE_ALL)"
   type        = string
   default     = "CACHE_ALL_STATIC"
 }
-
 variable "cdn_default_ttl" {
   description = "Default TTL for cached content in seconds"
   type        = number
   default     = 2592000 # 30 days
 }
-
 variable "cdn_max_ttl" {
   description = "Maximum TTL for cached content in seconds"
   type        = number
   default     = 2592000 # 30 days
 }
-
 variable "cdn_client_ttl" {
   description = "Client TTL for cached content in seconds (browser cache)"
   type        = number
   default     = 28800 # 8 hours
 }
-
 variable "cdn_serve_while_stale" {
   description = "Time to serve stale content while revalidating in seconds"
   type        = number
   default     = 0
 }
-
 variable "cdn_negative_caching" {
   description = "Whether to enable negative caching"
   type        = bool
@@ -83,39 +72,23 @@ variable "neg_name" {
   type        = string
   default     = null
 }
-
 variable "backend_service_name" {
   description = "Name for the backend service (overrides name_prefix)"
   type        = string
   default     = null
 }
-
 variable "ssl_cert_name" {
   description = "Name for the SSL certificate (overrides name_prefix-ssl-cert)"
   type        = string
   default     = null
 }
-
 variable "https_proxy_name" {
   description = "Name for the HTTPS proxy (overrides load_balancer_name-target-proxy)"
   type        = string
   default     = null
 }
-
-variable "http_proxy_name" {
-  description = "Name for the HTTP proxy"
-  type        = string
-  default     = null
-}
-
 variable "https_forwarding_rule_name" {
   description = "Name for the HTTPS forwarding rule"
   type        = string
   default     = null
 }
-
-variable "http_forwarding_rule_name" {
-  description = "Name for the HTTP forwarding rule"
-  type        = string
-  default     = null
-}

terraform/modules/run-service/main.tf

@@ -2,13 +2,6 @@ terraform {
   required_providers {
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.6.2"
-    }
-    google = {
-      source = "hashicorp/google"
-    }
-    archive = {
-      source = "hashicorp/archive"
     }
   }
 }

terraform/modules/run-service/variables.tf

@@ -1,28 +1,32 @@
+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
+}
 variable "region" {
   default = "us-central1"
   type    = string
 }
-variable "service_name" {
-  description = "Optional: Can be used to create more than function from the same package"
-  type        = string
-  default     = "report-api"
-}
 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!"
+variable "service_name" {
+  description = "Optional: Can be used to create more than function from the same package"
   type        = string
 }
 variable "service_name" {
   description = "Optional: Can be used to create more than function from the same package"
   type        = string
 }
+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 "entry_point" {
   description = "The entry point; This is either what is registered with 'http' or exported from the code as a handler!"
   type        = string
+  default     = "app"
 }
 variable "available_memory" {
   default     = "1Gi"
@@ -34,11 +38,17 @@ variable "available_cpu" {
   type        = string
   description = "The amount of CPU for the Cloud Function"
 }
-variable "project" {
-  description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
+variable "ingress_settings" {
   type        = string
-  default     = "httparchive"
+  default     = "ALLOW_ALL"
+  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 "timeout" {
   default     = "60s"
   type        = string
@@ -49,16 +59,16 @@ variable "service_account_email" {
   description = "Service account who can invoke this function. This is required!"
   default     = "[email protected]"
 }
+variable "min_instances" {
+  description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
+  type        = number
+  default     = 0
+}
 variable "max_instances" {
   default     = 2
   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
-  default     = 1
-}
 variable "max_instance_request_concurrency" {
   description = "(Optional) The limit on the maximum number of requests that an instance can handle simultaneously. This can be used to control costs when scaling. Defaults to 1."
   type        = number

terraform/prod/main.tf

@@ -17,18 +17,16 @@ terraform {
 provider "google" {
   project         = var.project
   region          = var.region
-  request_timeout = "60m"
 }
 
 module "endpoints" {
   source           = "./../modules/run-service"
-  entry_point      = "app"
   project          = var.project
   environment      = var.environment
   source_directory = "../../src"
-  service_name    = "tech-report-api"
+  service_name    = "report-api"
   region           = var.region
-  min_instances    = var.min_instances
+  min_instances    = 1
   environment_variables = {
     "PROJECT"  = var.project
     "DATABASE" = var.project_database
@@ -43,16 +41,13 @@ module "cdn_glb" {
   environment = var.environment
 
   cloud_run_service_name = module.endpoints.name
-  domain                 = var.cdn_domain
-  load_balancer_name     = var.load_balancer_name
+  domain                 = "cdn.httparchive.org"
+  load_balancer_name     = "httparchive-load-balancer"
   name_prefix            = "report-api"
 
-  # Resource name overrides to match existing resources
   neg_name                   = "report-api-prod"
   backend_service_name       = "report-api"
   ssl_cert_name              = "google-managed2"
   https_proxy_name           = "httparchive-load-balancer-target-proxy-2"
-  http_proxy_name            = "httparchive-load-balancer-target-proxy"
   https_forwarding_rule_name = "httparchive-load-balancer-forwarding-rule-2"
-  http_forwarding_rule_name  = "httparchive-load-balancer-forwarding-rule"
 }

terraform/prod/variables.tf

@@ -17,20 +17,3 @@ variable "project_database" {
   description = "The database name"
   default     = "tech-report-api-prod"
 }
-variable "min_instances" {
-  description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
-  type        = number
-  default     = 1
-}
-
-variable "cdn_domain" {
-  description = "The domain name for the CDN SSL certificate"
-  type        = string
-  default     = "cdn.httparchive.org"
-}
-
-variable "load_balancer_name" {
-  description = "The name for the load balancer (URL map)"
-  type        = string
-  default     = "httparchive-load-balancer"
-}