Modify gke vcr testacc check to not panic (#3310) (#5992)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Mar 27, 2020 · 44999c4 · 44999c4
1 parent a646d86
commit 44999c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.changelog/3310.txt b/.changelog/3310.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/provider_test.go b/google/provider_test.go
@@ -167,7 +167,7 @@ func closeRecorder(t *testing.T) {
 }
 
 func getTestAccProviders(testName string) map[string]terraform.ResourceProvider {
-	prov := Provider().(*schema.Provider)
+	prov := testAccProvider
 	provRand := random.Provider().(*schema.Provider)
 	envPath := os.Getenv("VCR_PATH")
 	recordingMode := os.Getenv("VCR_MODE")

diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go
@@ -1256,7 +1256,7 @@ func TestAccContainerCluster_withMasterAuthorizedNetworksDisabled(t *testing.T)
 			{
 				Config: testAccContainerCluster_withMasterAuthorizedNetworksDisabled(containerNetName, clusterName),
 				Check: resource.ComposeTestCheckFunc(
-					testAccContainerCluster_masterAuthorizedNetworksDisabled("google_container_cluster.with_private_cluster"),
+					testAccContainerCluster_masterAuthorizedNetworksDisabled(t, "google_container_cluster.with_private_cluster"),
 				),
 			},
 			{
@@ -1291,14 +1291,14 @@ func TestAccContainerCluster_withEnableKubernetesAlpha(t *testing.T) {
 	}, testAccCheckContainerClusterDestroyProducer)
 }
 
-func testAccContainerCluster_masterAuthorizedNetworksDisabled(resource_name string) resource.TestCheckFunc {
+func testAccContainerCluster_masterAuthorizedNetworksDisabled(t *testing.T, resource_name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[resource_name]
 		if !ok {
 			return fmt.Errorf("can't find %s in state", resource_name)
 		}
 
-		config := testAccProvider.Meta().(*Config)
+		config := getTestAccProviders(t.Name())["google"].(*schema.Provider).Meta().(*Config)
 		attributes := rs.Primary.Attributes
 
 		cluster, err := config.clientContainer.Projects.Zones.Clusters.Get(