feat!: Remove 'squad' from Terraform modules (#1174)

Following on from
#1161

Author: jml

modules/alerting/README.md

@@ -74,7 +74,6 @@ No modules.
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | n/a | `string` | n/a | yes |
 | <a name="input_scaling_issue_filter"></a> [scaling\_issue\_filter](#input\_scaling\_issue\_filter) | additional filter to apply to scaling issue alert policy | `string` | `""` | no |
 | <a name="input_signal_filter"></a> [signal\_filter](#input\_signal\_filter) | additional filter to apply to signal alert policy | `string` | `""` | no |
-| <a name="input_squad"></a> [squad](#input\_squad) | DEPRECATED: Use 'team' instead. Squad label to apply to resources. | `string` | `""` | no |
 | <a name="input_team"></a> [team](#input\_team) | Team label to apply to resources (replaces deprecated 'squad'). | `string` | `""` | no |
 | <a name="input_timeout_filter"></a> [timeout\_filter](#input\_timeout\_filter) | additional filter to apply to timeout alert policy | `string` | `""` | no |
 

modules/alerting/main.tf

@@ -13,12 +13,11 @@ locals {
 }
 
 locals {
-  effective_team                 = coalesce(var.team, var.squad, "unknown")
-  squad_log_filter               = local.effective_team == "" ? "" : "labels.squad=\"${local.effective_team}\""
-  squad_proto_log_filter         = local.effective_team == "" ? "" : "protoPayload.response.metadata.labels.squad=\"${local.effective_team}\""
-  name                           = local.effective_team == "" ? "global" : local.effective_team
-  squad_metric_filter            = local.effective_team == "" ? "" : "metric.labels.team=\"${local.effective_team}\""
-  squad_metric_user_label_filter = local.effective_team == "" ? "" : "metadata.user_labels.\"team\"=\"${local.effective_team}\""
+  squad_log_filter               = var.team == "" ? "" : "labels.squad=\"${var.team}\""
+  squad_proto_log_filter         = var.team == "" ? "" : "protoPayload.response.metadata.labels.squad=\"${var.team}\""
+  name                           = var.team == "" ? "global" : var.team
+  squad_metric_filter            = var.team == "" ? "" : "metric.labels.team=\"${var.team}\""
+  squad_metric_user_label_filter = var.team == "" ? "" : "metadata.user_labels.\"team\"=\"${var.team}\""
 }
 
 locals {
@@ -498,7 +497,7 @@ resource "google_monitoring_alert_policy" "nonzero-exitcode-job" {
 }
 
 locals {
-  promql_squad_filter = local.effective_team == "" ? "" : ", team=\"${local.effective_team}\""
+  promql_squad_filter = var.team == "" ? "" : ", team=\"${var.team}\""
 }
 
 resource "google_monitoring_alert_policy" "service_failure_rate_non_eventing" {
@@ -727,7 +726,7 @@ resource "google_monitoring_alert_policy" "grpc_service_failure_rate" {
 }
 
 resource "google_logging_metric" "cloud-run-scaling-failure" {
-  count = local.effective_team == "" ? 1 : 0
+  count = var.team == "" ? 1 : 0
 
   name   = "cloud_run_scaling_failure"
   filter = <<EOT
@@ -808,7 +807,7 @@ resource "google_monitoring_alert_policy" "cloud-run-scaling-failure" {
 }
 
 resource "google_logging_metric" "cloud-run-failed-req" {
-  count = local.effective_team == "" ? 1 : 0
+  count = var.team == "" ? 1 : 0
 
   name   = "cloud_run_failed_req"
   filter = <<EOT
@@ -990,7 +989,7 @@ resource "google_monitoring_alert_policy" "cloudrun_timeout" {
 }
 
 resource "google_logging_metric" "cloudrun_timeout" {
-  count = local.effective_team == "" ? 1 : 0
+  count = var.team == "" ? 1 : 0
 
   name   = "cloudrun_timeout"
   filter = <<EOT
@@ -1027,7 +1026,7 @@ resource "google_logging_metric" "cloudrun_timeout" {
 }
 
 resource "google_logging_metric" "dockerhub_ratelimit" {
-  count = local.effective_team == "" ? 1 : 0
+  count = var.team == "" ? 1 : 0
 
   name   = "dockerhub_ratelimit"
   filter = <<EOT
@@ -1070,7 +1069,7 @@ resource "google_logging_metric" "dockerhub_ratelimit" {
 }
 
 resource "google_logging_metric" "github_ratelimit" {
-  count = local.effective_team == "" ? 1 : 0
+  count = var.team == "" ? 1 : 0
 
   name   = "github_ratelimit"
   filter = <<EOT
@@ -1113,7 +1112,7 @@ resource "google_logging_metric" "github_ratelimit" {
 }
 
 resource "google_logging_metric" "r2_same_ratelimit" {
-  count = local.effective_team == "" ? 1 : 0
+  count = var.team == "" ? 1 : 0
 
   name   = "r2_same_ratelimit"
   filter = <<EOT

modules/alerting/variables.tf

@@ -127,12 +127,6 @@ variable "team" {
   default     = ""
 }
 
-variable "squad" {
-  description = "DEPRECATED: Use 'team' instead. Squad label to apply to resources."
-  type        = string
-  default     = ""
-}
-
 variable "global_only_alerts" {
   description = "only enable global alerts. when true, only create alerts that are global."
   type        = bool

modules/bastion/README.md

@@ -160,10 +160,9 @@ No modules.
 | <a name="input_patch_time_utc"></a> [patch\_time\_utc](#input\_patch\_time\_utc) | Time of day in HH:MM (UTC) when patching runs. | `string` | `"03:00"` | no |
 | <a name="input_product"></a> [product](#input\_product) | Product label to apply to the service. | `string` | `"unknown"` | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Project in which to deploy the bastion host. | `string` | n/a | yes |
-| <a name="input_squad"></a> [squad](#input\_squad) | DEPRECATED: Use 'team' instead. Squad label to apply to resources. | `string` | `""` | no |
 | <a name="input_startup_script"></a> [startup\_script](#input\_startup\_script) | additional startup script snippet to execute on bastion. | `string` | `""` | no |
 | <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | Subnetwork name the bastion joins (must be private). | `string` | n/a | yes |
-| <a name="input_team"></a> [team](#input\_team) | Team label to apply to resources (replaces deprecated 'squad'). | `string` | `""` | no |
+| <a name="input_team"></a> [team](#input\_team) | Team label to apply to resources (replaces deprecated 'squad'). | `string` | n/a | yes |
 | <a name="input_zone"></a> [zone](#input\_zone) | Compute Engine zone for the bastion VM (e.g. us-central1-a). | `string` | n/a | yes |
 
 ## Outputs

modules/bastion/main.tf

@@ -21,11 +21,9 @@ locals {
     terraform-module               = basename(abspath(path.module))
   }
 
-  effective_team = coalesce(var.team, var.squad)
-
   squad_label = {
-    squad = local.effective_team
-    team  = local.effective_team
+    squad = var.team
+    team  = var.team
   }
 
   product_label = var.product != "" ? {

modules/bastion/variables.tf

@@ -36,18 +36,6 @@ variable "dev_principals" {
 variable "team" {
   description = "Team label to apply to resources (replaces deprecated 'squad')."
   type        = string
-  default     = ""
-
-  validation {
-    condition     = var.team != "" || var.squad != ""
-    error_message = "Either 'team' or 'squad' must be specified. Please use 'team' as 'squad' is deprecated."
-  }
-}
-
-variable "squad" {
-  description = "DEPRECATED: Use 'team' instead. Squad label to apply to resources."
-  type        = string
-  default     = ""
 }
 
 variable "machine_type" {

modules/bucket-events/README.md

@@ -128,7 +128,6 @@ No requirements.
 | <a name="input_product"></a> [product](#input\_product) | Product label to apply to the service. | `string` | `"unknown"` | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | n/a | `string` | n/a | yes |
 | <a name="input_regions"></a> [regions](#input\_regions) | A map from region names to a network and subnetwork. The bucket must be in one of these regions. | <pre>map(object({<br/>    network = string<br/>    subnet  = string<br/>  }))</pre> | n/a | yes |
-| <a name="input_squad"></a> [squad](#input\_squad) | DEPRECATED: Use 'team' instead. Squad label to apply to resources. | `string` | `""` | no |
 | <a name="input_team"></a> [team](#input\_team) | Team label to apply to resources (replaces deprecated 'squad'). | `string` | `""` | no |
 
 ## Outputs

modules/bucket-events/main.tf

@@ -13,11 +13,9 @@ locals {
     terraform-module               = basename(abspath(path.module))
   }
 
-  effective_team = coalesce(var.team, var.squad, "unknown")
-
   squad_label = {
-    squad = local.effective_team
-    team  = local.effective_team
+    squad = var.team
+    team  = var.team
   }
 
   product_label = var.product != "" ? {
@@ -82,7 +80,6 @@ module "this" {
   }
 
   team                = var.team
-  squad               = var.squad
   deletion_protection = var.deletion_protection
   service_account     = google_service_account.service.email
   containers = {

modules/bucket-events/variables.tf

@@ -62,12 +62,6 @@ variable "team" {
   default     = ""
 }
 
-variable "squad" {
-  description = "DEPRECATED: Use 'team' instead. Squad label to apply to resources."
-  type        = string
-  default     = ""
-}
-
 variable "labels" {
   description = "Labels to apply to the bucket event resources."
   type        = map(string)

modules/cloudevent-broker/README.md

@@ -120,7 +120,6 @@ No requirements.
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | n/a | `string` | n/a | yes |
 | <a name="input_regions"></a> [regions](#input\_regions) | A map from region names to a network and subnetwork.  A pub/sub topic and ingress service (publishing to the respective topic) will be created in each region, with the ingress service configured to egress all traffic via the specified subnetwork. | <pre>map(object({<br/>    network = string<br/>    subnet  = string<br/>  }))</pre> | n/a | yes |
 | <a name="input_scaling"></a> [scaling](#input\_scaling) | The scaling configuration for the service. | <pre>object({<br/>    min_instances                    = optional(number, 0)<br/>    max_instances                    = optional(number, 100)<br/>    max_instance_request_concurrency = optional(number)<br/>  })</pre> | `{}` | no |
-| <a name="input_squad"></a> [squad](#input\_squad) | DEPRECATED: Use 'team' instead. Squad label to apply to resources. | `string` | `""` | no |
 | <a name="input_team"></a> [team](#input\_team) | Team label to apply to resources (replaces deprecated 'squad'). | `string` | `""` | no |
 
 ## Outputs