simplify regex tests

cloudflare · Sep 20, 2023 · 7232c1a · 7232c1a
1 parent 077c387
commit 7232c1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/internal/sdkv2provider/resource_cloudflare_access_identity_provider.go b/internal/sdkv2provider/resource_cloudflare_access_identity_provider.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"regexp"
 	"strings"
 
 	"github.com/MakeNowJust/heredoc/v2"
@@ -145,8 +144,7 @@ func resourceCloudflareAccessIdentityProviderUpdate(ctx context.Context, d *sche
 	}
 
 	scimSecret := d.Get("scim_config.0.secret").(string)
-	checkRedactedRegex := regexp.MustCompile(`^\*+$`)
-	if accessIdentityProvider.ScimConfig.Secret != "" && !checkRedactedRegex.MatchString(accessIdentityProvider.ScimConfig.Secret) {
+	if accessIdentityProvider.ScimConfig.Secret != "" && !strings.Contains(accessIdentityProvider.ScimConfig.Secret, "*") {
 		scimSecret = accessIdentityProvider.ScimConfig.Secret
 	}
 

diff --git a/internal/sdkv2provider/resource_cloudflare_access_identity_provider_test.go b/internal/sdkv2provider/resource_cloudflare_access_identity_provider_test.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"regexp"
 	"strings"
 	"testing"
 
@@ -285,10 +284,10 @@ func TestAccCloudflareAccessIdentityProvider_SCIM_Config_Secret(t *testing.T) {
 				return errors.New("secret is empty")
 			}
 
-			checkRedactedRegex := regexp.MustCompile(`^\*+$`)
-			if checkRedactedRegex.MatchString(value) {
+			if strings.Contains(value, "*") {
 				return errors.New("secret was redacted")
 			}
+
 			return nil
 		}),
 	)
@@ -324,10 +323,10 @@ func TestAccCloudflareAccessIdentityProvider_SCIM_Secret_Enabled_After_Resource_
 				return errors.New("secret is empty")
 			}
 
-			checkRedactedRegex := regexp.MustCompile(`^\*+$`)
-			if checkRedactedRegex.MatchString(value) {
+			if strings.Contains(value, "*") {
 				return errors.New("secret was redacted")
 			}
+
 			return nil
 		}),
 	)