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

Author: max-ostapenko

.gitignore

@@ -3,27 +3,10 @@
 
 # Terraform
 .terraform
-*.tfstate
-*.tfstate.*
 *.terraform.lock.hcl
-secret.tfvars
-override.tf
-override.tf.json
-*_override.tf
-*_override.tf.json
-*tfplan*
-.terraformrc
-terraform.rc
-*.tfvars
-*.local.tfvars
-spec.yaml
-
-# env
-.envrc
 
 # CLI
 .DS_Store
 
-
 node_modules/
 src/coverage/

terraform/modules/run-service/main.tf

@@ -18,15 +18,14 @@ provider "docker" {
   }
 }
 
-# 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)
+# Calculate hash of source files using git (respects .gitignore)
+data "external" "source_hash" {
+  program = ["bash", "-c", "cd ${var.source_directory} && echo '{\"hash\":\"'$(git ls-files -s | sha1sum | cut -c1-8)'\"}'"]
 }
 
 # Build Docker image
 resource "docker_image" "function_image" {
-  name = "${var.region}-docker.pkg.dev/${var.project}/report-api/${var.service_name}:${local.source_hash}"
+  name = "${var.region}-docker.pkg.dev/${var.project}/report-api/${var.service_name}:${data.external.source_hash.result.hash}"
 
   build {
     context    = var.source_directory
@@ -44,7 +43,7 @@ resource "google_cloud_run_v2_service" "service" {
   location = var.region
 
   deletion_protection = false
-  ingress             = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
+  ingress             = var.ingress_settings
 
   template {
     service_account = var.service_account_email

terraform/modules/run-service/variables.tf

@@ -40,15 +40,9 @@ variable "available_cpu" {
 }
 variable "ingress_settings" {
   type        = string
-  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."
+  default     = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
+  description = "String value that controls what traffic can reach the function. 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