updated tests to use a func to lookup resources when checking destroy is correct

Author: kevholditch

kong/resource_kong_api_test.go

@@ -62,20 +62,20 @@ func testAccCheckKongApiDestroy(state *terraform.State) error {
 
 	client := testAccProvider.Meta().(*gokong.KongAdminClient)
 
-	for _, rs := range state.RootModule().Resources {
-		if rs.Type != "kong_api" {
-			continue
-		}
+	apis := getResourcesByType("kong_api", state)
 
-		response, err := client.Apis().GetById(rs.Primary.ID)
+	if len(apis) != 1 {
+		return fmt.Errorf("expecting only 1 api resource found %v", len(apis))
+	}
 
-		if err != nil {
-			return fmt.Errorf("error calling get api by id: %v", err)
-		}
+	response, err := client.Apis().GetById(apis[0].Primary.ID)
 
-		if response != nil {
-			return fmt.Errorf("api %s still exists, %+v", rs.Primary.ID, response)
-		}
+	if err != nil {
+		return fmt.Errorf("error calling get api by id: %v", err)
+	}
+
+	if response != nil {
+		return fmt.Errorf("api %s still exists, %+v", apis[0].Primary.ID, response)
 	}
 
 	return nil

kong/resource_kong_certificate_test.go

@@ -38,20 +38,20 @@ func testAccCheckKongCertificateDestroy(state *terraform.State) error {
 
 	client := testAccProvider.Meta().(*gokong.KongAdminClient)
 
-	for _, rs := range state.RootModule().Resources {
-		if rs.Type != "kong_certificate" {
-			continue
-		}
+	certificates := getResourcesByType("kong_certificate", state)
 
-		response, err := client.Certificates().GetById(rs.Primary.ID)
+	if len(certificates) != 1 {
+		return fmt.Errorf("expecting only 1 certificate resource found %v", len(certificates))
+	}
 
-		if err != nil {
-			return fmt.Errorf("error calling get certificate by id: %v", err)
-		}
+	response, err := client.Certificates().GetById(certificates[0].Primary.ID)
 
-		if response != nil {
-			return fmt.Errorf("certificate %s still exists, %+v", rs.Primary.ID, response)
-		}
+	if err != nil {
+		return fmt.Errorf("error calling get certificate by id: %v", err)
+	}
+
+	if response != nil {
+		return fmt.Errorf("certificate %s still exists, %+v", certificates[0].Primary.ID, response)
 	}
 
 	return nil

kong/resource_kong_consumer_test.go

@@ -38,20 +38,20 @@ func testAccCheckKongConsumerDestroy(state *terraform.State) error {
 
 	client := testAccProvider.Meta().(*gokong.KongAdminClient)
 
-	for _, rs := range state.RootModule().Resources {
-		if rs.Type != "kong_consumer" {
-			continue
-		}
+	consumers := getResourcesByType("kong_consumer", state)
 
-		response, err := client.Consumers().GetById(rs.Primary.ID)
+	if len(consumers) != 1 {
+		return fmt.Errorf("expecting only 1 consumer resource found %v", len(consumers))
+	}
 
-		if err != nil {
-			return fmt.Errorf("error calling get consumer by id: %v", err)
-		}
+	response, err := client.Consumers().GetById(consumers[0].Primary.ID)
 
-		if response != nil {
-			return fmt.Errorf("consumer %s still exists, %+v", rs.Primary.ID, response)
-		}
+	if err != nil {
+		return fmt.Errorf("error calling get consumer by id: %v", err)
+	}
+
+	if response != nil {
+		return fmt.Errorf("consumer %s still exists, %+v", consumers[0].Primary.ID, response)
 	}
 
 	return nil

kong/resource_kong_plugin_test.go

@@ -132,20 +132,20 @@ func testAccCheckKongPluginDestroy(state *terraform.State) error {
 
 	client := testAccProvider.Meta().(*gokong.KongAdminClient)
 
-	for _, rs := range state.RootModule().Resources {
-		if rs.Type != "kong_plugin" {
-			continue
-		}
+	plugins := getResourcesByType("kong_plugin", state)
 
-		response, err := client.Plugins().GetById(rs.Primary.ID)
+	if len(plugins) != 1 {
+		return fmt.Errorf("expecting only 1 plugin resource found %v", len(plugins))
+	}
 
-		if err != nil {
-			return fmt.Errorf("error calling get plugin by id: %v", err)
-		}
+	response, err := client.Plugins().GetById(plugins[0].Primary.ID)
 
-		if response != nil {
-			return fmt.Errorf("plugin %s still exists, %+v", rs.Primary.ID, response)
-		}
+	if err != nil {
+		return fmt.Errorf("error calling get plugin by id: %v", err)
+	}
+
+	if response != nil {
+		return fmt.Errorf("plugin %s still exists, %+v", plugins[0].Primary.ID, response)
 	}
 
 	return nil

kong/resource_kong_sni_test.go

@@ -18,13 +18,15 @@ func TestAccKongSni(t *testing.T) {
 				Config: testCreateSniConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckKongSniExists("kong_sni.sni"),
+					//testAccCheckForChildIdCorrect("kong_certificate.certificate1", "kong_sni.sni", "certificate_id"),
 					resource.TestCheckResourceAttr("kong_sni.sni", "name", "www.example.com"),
 				),
 			},
 			{
 				Config: testUpdateSniConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckKongSniExists("kong_sni.sni"),
+					//testAccCheckForChildIdCorrect("kong_certificate.certificate2", "kong_sni.sni", "certificate_id"),
 					resource.TestCheckResourceAttr("kong_sni.sni", "name", "www.example.com"),
 				),
 			},
@@ -36,20 +38,20 @@ func testAccCheckKongSniDestroy(state *terraform.State) error {
 
 	client := testAccProvider.Meta().(*gokong.KongAdminClient)
 
-	for _, rs := range state.RootModule().Resources {
-		if rs.Type != "kong_sni" {
-			continue
-		}
+	snis := getResourcesByType("kong_sni", state)
 
-		response, err := client.Snis().GetByName(rs.Primary.ID)
+	if len(snis) != 1 {
+		return fmt.Errorf("expecting only 1 sni resource found %v", len(snis))
+	}
 
-		if err != nil {
-			return fmt.Errorf("error calling get sni by id: %v", err)
-		}
+	response, err := client.Snis().GetByName(snis[0].Primary.ID)
 
-		if response != nil {
-			return fmt.Errorf("sni %s still exists, %+v", rs.Primary.ID, response)
-		}
+	if err != nil {
+		return fmt.Errorf("error calling get sni by id: %v", err)
+	}
+
+	if response != nil {
+		return fmt.Errorf("sni %s still exists, %+v", snis[0].Primary.ID, response)
 	}
 
 	return nil

kong/testing.go

@@ -0,0 +1,19 @@
+package kong
+
+import (
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func getResourcesByType(resourceType string, state *terraform.State) []*terraform.ResourceState {
+
+	var result []*terraform.ResourceState
+
+	for _, rs := range state.RootModule().Resources {
+		if rs.Type == resourceType {
+			result = append(result, rs)
+		}
+
+	}
+
+	return result
+}