Create fully recursive e2e test runner

tests/fast/conftest.py

@@ -1,58 +0,0 @@
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"Shared fixtures"
-
-import inspect
-import os
-import types
-
-import pytest
-import tftest
-
-BASEDIR = os.path.dirname(os.path.dirname(__file__))
-
-
-@pytest.fixture(scope='session')
-def fast_e2e_plan_runner(_plan_runner):
-  "Plan runner for end-to-end root module, returns modules and resources."
-
-  def run_plan(fixture_path=None, targets=None, refresh=True,
-               include_bare_resources=False, compute_sums=True, **tf_vars):
-    "Runs Terraform plan on a root module using defaults, returns data."
-    plan = _plan_runner(fixture_path, targets=targets, refresh=refresh,
-                        **tf_vars)
-    root_module = plan.root_module['child_modules'][0]
-
-    # Count all modules and resources up to 2 levels deep. We include
-    # the second level to account for wrapper modules used by stages 3
-    modules = {}
-    for m in root_module['child_modules']:
-      key = m['address'].removeprefix(root_module['address'])[1:]
-      modules[key] = m.get('resources', [])
-      if m.get('child_modules'):
-        for m2 in m['child_modules']:
-          key2 = m2['address'].removeprefix(root_module['address'])[1:]
-          modules[key2] = m2.get('resources', [])
-
-    resources = [r for m in modules.values() for r in m]
-    if include_bare_resources:
-      bare_resources = root_module['resources']
-      resources.extend(bare_resources)
-    if compute_sums:
-      return len(modules), len(resources), {
-          k: len(v) for k, v in modules.items()
-      }
-    return modules, resources
-
-  return run_plan

tests/fast/stages/s00_bootstrap/test_plan.py

@@ -26,8 +26,8 @@
 # }
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
   # TODO: to re-enable per-module resource count check print _, then test
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s01_resman/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s02_networking_nva/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s02_networking_peering/test_plan.py

@@ -27,9 +27,9 @@ STAGE_PEERING = STAGES / '02-networking-peering'
 STAGE_VPN = STAGES / '02-networking-vpn'
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   'Test stage.'
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0
 

tests/fast/stages/s02_networking_vpn/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s02_security/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s03_data_platform/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s03_gke_multitenant/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0

tests/fast/stages/s03_project_factory/test_plan.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-def test_counts(fast_e2e_plan_runner):
+def test_counts(recursive_e2e_plan_runner):
   "Test stage."
-  num_modules, num_resources, _ = fast_e2e_plan_runner()
+  num_modules, num_resources = recursive_e2e_plan_runner()
   # TODO: to re-enable per-module resource count check print _, then test
   assert num_modules > 0 and num_resources > 0