DET-728: Added removeState function in util_test

Author: antonymartinsumo

sumologic/resource_sumologic_cse_aggregation_rule_test.go

@@ -93,11 +93,9 @@ func TestAccSumologicCSEAggregationRule_Override(t *testing.T) {
 					testCheckAggregationRuleOverrideValues(&aggregationRule, descriptionExpression),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "id", "AGGREGATION-S00009"),
+					removeState("sumologic_cse_aggregation_rule.sumo_aggregation_rule_test"),
 				),
 			},
-			{
-				Config: getAggregationRuleRemovedBlock(),
-			},
 		},
 	})
 }
@@ -261,18 +259,6 @@ resource "sumologic_cse_aggregation_rule" "sumo_aggregation_rule_test" {
 `, descriptionExpression)
 }
 
-func getAggregationRuleRemovedBlock() string {
-	return fmt.Sprintf(`
-removed {
-  from = sumologic_cse_aggregation_rule.sumo_aggregation_rule_test
-
-  lifecycle {
-	destroy = false
-  }
-}
-`)
-}
-
 func testCreateCSEAggregationRuleConfig(t *testing.T, payload *CSEAggregationRule) string {
 	resourceTemplate := `
 		resource "sumologic_cse_aggregation_rule" "aggregation_rule" {

sumologic/resource_sumologic_cse_chain_rule_test.go

@@ -93,11 +93,9 @@ func TestAccSumologicCSEChainRule_Override(t *testing.T) {
 					testCheckChainRuleOverrideValues(&ChainRule, descriptionExpression),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "id", "CHAIN-S00016"),
+					removeState("sumologic_cse_chain_rule.sumo_chain_rule_test"),
 				),
 			},
-			{
-				Config: getChainRuleRemovedBlock(),
-			},
 		},
 	})
 }
@@ -313,18 +311,6 @@ resource "sumologic_cse_chain_rule" "sumo_chain_rule_test" {
 `, descriptionExpression)
 }
 
-func getChainRuleRemovedBlock() string {
-	return fmt.Sprintf(`
-removed {
-  from = sumologic_cse_chain_rule.sumo_chain_rule_test
-
-  lifecycle {
-	destroy = false
-  }
-}
-`)
-}
-
 func getCSEChainRuleTestPayload() CSEChainRule {
 	return CSEChainRule{
 		Description:            "Test description",

sumologic/resource_sumologic_cse_first_seen_rule_test.go

@@ -108,11 +108,9 @@ func TestAccSumologicCSEFirstSeenRule_Override(t *testing.T) {
 					testCheckFirstSeenRuleOverrideValues(&FirstSeenRule, fmt.Sprintf(descriptionExpression)),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "id", "FIRST-S00009"),
+					removeState("sumologic_cse_first_seen_rule.sumo_first_seen_rule_test"),
 				),
 			},
-			{
-				Config: getFirstSeenRuleRemovedBlock(),
-			},
 		},
 	})
 }
@@ -212,18 +210,6 @@ resource "sumologic_cse_first_seen_rule" "sumo_first_seen_rule_test" {
 `, descriptionExpression)
 }
 
-func getFirstSeenRuleRemovedBlock() string {
-	return fmt.Sprintf(`
-removed {
-  from = sumologic_cse_first_seen_rule.sumo_first_seen_rule_test
-
-  lifecycle {
-	destroy = false
-  }
-}
-`)
-}
-
 func testCheckCSEFirstSeenRuleExists(n string, firstSeenRule *CSEFirstSeenRule) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

sumologic/resource_sumologic_cse_match_rule_test.go

@@ -112,7 +112,7 @@ func TestAccSumologicCSEMatchRule_Override(t *testing.T) {
 					testCheckMatchRuleOverrideValues(&matchRule, descriptionExpression),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "id", "MATCH-S01020"),
-					removeState("sumologic_cse_match_rule", "sumo_match_rule_test"),
+					removeState("sumologic_cse_match_rule.sumo_match_rule_test"),
 				),
 			},
 		},

sumologic/resource_sumologic_cse_outlier_rule_test.go

@@ -112,11 +112,9 @@ func TestAccSumologicCSEOutlierRule_Override(t *testing.T) {
 					testCheckOutlierRuleOverrideValues(&OutlierRule, descriptionExpression),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "id", "OUTLIER-S00007"),
+					removeState("sumologic_cse_outlier_rule.sumo_outlier_rule_test"),
 				),
 			},
-			{
-				Config: getOutlierRuleRemovedBlock(),
-			},
 		},
 	})
 }
@@ -242,18 +240,6 @@ resource "sumologic_cse_outlier_rule" "sumo_outlier_rule_test" {
 `, descriptionExpression)
 }
 
-func getOutlierRuleRemovedBlock() string {
-	return fmt.Sprintf(`
-removed {
-  from = sumologic_cse_outlier_rule.sumo_outlier_rule_test
-
-  lifecycle {
-	destroy = false
-  }
-}
-`)
-}
-
 func testCheckCSEOutlierRuleExists(n string, outlierRule *CSEOutlierRule) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

sumologic/resource_sumologic_cse_threshold_rule_test.go

@@ -94,11 +94,9 @@ func TestAccSumologicCSEThresholdRule_Override(t *testing.T) {
 					testCheckThresholdRuleOverrideValues(&thresholdRule, descriptionExpression),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "id", "THRESHOLD-S00059"),
+					removeState("sumologic_cse_threshold_rule.sumo_threshold_rule_test"),
 				),
 			},
-			{
-				Config: getThresholdRuleRemovedBlock(),
-			},
 		},
 	})
 }
@@ -311,18 +309,6 @@ resource "sumologic_cse_threshold_rule" "sumo_threshold_rule_test" {
 `, descriptionExpression)
 }
 
-func getThresholdRuleRemovedBlock() string {
-	return fmt.Sprintf(`
-removed {
-  from = sumologic_cse_threshold_rule.sumo_threshold_rule_test
-
-  lifecycle {
-	destroy = false
-  }
-}
-`)
-}
-
 func getCSEThresholdRuleTestPayload() CSEThresholdRule {
 	return CSEThresholdRule{
 		CountDistinct:          true,

sumologic/util_test.go

@@ -1,11 +1,13 @@
 package sumologic
 
 import (
+	"log"
+	"reflect"
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
-	"reflect"
-	"testing"
 )
 
 // Based on https://github.com/hashicorp/terraform-provider-aws/blob/232c3ed9c9d18aab6f6b70672d7c46d44c75a52e/internal/verify/diff_test.go#L62.
@@ -277,8 +279,12 @@ func TestRemoveEmptyValues(t *testing.T) {
 	}
 }
 
-func removeState(addr ...string) resource.TestCheckFunc {
+func removeState(addr string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		return s.Remove(addr...)
+		err := s.Remove(addr)
+		if err != nil {
+			log.Printf("Error removing multiple items: %v", err)
+		}
+		return nil
 	}
 }