DET-728: cleanup state for match rule overrides

Author: m25n

.github/workflows/test.yml

@@ -75,7 +75,7 @@ jobs:
       matrix:
         # list whatever Terraform versions here you would like to support
         terraform:
-          - '1.7.0'
+          - '1.0.3'
     steps:
       - name: Set up Go
         uses: actions/[email protected]

sumologic/resource_sumologic_cse_match_rule_test.go

@@ -112,11 +112,9 @@ 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"),
 				),
 			},
-			{
-				Config: getMatchRuleRemovedBlock(),
-			},
 		},
 	})
 }
@@ -244,18 +242,6 @@ resource "sumologic_cse_match_rule" "sumo_match_rule_test" {
 `, descriptionExpression)
 }
 
-func getMatchRuleRemovedBlock() string {
-	return fmt.Sprintf(`
-removed {
-  from = sumologic_cse_match_rule.sumo_match_rule_test
-
-  lifecycle {
-	destroy = false
-  }
-}
-`)
-}
-
 func testCheckCSEMatchRuleExists(n string, matchRule *CSEMatchRule) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

sumologic/util_test.go

@@ -1,7 +1,9 @@
 package sumologic
 
 import (
+	"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"
 )
@@ -274,3 +276,9 @@ func TestRemoveEmptyValues(t *testing.T) {
 		t.Fatal("Expected json after removing empty values:", cleanedJsonStr, "but was:", processedJsonStr)
 	}
 }
+
+func removeState(addr ...string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		return s.Remove(addr...)
+	}
+}