From 799e53eb7a2579adaabb4a2265d865d8b905fe18 Mon Sep 17 00:00:00 2001 From: Doc Ritezel Date: Tue, 4 Feb 2025 09:53:18 -0800 Subject: [PATCH] Remove old IaC configuration [#3365] --- .../gcp-components/.terraform.lock.hcl | 21 -------------- .../deployments/gcp-components/terraform.tf | 21 -------------- .../deployments/gcp-components/vars.tf | 29 ------------------- .../dev/gcp-components/target.tfbackend | 1 - .../targets/dev/gcp-components/target.tfvars | 3 -- iac/terraform/targets/local/README.md | 5 ---- .../targets/local/gcp-components/.gitignore | 1 - .../local/gcp-components/target.tfvars | 3 -- .../prod/gcp-components/target.tfbackend | 1 - .../targets/prod/gcp-components/target.tfvars | 3 -- 10 files changed, 88 deletions(-) delete mode 100644 iac/terraform/deployments/gcp-components/.terraform.lock.hcl delete mode 100644 iac/terraform/deployments/gcp-components/terraform.tf delete mode 100644 iac/terraform/deployments/gcp-components/vars.tf delete mode 100644 iac/terraform/targets/dev/gcp-components/target.tfbackend delete mode 100644 iac/terraform/targets/dev/gcp-components/target.tfvars delete mode 100644 iac/terraform/targets/local/README.md delete mode 100644 iac/terraform/targets/local/gcp-components/.gitignore delete mode 100644 iac/terraform/targets/local/gcp-components/target.tfvars delete mode 100644 iac/terraform/targets/prod/gcp-components/target.tfbackend delete mode 100644 iac/terraform/targets/prod/gcp-components/target.tfvars diff --git a/iac/terraform/deployments/gcp-components/.terraform.lock.hcl b/iac/terraform/deployments/gcp-components/.terraform.lock.hcl deleted file mode 100644 index 3e9e7f9edb..0000000000 --- a/iac/terraform/deployments/gcp-components/.terraform.lock.hcl +++ /dev/null @@ -1,21 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/google" { - version = "4.34.0" - hashes = [ - "h1:ffds+Dg9PFD2bjzHbfjhvQkVk9tckCbHiiqUERlSAgY=", - "zh:1319b4e17e3242f36338ab4f422c09183dcae320272f611cfd06a225a2c8af8f", - "zh:29ca012946e89998af0924b64e482a904c29abba0c773930ff72b92d82bb740c", - "zh:3f87b2063a50c38482395e5dadd4bb4b451ac2f4b62387b07ef9e0fe54888e73", - "zh:55cef4dce0f563b853975b253861f46464ce25c1d5c52b930824d8cc65e3d882", - "zh:653cc915e79ccad55dfd78c98b0f9835996ce70d2415fc5ab8a3f0b5e2a3e2c9", - "zh:6be45154d6c190b4f37d7d5a464c900c1aee3d86806e2c3610f6c5e2e9e4230a", - "zh:895e5742fe4da10470c54441bec173fc1bb3f8e4123e1b12154175e12a0ad711", - "zh:a287505e82a55db481fc5da97c9d6a6bd2e8ba47e6688106ae299db68f3005d5", - "zh:d627b3b9c73e71bb109c5ce9b50dfe1f7a03e8ca08c9f5c7c68597dd588f1a07", - "zh:dcb0b653c479dcadc9d3403a784074d8f7e9a6f5bba633a11e4a1852ded2b3a8", - "zh:ef738a6ef05ef748074e05e516adb21a669c744808d47d0638bc01d85d26bcae", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} diff --git a/iac/terraform/deployments/gcp-components/terraform.tf b/iac/terraform/deployments/gcp-components/terraform.tf deleted file mode 100644 index b8e6a54d08..0000000000 --- a/iac/terraform/deployments/gcp-components/terraform.tf +++ /dev/null @@ -1,21 +0,0 @@ -provider "google" { - project = "cal-itp-data-infra" - region = var.compute_region -} - -terraform { - backend "gcs" { - } -} - -data "google_client_openid_userinfo" "me" { -} - -locals { - pfx = var.env_name == "local" ? replace(split("@", data.google_client_openid_userinfo.me.email)[0], ".", "") : var.env_name - - std_labels = { - "Creator" = data.google_client_openid_userinfo.me.email - "Environment" = var.env_name - } -} diff --git a/iac/terraform/deployments/gcp-components/vars.tf b/iac/terraform/deployments/gcp-components/vars.tf deleted file mode 100644 index 824b69bdf4..0000000000 --- a/iac/terraform/deployments/gcp-components/vars.tf +++ /dev/null @@ -1,29 +0,0 @@ -variable "env_name" { - type = string - description = "target environment name" - - validation { - condition = can(regex("^[a-z][a-z0-9-]*", var.env_name)) - error_message = "Invalid environment name (must match: '^[a-z][a-z0-9-]*')." - } -} - -variable "compute_region" { - type = string - description = "default region for project compute deployments" - - validation { - condition = can(regex("^[a-z][a-z0-9-]*", var.compute_region)) - error_message = "Invalid compute region (must match: '^[a-z][a-z0-9-]*')." - } -} - -variable "data_region" { - type = string - description = "default region for project data storage" - - validation { - condition = can(regex("^[a-z][a-z0-9-]*", var.data_region)) - error_message = "Invalid data region (must match: '^[a-z][a-z0-9-]*')." - } -} diff --git a/iac/terraform/targets/dev/gcp-components/target.tfbackend b/iac/terraform/targets/dev/gcp-components/target.tfbackend deleted file mode 100644 index 72e6e722af..0000000000 --- a/iac/terraform/targets/dev/gcp-components/target.tfbackend +++ /dev/null @@ -1 +0,0 @@ -bucket = "calitp-dev-gcp-components-tfstate" diff --git a/iac/terraform/targets/dev/gcp-components/target.tfvars b/iac/terraform/targets/dev/gcp-components/target.tfvars deleted file mode 100644 index 5861640dd8..0000000000 --- a/iac/terraform/targets/dev/gcp-components/target.tfvars +++ /dev/null @@ -1,3 +0,0 @@ -env_name = "dev" -compute_region = "us-west1" -data_region = "us-west1" diff --git a/iac/terraform/targets/local/README.md b/iac/terraform/targets/local/README.md deleted file mode 100644 index 75d7acdbbe..0000000000 --- a/iac/terraform/targets/local/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Local target - -In order to utilize a local target, make sure to add a `target.tfbackend` file to -the target directory. See `targets/prod/gcp-components` for a sample -`target.tfbackend` file. diff --git a/iac/terraform/targets/local/gcp-components/.gitignore b/iac/terraform/targets/local/gcp-components/.gitignore deleted file mode 100644 index ba6b8e3b8c..0000000000 --- a/iac/terraform/targets/local/gcp-components/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target.tfbackend diff --git a/iac/terraform/targets/local/gcp-components/target.tfvars b/iac/terraform/targets/local/gcp-components/target.tfvars deleted file mode 100644 index c14b33b6d3..0000000000 --- a/iac/terraform/targets/local/gcp-components/target.tfvars +++ /dev/null @@ -1,3 +0,0 @@ -env_name = "local" -compute_region = "us-west1" -data_region = "us-west1" diff --git a/iac/terraform/targets/prod/gcp-components/target.tfbackend b/iac/terraform/targets/prod/gcp-components/target.tfbackend deleted file mode 100644 index 4524fb2b1c..0000000000 --- a/iac/terraform/targets/prod/gcp-components/target.tfbackend +++ /dev/null @@ -1 +0,0 @@ -bucket = "calitp-prod-gcp-components-tfstate" diff --git a/iac/terraform/targets/prod/gcp-components/target.tfvars b/iac/terraform/targets/prod/gcp-components/target.tfvars deleted file mode 100644 index b4eeac5a7b..0000000000 --- a/iac/terraform/targets/prod/gcp-components/target.tfvars +++ /dev/null @@ -1,3 +0,0 @@ -env_name = "prod" -compute_region = "us-west1" -data_region = "us-west2"