add logging

terraform-google-modules · Jan 22, 2025 · ca300a3 · ca300a3
1 parent 860b855
commit ca300a3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/test/integration/node_pool/node_pool_test.go b/test/integration/node_pool/node_pool_test.go
@@ -60,7 +60,7 @@ func TestNodePool(t *testing.T) {
 		)
 
 		// Cluster (and listed node pools) Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{"pool-01", "pool-02", "pool-03", "pool-04", "pool-05"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{"pool-01", "pool-02", "pool-03", "pool-04", "pool-05"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 
 		// K8s Assertions
 		assert.JSONEq(`[

diff --git a/test/integration/simple_regional_with_gateway_api/simple_regional_with_gateway_api_test.go b/test/integration/simple_regional_with_gateway_api/simple_regional_with_gateway_api_test.go
@@ -60,7 +60,7 @@ func TestSimpleRegionalWithGatewayAPI(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 	})
 	bpt.Test()
 }
diff --git a/test/integration/simple_regional_with_ipv6/simple_regional_with_ipv6_test.go b/test/integration/simple_regional_with_ipv6/simple_regional_with_ipv6_test.go
@@ -60,7 +60,7 @@ func TestSimpleRegionalWithGatewayAPI(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 	})
 	bpt.Test()
 }
diff --git a/test/integration/stub_domains/stub_domains_test.go b/test/integration/stub_domains/stub_domains_test.go
@@ -63,7 +63,7 @@ func TestStubDomains(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 
 		// K8s Assertions
 		// CAI does not include k8s.io/ConfigMap

diff --git a/test/integration/stub_domains_private/stub_domains_private_test.go b/test/integration/stub_domains_private/stub_domains_private_test.go
@@ -63,7 +63,7 @@ func TestStubDomainsPrivate(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 
 		// K8s Assertions
 		// CAI does not include k8s.io/ConfigMap

diff --git a/test/integration/stub_domains_upstream_nameservers/stub_domains_upstream_nameservers_test.go b/test/integration/stub_domains_upstream_nameservers/stub_domains_upstream_nameservers_test.go
@@ -63,7 +63,7 @@ func TestStubDomainsUpstreamNameservers(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 
 		// K8s Assertions
 		// CAI does not include k8s.io/ConfigMap

diff --git a/test/integration/testutils/utils.go b/test/integration/testutils/utils.go
@@ -76,7 +76,7 @@ func TGKEVerifyExemptResources(t *testing.T, b *tft.TFBlueprintTest, assert *ass
 }
 
 // TGKEAssertGolden asserts a cluster and listed node pools against paths in golden image
-func TGKEAssertGolden(assert *assert.Assertions, golden *golden.GoldenFile, clusterJson *gjson.Result, nodePools []string, exemptClusterPaths []string) {
+func TGKEAssertGolden(t *testing.T, assert *assert.Assertions, golden *golden.GoldenFile, clusterJson *gjson.Result, nodePools []string, exemptClusterPaths []string) {
 	// Retrieve golden paths
 	clusterCheckPaths := utils.GetTerminalJSONPaths(golden.GetJSON())
 
@@ -92,22 +92,26 @@ func TGKEAssertGolden(assert *assert.Assertions, golden *golden.GoldenFile, clus
 	})
 
 	// Cluster assertions
+	t.Logf("Found %d cluster paths to check", len(clusterCheckPaths))
 	golden.JSONPathEqs(assert, *clusterJson, clusterCheckPaths)
 
 	// NodePool assertions
 	for _, nodePool := range nodePools {
 		assert.Truef(clusterJson.Get(fmt.Sprintf("nodePools.#(name==%s).name", nodePool)).Exists(), "NodePool not found: %s", nodePool)
 
 		nodeCheckPaths := utils.GetTerminalJSONPaths(golden.GetJSON().Get(fmt.Sprintf("nodePools.#(name==%s)", nodePool)))
+		t.Logf("Found %d node %q paths to check", nodePool)
 
 		syncGroup := new(errgroup.Group)
 		syncGroup.SetLimit(24)
-		for _, nodeCheckPath := range nodeCheckPaths {
-			nodeCheckPath := nodeCheckPath
+		for i, nodeCheckPath := range nodeCheckPaths {
+			i, nodeCheckPath := i, nodeCheckPath // https://golang.org/doc/faq#closures_and_goroutines
+			nodePool := nodePool
 			syncGroup.Go(func() error {
+				t.Logf("Checking path %d: %s", i, nodeCheckPath)
 				gotData := golden.ApplySanitizers(clusterJson.Get(fmt.Sprintf("nodePools.#(name==%s)", nodePool)).Get(nodeCheckPath).String())
 				gfData := golden.GetJSON().Get(fmt.Sprintf("nodePools.#(name==%s)", nodePool)).Get(nodeCheckPath).String()
-				assert.Equalf(gfData, gotData, "For node %s path %q expected %q to match fixture %q", nodePool, nodeCheckPath, gotData, gfData)
+				assert.Equalf(gfData, gotData, "For node %q path %q expected %q to match fixture %q", nodePool, nodeCheckPath, gotData, gfData)
 				return nil
 			})
 		}

diff --git a/test/integration/upstream_nameservers/upstream_nameservers_test.go b/test/integration/upstream_nameservers/upstream_nameservers_test.go
@@ -63,7 +63,7 @@ func TestUpstreamNameservers(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 
 		// K8s Assertions
 		// CAI does not include k8s.io/ConfigMap

diff --git a/test/integration/workload_metadata_config/workload_metadata_config_test.go b/test/integration/workload_metadata_config/workload_metadata_config_test.go
@@ -61,7 +61,7 @@ func TestWorkloadMetadataConfig(t *testing.T) {
 		)
 
 		// Cluster Assertions
-		testutils.TGKEAssertGolden(assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
+		testutils.TGKEAssertGolden(t, assert, g, &cluster, []string{"default-pool"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
 
 		// IAM Assertions
 		// CAI IAM data can be stale