Remove callback field from acceptance test framework (#2649)

Author: shreyas-goenka

internal/acceptance/group_member_test.go

@@ -31,27 +31,29 @@ resource "databricks_group_member" "rs" {
 func TestMwsAccGroupMemberResource(t *testing.T) {
 	accountLevel(t, step{
 		Template: groupMemberTest,
-		Callback: func(ctx context.Context, client *common.DatabricksClient, id string) error {
-			g, err := scim.NewGroupsAPI(ctx, client).Read(id, "members")
-			if err != nil {
-				return err
-			}
-			assert.Len(t, g.Members, 2)
-			return nil
-		},
+		Check: resourceCheck("databricks_group.root",
+			func(ctx context.Context, client *common.DatabricksClient, id string) error {
+				g, err := scim.NewGroupsAPI(ctx, client).Read(id, "members")
+				if err != nil {
+					return err
+				}
+				assert.Len(t, g.Members, 2)
+				return nil
+			}),
 	})
 }
 
 func TestAccGroupMemberResource(t *testing.T) {
 	workspaceLevel(t, step{
 		Template: groupMemberTest,
-		Callback: func(ctx context.Context, client *common.DatabricksClient, id string) error {
-			g, err := scim.NewGroupsAPI(ctx, client).Read(id, "members")
-			if err != nil {
-				return err
-			}
-			assert.Len(t, g.Members, 2)
-			return nil
-		},
+		Check: resourceCheck("databricks_group.root",
+			func(ctx context.Context, client *common.DatabricksClient, id string) error {
+				g, err := scim.NewGroupsAPI(ctx, client).Read(id, "members")
+				if err != nil {
+					return err
+				}
+				assert.Len(t, g.Members, 2)
+				return nil
+			}),
 	})
 }

internal/acceptance/init_test.go

@@ -85,7 +85,6 @@ func unityAccountLevel(t *testing.T, steps ...step) {
 
 type step struct {
 	Template string
-	Callback func(ctx context.Context, client *common.DatabricksClient, id string) error
 	Check    func(*terraform.State) error
 
 	Destroy                   bool
@@ -177,7 +176,6 @@ func run(t *testing.T, steps []step) {
 		Resource *schema.Resource
 	}
 
-	resourceAndName := regexp.MustCompile(`resource\s+"([^"]*)"\s+"([^"]*)"`)
 	resourcesEverCreated := map[testResource]bool{}
 	stepConfig := ""
 	for i, s := range steps {
@@ -186,7 +184,6 @@ func run(t *testing.T, steps []step) {
 		}
 		stepNum := i
 		thisStep := s
-		stepCallback := thisStep.Callback
 		stepCheck := thisStep.Check
 		ts = append(ts, resource.TestStep{
 			PreConfig: func() {
@@ -226,13 +223,6 @@ func run(t *testing.T, steps []step) {
 						return fmt.Errorf("%v", dia)
 					}
 				}
-				if stepCallback != nil {
-					match := resourceAndName.FindStringSubmatch(stepConfig)
-					rootModule := state.RootModule()
-					res := rootModule.Resources[match[1]+"."+match[2]]
-					id := res.Primary.ID
-					return stepCallback(ctx, client, id)
-				}
 				if stepCheck != nil {
 					return stepCheck(state)
 				}