Refactor tests

README.md

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

regional/README.md

@@ -11,7 +11,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | 5.39.1 |
+| <a name="provider_google"></a> [google](#provider\_google) | 5.38.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | 2.14.0 |
 | <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.31.0 |
 

tests/default.tftest.hcl

@@ -52,6 +52,17 @@ run "primary_regional" {
   }
 }
 
+run "remote" {
+  command = apply
+
+  module {
+    source = "./tests/fixtures/remote"
+  }
+  variables {
+    gke_fleet_host_project_id = "mock-fleet-host-project"
+  }
+}
+
 run "remote_regional" {
   command = apply
 
@@ -60,13 +71,8 @@ run "remote_regional" {
   }
 
   variables {
-    istio_external_istiod = true
-    istio_gateway_dns = {
-      "mock-region-b.mock-environment.mock-subdomain.mock-domain" = {
-        managed_zone = "mock-environment-mock-subdomain-mock-domain"
-        project      = "mock-dns-project"
-      }
-    }
-    region = "mock-region-b"
+    gke_fleet_host_project_id = "mock-fleet-host-project"
+    istio_external_istiod     = true
+    region                    = "mock-region-b"
   }
 }

tests/fixtures/remote/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/remote/main.tf

@@ -0,0 +1,17 @@
+# Required Providers
+# https://developer.hashicorp.com/terraform/language/providers/requirements
+
+terraform {
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+  }
+}
+
+module "test" {
+  source = "../../../"
+
+  labels  = local.labels
+  project = var.project
+}

tests/fixtures/remote/outputs.tf

@@ -0,0 +1,10 @@
+# Output Values
+# https://www.terraform.io/language/values/outputs
+
+output "istio_gateway_mci_global_address" {
+  value = module.test.istio_gateway_mci_global_address
+}
+
+output "istio_gateway_mci_ssl_certificate_name" {
+  value = module.test.istio_gateway_mci_ssl_certificate_name
+}

tests/fixtures/remote/regional/main.tf

@@ -71,10 +71,9 @@ module "test" {
   enable_istio_gateway         = true
   istio_external_istiod        = var.istio_external_istiod
   istio_control_plane_clusters = var.istio_control_plane_clusters
-  istio_gateway_dns            = var.istio_gateway_dns
   istio_remote_injection_path  = var.istio_remote_injection_path
   istio_remote_injection_url   = var.istio_remote_injection_url
   labels                       = local.labels
   project                      = var.project
   region                       = var.region
-}
+}

tests/fixtures/remote/regional/variables.tf

@@ -5,18 +5,15 @@ variable "environment" {
   type = string
 }
 
+variable "gke_fleet_host_project_id" {
+  type = string
+}
+
 variable "istio_control_plane_clusters" {
   type    = string
   default = null
 }
 
-variable "istio_gateway_dns" {
-  type = map(object({
-    managed_zone = string
-    project      = string
-  }))
-}
-
 variable "istio_external_istiod" {
   type    = bool
   default = false

tests/fixtures/remote/variables.tf

@@ -0,0 +1,14 @@
+# Input Variables
+# https://www.terraform.io/language/values/variables
+
+variable "environment" {
+  type = string
+}
+
+variable "gke_fleet_host_project_id" {
+  type = string
+}
+
+variable "project" {
+  type = string
+}