Deprecate plan runner fixture and all its variants

fast/stages-multitenant/0-bootstrap-tenant/README.md

@@ -85,7 +85,7 @@ As shown in the script output above, the provider file is a template used as a s
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [org-level bootstrap stage documentation](../../stages/0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 
@@ -97,7 +97,7 @@ The globals variable file linked above contains definition which were set for th
 
 The tenant configuration resides in the `tenant_config` variable, this is an example configuration for a tenant with comments explaining the different choices that need to be made:
 
-```hcl
+```tfvars
 tenant_config = {
   # used for the top-level folder name
   descriptive_name = "My First Tenant"
@@ -142,7 +142,6 @@ tenant_config = {
   #   logging    = "folders/0123456789"
   # }
 }
-# tftest skip
 ```
 
 Configure the tenant variable in a tfvars file for this stage. A few minor points worth noting:

fast/stages-multitenant/1-resman-tenant/README.md

@@ -116,7 +116,7 @@ Once that is done, stage-level configuration variables are the same as the corre
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [org-level bootstrap stage documentation](../../stages/0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 

fast/stages/1-resman/README.md

@@ -112,7 +112,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 

fast/stages/2-networking-a-peering/README.md

@@ -253,7 +253,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 
@@ -315,7 +315,7 @@ This stage includes basic support for an HA VPN connecting the landing zone in t
 
 Support for the onprem VPN is disabled by default so that no resources are created, this is an example of how to configure the variable to enable the VPN:
 
-```hcl
+```tfvars
 vpn_onprem_primary_config = {
   peer_external_gateways = {
     default = {
@@ -357,7 +357,6 @@ vpn_onprem_primary_config = {
     }
   }
 }
-# tftest skip
 ```
 
 ### Adding an environment

fast/stages/2-networking-b-vpn/README.md

@@ -267,7 +267,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 
@@ -329,7 +329,7 @@ This stage includes basic support for an HA VPN connecting the landing zone in t
 
 Support for the onprem VPN is disabled by default so that no resources are created, this is an example of how to configure the variable to enable the VPN:
 
-```hcl
+```tfvars
 vpn_onprem_primary_config = {
   peer_external_gateways = {
     default = {
@@ -371,7 +371,6 @@ vpn_onprem_primary_config = {
     }
   }
 }
-# tftest skip
 ```
 
 ### Adding an environment

fast/stages/2-networking-c-nva/README.md

@@ -335,7 +335,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 
@@ -397,7 +397,7 @@ This stage includes basic support for an HA VPN connecting the landing zone in t
 
 Support for the onprem VPNs is disabled by default so that no resources are created, this is an example of how to configure one variable to enable the VPN in the primary region:
 
-```hcl
+```tfvars
 vpn_onprem_primary_config = {
   peer_external_gateways = {
     default = {
@@ -439,7 +439,6 @@ vpn_onprem_primary_config = {
     }
   }
 }
-# tftest skip
 ```
 
 ### Adding an environment

fast/stages/2-networking-d-separate-envs/README.md

@@ -215,7 +215,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 
@@ -270,7 +270,7 @@ This stage includes basic support for an HA VPN connecting each environment land
 
 Support for the onprem VPNs is disabled by default so that no resources are created, this is an example of how to configure one variable to enable the VPN for dev in the primary region:
 
-```hcl
+```tfvars
 vpn_onprem_dev_primary_config = {
   peer_external_gateways = {
     default = {
@@ -312,7 +312,6 @@ vpn_onprem_dev_primary_config = {
     }
   }
 }
-# tftest skip
 ```
 
 ### Changing default regions

fast/stages/2-networking-e-nva-bgp/README.md

@@ -357,7 +357,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 
@@ -419,7 +419,7 @@ This stage includes basic support for an HA VPN connecting the landing zone in t
 
 Support for the onprem VPNs is disabled by default so that no resources are created, this is an example of how to configure one variable to enable the VPN in the primary region:
 
-```hcl
+```tfvars
 vpn_onprem_primary_config = {
   peer_external_gateways = {
     default = {
@@ -461,7 +461,6 @@ vpn_onprem_primary_config = {
     }
   }
 }
-# tftest skip
 ```
 
 ### Adding an environment

fast/stages/2-security/README.md

@@ -110,7 +110,7 @@ The latter set is explained in the [Customization](#customizations) sections bel
 
 Note that the `outputs_location` variable is disabled by default, you need to explicitly set it in your `terraform.tfvars` file if you want output files to be generated by this stage. This is a sample `terraform.tfvars` that configures it, refer to the [bootstrap stage documentation](../0-bootstrap/README.md#output-files-and-cross-stage-variables) for more details:
 
-```hcl
+```tfvars
 outputs_location = "~/fast-config"
 ```
 

modules/bigquery-dataset/README.md

@@ -35,7 +35,7 @@ module "bigquery-dataset" {
     view_1         = "my-project|my-dataset|my-table"
   }
 }
-# tftest modules=1 resources=5
+# tftest modules=1 resources=5 inventory=simple.yaml
 ```
 
 ### IAM roles
@@ -51,7 +51,7 @@ module "bigquery-dataset" {
     "roles/bigquery.dataOwner" = ["user:[email protected]"]
   }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=2 inventory=iam.yaml
 ```
 
 ### Dataset options
@@ -70,7 +70,7 @@ module "bigquery-dataset" {
     max_time_travel_hours           = 168
   }
 }
-# tftest modules=1 resources=1
+# tftest modules=1 resources=1 inventory=options.yaml
 ```
 
 ### Tables and views
@@ -100,7 +100,7 @@ module "bigquery-dataset" {
     }
   }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=2 inventory=tables.yaml
 ```
 
 If partitioning is needed, populate the `partitioning` variable using either the `time` or `range` attribute.
@@ -132,7 +132,7 @@ module "bigquery-dataset" {
     }
   }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=2 inventory=partitioning.yaml
 ```
 
 To create views use the `view` variable. If you're querying a table created by the same module `terraform apply` will initially fail and eventually succeed once the underlying table has been created. You can probably also use the module's output in the view's query to create a dependency on the table.
@@ -170,7 +170,7 @@ module "bigquery-dataset" {
   }
 }
 
-# tftest modules=1 resources=3
+# tftest modules=1 resources=3 inventory=views.yaml
 ```
 <!-- BEGIN TFDOC -->
 

modules/billing-budget/README.md

@@ -32,7 +32,7 @@ module "budget" {
     emails     = ["[email protected]"]
   }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=2 inventory=email.yaml
 ```
 
 ### Pubsub notification
@@ -59,7 +59,7 @@ module "pubsub" {
   name       = "budget-topic"
 }
 
-# tftest modules=2 resources=2
+# tftest modules=2 resources=2 inventory=pubsub.yaml
 ```
 <!-- BEGIN TFDOC -->
 

modules/compute-mig/README.md

@@ -46,7 +46,7 @@ module "nginx-mig" {
   target_size       = 2
   instance_template = module.nginx-template.template.self_link
 }
-# tftest modules=2 resources=2
+# tftest modules=2 resources=2 inventory=simple.yaml
 ```
 
 ### Multiple versions
@@ -149,7 +149,7 @@ module "nginx-mig" {
     }
   }
 }
-# tftest modules=2 resources=3
+# tftest modules=2 resources=3 inventory=health-check.yaml
 ```
 
 ### Autoscaling
@@ -202,7 +202,7 @@ module "nginx-mig" {
     }
   }
 }
-# tftest modules=2 resources=3
+# tftest modules=2 resources=3 inventory=autoscaling.yaml
 ```
 
 ### Update policy
@@ -408,7 +408,7 @@ module "nginx-mig" {
     }
   }
 }
