Make tests work for both count and for_each

Azure · Dec 27, 2022 · f5ffaf2 · f5ffaf2
1 parent b2876f7
commit f5ffaf2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/test/e2e/terraform_test.go b/test/e2e/terraform_test.go
@@ -1,6 +1,7 @@
 package e2e
 
 import (
+	"fmt"
 	"regexp"
 	"testing"
 
@@ -19,15 +20,22 @@ func TestExamples(t *testing.T) {
 		"examples/private_link_service",
 	}
 	for _, example := range examples {
-		t.Run(example, func(t *testing.T) {
-			testExample(t, example)
+		t.Run(fmt.Sprintf("%s_for_each", example), func(t *testing.T) {
+			testExample(t, example, true)
+		})
+		t.Run(fmt.Sprintf("%s_count", example), func(t *testing.T) {
+			testExample(t, example, false)
 		})
 	}
 }
 
-func testExample(t *testing.T, exampleRelativePath string) {
+func testExample(t *testing.T, exampleRelativePath string, useForEach bool) {
+	vars := map[string]interface{}{
+		"use_for_each": useForEach,
+	}
 	test_helper.RunE2ETest(t, "../../", exampleRelativePath, terraform.Options{
 		Upgrade: true,
+		Vars:    vars,
 	}, func(t *testing.T, output test_helper.TerraformOutput) {
 		vnetId, ok := output["test_vnet_id"].(string)
 		assert.True(t, ok)

diff --git a/test/upgrade/upgrade_test.go b/test/upgrade/upgrade_test.go
@@ -1,6 +1,7 @@
 package upgrade
 
 import (
+	"fmt"
 	"testing"
 
 	test_helper "github.com/Azure/terraform-module-test-helper"
@@ -17,13 +18,16 @@ func TestExamples(t *testing.T) {
 		"examples/private_link_service",
 	}
 	for _, example := range examples {
-		t.Run(example, func(t *testing.T) {
-			testExample(t, example)
+		t.Run(fmt.Sprintf("%s_for_each", example), func(t *testing.T) {
+			testExample(t, example, true)
+		})
+		t.Run(fmt.Sprintf("%s_count", example), func(t *testing.T) {
+			testExample(t, example, false)
 		})
 	}
 }
 
-func testExample(t *testing.T, exampleRelativePath string) {
+func testExample(t *testing.T, exampleRelativePath string, useForEach bool) {
 	currentRoot, err := test_helper.GetCurrentModuleRootPath()
 	if err != nil {
 		t.FailNow()
@@ -32,7 +36,11 @@ func testExample(t *testing.T, exampleRelativePath string) {
 	if err != nil {
 		t.FailNow()
 	}
+	vars := map[string]interface{}{
+		"use_for_each": useForEach,
+	}
 	test_helper.ModuleUpgradeTest(t, "Azure", "terraform-azurerm-vnet", exampleRelativePath, currentRoot, terraform.Options{
 		Upgrade: true,
+		Vars:    vars,
 	}, currentMajorVersion)
 }