Terraform testing alignment (#4)

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: check-symlinks
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.92.0
+    rev: v1.92.1
     hooks:
       - id: terraform_fmt
 
@@ -29,7 +29,7 @@ repos:
       - id: terraform_docs
 
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: 3.2.213
+    rev: 3.2.219
     hooks:
       - id: checkov
         verbose: true

README.md

@@ -72,7 +72,7 @@ terraform test
 
 | Name | Version |
 |------|---------|
-| google | 5.38.0 |
+| google | 5.40.0 |
 
 ### Resources
 

regional/README.md

@@ -11,7 +11,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | 5.38.0 |
+| <a name="provider_google"></a> [google](#provider\_google) | 5.40.0 |
 
 ## Modules
 

regional/nat/README.md

@@ -11,7 +11,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | 5.38.0 |
+| <a name="provider_google"></a> [google](#provider\_google) | 5.40.0 |
 
 ## Modules
 

tests/default.tftest.hcl

@@ -3,22 +3,15 @@ mock_provider "google" {}
 run "default" {
   command = apply
 
-    module {
+  module {
     source = "./tests/fixtures/default"
   }
 
-  assert {
-    condition     = module.test.name == "test-vpc"
-    error_message = "The VPC name does not match the expected value 'test-vpc'."
-  }
+  # Example assertion
 
   assert {
-    condition     = module.test.project == "test-default-tf75-sb"
-    error_message = "The project ID does not match the expected value 'test-default-tf75-sb'."
-  }
-
-  variables {
-    project = "test-default-tf75-sb"
+    condition     = module.test.name == "mock-vpc"
+    error_message = "The VPC name does not match the expected value 'mock-vpc'."
   }
 }
 
@@ -28,10 +21,6 @@ run "dns" {
   module {
     source = "./tests/fixtures/default/dns"
   }
-
-  variables {
-    project = "test-default-tf75-sb"
-  }
 }
 
 run "regional" {
@@ -40,10 +29,6 @@ run "regional" {
   module {
     source = "./tests/fixtures/default/regional"
   }
-
-  variables {
-    project = "test-default-tf75-sb"
-  }
 }
 
 run "regional_nat" {
@@ -52,8 +37,9 @@ run "regional_nat" {
   module {
     source = "./tests/fixtures/default/regional_nat"
   }
+}
 
-  variables {
-    project = "test-default-tf75-sb"
-  }
+variables {
+  project     = "mock-project"
+  environment = "mock-environment"
 }

tests/fixtures/default/dns/locals.tf

@@ -0,0 +1,12 @@
+# Local Values
+# https://www.terraform.io/docs/language/values/locals.html
+
+locals {
+  labels = {
+    cost-center = "mock-x001"
+    env         = var.environment
+    repository  = "mock-repository"
+    platform    = "mock-platform"
+    team        = "mock-team"
+  }
+}

tests/fixtures/default/dns/main.tf

@@ -1,6 +1,3 @@
-# Required Providers
-# https://developer.hashicorp.com/terraform/language/providers/requirements
-
 terraform {
   required_providers {
     google = {
@@ -12,34 +9,20 @@ terraform {
 module "public_test" {
   source = "../../../../dns"
 
-  dns_name = "gcp.osinfra.io."
-
-  labels = {
-    cost-center = "x000"
-    env         = "sb"
-    repository  = "terraform-google-cloud-dns"
-    team        = "testing"
-  }
-
-  name       = "gcp-osinfra-io"
+  dns_name   = "mock-subdomain.mock-domain.io."
+  labels     = local.labels
+  name       = "mock-subdomain-mock-domain"
   project    = var.project
   visibility = "public"
 }
 
 module "private_test" {
   source = "../../../../dns"
 
-  dns_name = "gcp-priv.osinfra.io."
-
-  labels = {
-    cost-center = "x000"
-    env         = "sb"
-    repository  = "terraform-google-cloud-dns"
-    team        = "testing"
-  }
-
-  name                               = "gcp-priv-osinfra-io"
-  private_visibility_config_networks = ["https://www.googleapis.com/compute/v1/projects/${var.project}/global/networks/terraform-test-vpc"]
+  dns_name                           = "mock-priv-subdomain.mock-domain."
+  labels                             = local.labels
+  name                               = "mock-priv-subdomain-mock-domain"
+  private_visibility_config_networks = ["https://www.googleapis.com/compute/v1/projects/${var.project}/global/networks/mock-vpc"]
   project                            = var.project
   visibility                         = "private"
 }

tests/fixtures/default/dns/variables.tf

@@ -1,4 +1,7 @@
+variable "environment" {
+  type = string
+}
+
 variable "project" {
-  type    = string
-  default = "test-default-tf75-sb"
+  type = string
 }

tests/fixtures/default/locals.tf

@@ -0,0 +1,12 @@
+# Local Values
+# https://www.terraform.io/docs/language/values/locals.html
+
+locals {
+  labels = {
+    cost-center = "mock-x001"
+    env         = var.environment
+    repository  = "mock-repository"
+    platform    = "mock-platform"
+    team        = "mock-team"
+  }
+}

tests/fixtures/default/main.tf

@@ -1,6 +1,3 @@
-# Required Providers
-# https://developer.hashicorp.com/terraform/language/providers/requirements
-
 terraform {
   required_providers {
     google = {
@@ -12,7 +9,7 @@ terraform {
 module "test" {
   source = "../../.."
 
-  name    = "test-vpc"
+  name    = "mock-vpc"
   project = var.project
 
   # The following rules test each of the dynamic blocks in various combinations. This should
@@ -33,7 +30,7 @@ module "test" {
 
       direction = "INGRESS"
 
-      name = "test-01"
+      name = "mock-rule-01"
 
       ranges = [
         "130.211.0.0/22",
@@ -70,8 +67,5 @@ module "test" {
     }
   ]
 
-  # In order to test this we would need a new project created in the google-cloud-terraform-testing
-  # repository. The existing projects are already a shared VPC host or service projects.
-
-  shared_vpc = false
+  shared_vpc = true
 }

tests/fixtures/default/regional/locals.tf

@@ -0,0 +1,12 @@
+# Local Values
+# https://www.terraform.io/docs/language/values/locals.html
+
+locals {
+  labels = {
+    cost-center = "mock-x001"
+    env         = var.environment
+    repository  = "mock-repository"
+    platform    = "mock-platform"
+    team        = "mock-team"
+  }
+}

tests/fixtures/default/regional/main.tf

@@ -1,6 +1,3 @@
-# Required Providers
-# https://developer.hashicorp.com/terraform/language/providers/requirements
-
 terraform {
   required_providers {
     google = {
@@ -13,15 +10,15 @@ module "test" {
   source = "../../../../regional"
 
   ip_cidr_range = "10.60.32.0/20"
-  name          = "terraform-test-subnet-us-east1"
-  network       = "terraform-test-vpc"
+  name          = "mock-subnet-us-east1"
+  network       = "mock-vpc"
 
   # When enabled, VMs in this subnetwork without external IP addresses can access Google APIs and
   # services by using Private Google Access. This is required for private Kubernetes clusters.
 
   private_ip_google_access = true
   project                  = var.project
-  region                   = "us-east1"
+  region                   = "mock-region"
 
   # Secondary ranges are used to allocate IP addresses to resources in a subnetwork. In this example we create Pod IP address ranges
   # and Service (ClusterIP) address ranges for a VPC-native cluster.
@@ -30,11 +27,11 @@ module "test" {
 
   secondary_ip_ranges = [
     {
-      range_name    = "k8s-services-us-east1"
+      range_name    = "mock-secondary-services"
       ip_cidr_range = "10.61.16.0/20"
     },
     {
-      range_name    = "k8s-pods-us-east1"
+      range_name    = "mock-secondary-pods"
       ip_cidr_range = "10.8.0.0/14"
     }
   ]

tests/fixtures/default/regional/variables.tf

@@ -1,4 +1,7 @@
+variable "environment" {
+  type = string
+}
+
 variable "project" {
-  type    = string
-  default = "test-default-tf75-sb"
+  type = string
 }

tests/fixtures/default/regional_nat/locals.tf

@@ -0,0 +1,12 @@
+# Local Values
+# https://www.terraform.io/docs/language/values/locals.html
+
+locals {
+  labels = {
+    cost-center = "mock-x001"
+    env         = var.environment
+    repository  = "mock-repository"
+    platform    = "mock-platform"
+    team        = "mock-team"
+  }
+}

tests/fixtures/default/regional_nat/main.tf

@@ -1,6 +1,3 @@
-# Required Providers
-# https://developer.hashicorp.com/terraform/language/providers/requirements
-
 terraform {
   required_providers {
     google = {
@@ -12,18 +9,18 @@ terraform {
 module "all_subnets_test" {
   source = "../../../../regional/nat"
 
-  network = "terraform-test-vpc"
+  network = "mock-vpc"
   project = var.project
-  region  = "us-east1"
+  region  = "mock-region"
 }
 
 module "list_of_subnets_test" {
   source = "../../../../regional/nat"
 
-  network                            = "terraform-test-vpc"
-  prefix                             = "terraform-test-vpc-subnetworks"
+  network                            = "mock-vpc"
+  prefix                             = "mock-vpc-subnetworks"
   project                            = var.project
-  region                             = "us-east1"
+  region                             = "mock-region"
   source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS"
-  subnetwork_names                   = ["fleet-member-us-east1"]
+  subnetwork_names                   = ["mock-subnetwork"]
 }

tests/fixtures/default/regional_nat/variables.tf

@@ -1,7 +1,7 @@
-# Terraform Input Variables
-# https://www.terraform.io/language/values/variables
+variable "environment" {
+  type = string
+}
 
 variable "project" {
-  type    = string
-  default = "test-default-tf75-sb"
+  type = string
 }

tests/fixtures/default/variables.tf

@@ -1,3 +1,7 @@
-variable "project" {
-  description = "The ID of the project in which the resource belongs"
-}
+variable "environment" {
+  type = string
+}
+
+variable "project" {
+  type = string
+}