From 0d55de6ca9d83e328c10d6efad40d16e9e05b1fb Mon Sep 17 00:00:00 2001 From: Ludo Date: Sun, 6 Nov 2022 08:44:13 +0100 Subject: [PATCH] switch to tfvars based tests --- .../net_vpc/fixture/test.subnets.tfvars | 44 +++++++++++++++++++ tests/modules/net_vpc/test_plan_subnets.py | 29 +----------- 2 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 tests/modules/net_vpc/fixture/test.subnets.tfvars diff --git a/tests/modules/net_vpc/fixture/test.subnets.tfvars b/tests/modules/net_vpc/fixture/test.subnets.tfvars new file mode 100644 index 00000000..499e498f --- /dev/null +++ b/tests/modules/net_vpc/fixture/test.subnets.tfvars @@ -0,0 +1,44 @@ +subnet_iam = { + "europe-west1/a" = { + "roles/compute.networkUser" = [ + "user:a@example.com", "group:g-a@example.com" + ] + } + "europe-west1/c" = { + "roles/compute.networkUser" = [ + "user:c@example.com", "group:g-c@example.com" + ] + } +} +subnets = [ + { + name = "a" + region = "europe-west1" + ip_cidr_range = "10.0.0.0/24" + }, + { + name = "b" + region = "europe-west1" + ip_cidr_range = "10.0.1.0/24", + description = "Subnet b" + enable_private_access = false + }, + { + name = "c" + region = "europe-west1" + ip_cidr_range = "10.0.2.0/24" + secondary_ip_ranges = { + a = "192.168.0.0/24" + b = "192.168.1.0/24" + } + }, + { + name = "d" + region = "europe-west1" + ip_cidr_range = "10.0.3.0/24" + flow_logs_config = { + flow_sampling = 0.5 + aggregation_interval = "INTERVAL_10_MIN" + } + } +] diff --git a/tests/modules/net_vpc/test_plan_subnets.py b/tests/modules/net_vpc/test_plan_subnets.py index 266d46de..affea44c 100644 --- a/tests/modules/net_vpc/test_plan_subnets.py +++ b/tests/modules/net_vpc/test_plan_subnets.py @@ -13,33 +13,6 @@ # limitations under the License. DATA_FOLDER = "data" -SUBNET_IAM = '''{ - "europe-west1/a" = { - "roles/compute.networkUser" = ["user:a@example.com", "group:g-a@example.com"] - } - "europe-west1/c" = { - "roles/compute.networkUser" = ["user:c@example.com", "group:g-c@example.com"] - } -}''' -SUBNETS = '''[ - { - name = "a", region = "europe-west1", ip_cidr_range = "10.0.0.0/24" - }, - { - name = "b", region = "europe-west1", ip_cidr_range = "10.0.1.0/24", - description="Subnet b", enable_private_access=false - }, - { - name = "c", region = "europe-west1", ip_cidr_range = "10.0.2.0/24", - secondary_ip_ranges={a="192.168.0.0/24", b="192.168.1.0/24"} - }, - { - name = "d", region = "europe-west1", ip_cidr_range = "10.0.3.0/24", - flow_logs_config = { - flow_sampling = 0.5, aggregation_interval = "INTERVAL_10_MIN" - } - }, -]''' def test_subnet_factory(plan_runner): @@ -56,7 +29,7 @@ def test_subnet_factory(plan_runner): def test_subnets(plan_runner): "Test subnets variable." - _, resources = plan_runner(subnet_iam=SUBNET_IAM, subnets=SUBNETS) + _, resources = plan_runner(tf_var_file='test.subnets.tfvars') assert len(resources) == 7 subnets = [ r['values'] for r in resources if r['type'] == 'google_compute_subnetwork'