refactor checks

mongodb · Mar 26, 2024 · a9fba9f · a9fba9f
1 parent 4de6c61
commit a9fba9f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 45 deletions.
diff --git a/internal/service/auditing/resource_auditing_migration_test.go b/internal/service/auditing/resource_auditing_migration_test.go
@@ -10,10 +10,8 @@ import (
 func TestMigGenericAuditing_basic(t *testing.T) {
 	var (
 		projectID   = mig.ProjectIDGlobal(t)
-		auditAuth   = true
 		auditFilter = "{ 'atype': 'authenticate', 'param': {   'user': 'auditAdmin',   'db': 'admin',   'mechanism': 'SCRAM-SHA-1' }}"
-		enabled     = true
-		config      = configBasic(projectID, auditFilter, auditAuth, enabled)
+		config      = configBasic(projectID, auditFilter, true, true)
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -23,17 +21,7 @@ func TestMigGenericAuditing_basic(t *testing.T) {
 			{
 				Config:            config,
 				ExternalProviders: mig.ExternalProviders(),
-				Check: resource.ComposeTestCheckFunc(
-					checkExists(resourceName),
-					resource.TestCheckResourceAttrSet(resourceName, "project_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "audit_filter"),
-					resource.TestCheckResourceAttrSet(resourceName, "audit_authorization_success"),
-					resource.TestCheckResourceAttrSet(resourceName, "enabled"),
-					resource.TestCheckResourceAttr(resourceName, "audit_filter", auditFilter),
-					resource.TestCheckResourceAttr(resourceName, "audit_authorization_success", "true"),
-					resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "configuration_type", "FILTER_JSON"),
-				),
+				Check:             resource.ComposeTestCheckFunc(checks(auditFilter, true, true)...),
 			},
 			mig.TestStepCheckEmptyPlan(config),
 		},

diff --git a/internal/service/auditing/resource_auditing_test.go b/internal/service/auditing/resource_auditing_test.go
@@ -3,6 +3,7 @@ package auditing_test
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -18,9 +19,7 @@ const (
 func TestAccGenericAuditing_basic(t *testing.T) {
 	var (
 		projectID   = acc.ProjectIDExecution(t)
-		auditAuth   = true
 		auditFilter = "{ 'atype': 'authenticate', 'param': {   'user': 'auditAdmin',   'db': 'admin',   'mechanism': 'SCRAM-SHA-1' }}"
-		enabled     = true
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -29,38 +28,12 @@ func TestAccGenericAuditing_basic(t *testing.T) {
 		CheckDestroy:             checkDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: configBasic(projectID, auditFilter, auditAuth, enabled),
-				Check: resource.ComposeTestCheckFunc(
-					checkExists(resourceName),
-					resource.TestCheckResourceAttrSet(resourceName, "project_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "audit_filter"),
-					resource.TestCheckResourceAttrSet(resourceName, "audit_authorization_success"),
-					resource.TestCheckResourceAttrSet(resourceName, "enabled"),
-					resource.TestCheckResourceAttr(resourceName, "audit_filter", auditFilter),
-					resource.TestCheckResourceAttr(resourceName, "audit_authorization_success", "true"),
-					resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "configuration_type", "FILTER_JSON"),
-
-					resource.TestCheckResourceAttrSet(dataSourceName, "project_id"),
-					resource.TestCheckResourceAttr(dataSourceName, "audit_filter", auditFilter),
-					resource.TestCheckResourceAttr(dataSourceName, "audit_authorization_success", "true"),
-					resource.TestCheckResourceAttr(dataSourceName, "enabled", "true"),
-					resource.TestCheckResourceAttr(dataSourceName, "configuration_type", "FILTER_JSON"),
-				),
+				Config: configBasic(projectID, auditFilter, true, true),
+				Check:  resource.ComposeTestCheckFunc(checks(auditFilter, true, true)...),
 			},
 			{
 				Config: configBasic(projectID, "{}", false, false),
-				Check: resource.ComposeTestCheckFunc(
-					checkExists(resourceName),
-					resource.TestCheckResourceAttrSet(resourceName, "project_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "audit_filter"),
-					resource.TestCheckResourceAttrSet(resourceName, "audit_authorization_success"),
-					resource.TestCheckResourceAttrSet(resourceName, "enabled"),
-					resource.TestCheckResourceAttr(resourceName, "audit_filter", "{}"),
-					resource.TestCheckResourceAttr(resourceName, "audit_authorization_success", "false"),
-					resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
-					resource.TestCheckResourceAttr(resourceName, "configuration_type", "FILTER_JSON"),
-				),
+				Check:  resource.ComposeTestCheckFunc(checks("{}", false, false)...),
 			},
 			{
 				ResourceName:            resourceName,
@@ -128,3 +101,16 @@ func configBasic(projectID, auditFilter string, auditAuth, enabled bool) string
 		}		
 	`, projectID, auditFilter, auditAuth, enabled)
 }
+
+func checks(auditFilter string, auditAuth, enabled bool) []resource.TestCheckFunc {
+	commonChecks := map[string]string{
+		"audit_filter":                auditFilter,
+		"audit_authorization_success": strconv.FormatBool(auditAuth),
+		"enabled":                     strconv.FormatBool(auditAuth),
+		"configuration_type":          "FILTER_JSON",
+	}
+	checks := acc.AddAttrChecks(resourceName, nil, commonChecks)
+	checks = acc.AddAttrChecks(dataSourceName, checks, commonChecks)
+	checks = append(checks, checkExists(resourceName), checkExists(dataSourceName))
+	return checks
+}