-# tftest modules=2 resources=4
+# tftest modules=2 resources=4 inventory=stateful.yaml
 
 ```
 <!-- BEGIN TFDOC -->

modules/gke-hub/README.md

@@ -54,7 +54,7 @@ module "cluster_1" {
     network    = module.vpc.self_link
     subnetwork = module.vpc.subnet_self_links["europe-west1/cluster-1"]
     master_authorized_ranges = {
-      fc1918_10_8 = "10.0.0.0/8"
+      rfc1918_10_8 = "10.0.0.0/8"
     }
     master_ipv4_cidr_block = "192.168.0.0/28"
   }
@@ -119,7 +119,7 @@ module "hub" {
   }
 }
 
-# tftest modules=4 resources=16
+# tftest modules=4 resources=16 inventory=full.yaml
 ```
 
 ## Multi-cluster mesh on GKE

modules/kms/README.md

@@ -56,7 +56,7 @@ module "kms" {
     key-c = { rotation_period = null, labels = { env = "test" } }
   }
 }
-# tftest modules=1 resources=9
+# tftest modules=1 resources=9 inventory=basic.yaml
 ```
 
 ### Crypto key purpose

modules/net-address/README.md

@@ -11,12 +11,12 @@ module "addresses" {
   source     = "./fabric/modules/net-address"
   project_id = var.project_id
   external_addresses = {
-    nat-1      = var.region
-    vpn-remote = var.region
+    one = "europe-west1"
+    two = "europe-west2"
   }
   global_addresses = ["app-1", "app-2"]
 }
-# tftest modules=1 resources=4
+# tftest modules=1 resources=4 inventory=external.yaml
 ```
 
 ### Internal addresses
@@ -38,7 +38,7 @@ module "addresses" {
     }
   }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=2 inventory=internal.yaml
 ```
 
 ### PSA addresses
@@ -55,7 +55,7 @@ module "addresses" {
     }
   }
 }
-# tftest modules=1 resources=1
+# tftest modules=1 resources=1 inventory=psa.yaml
 ```
 
 ### PSC addresses
@@ -75,7 +75,7 @@ module "addresses" {
     }
   }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=2 inventory=psc.yaml
 ```
 <!-- BEGIN TFDOC -->
 

tests/fixtures.py

@@ -143,6 +143,7 @@ def inner(module_path, basedir=None, tf_var_files=None, extra_files=None,
             **tf_vars):
     if basedir is None:
       basedir = Path(request.fspath).parent
+      print(f"{basedir=}")
     return plan_summary(module_path=module_path, basedir=basedir,
                         tf_var_files=tf_var_files, extra_files=extra_files,
                         **tf_vars)