helper/logging: Adjust unit test regex flag (#1224)

* add flag * add timeout to lint
hashicorp · Jul 13, 2023 · 60e8641 · 60e8641
1 parent aa0b6ac
commit 60e8641
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,3 +25,7 @@ linters:
     - unparam
     - unused
     - vet
+
+run:
+  # Prevent false positive timeouts in CI
+  timeout: 5m
diff --git a/helper/logging/logging_http_transport_test.go b/helper/logging/logging_http_transport_test.go
@@ -201,7 +201,7 @@ func TestNewSubsystemLoggingHTTPTransport(t *testing.T) {
 func TestNewLoggingHTTPTransport_LogMasking(t *testing.T) {
 	ctx, loggerOutput := setupRootLogger()
 	ctx = tflog.MaskFieldValuesWithFieldKeys(ctx, "tf_http_op_type")
-	ctx = tflog.MaskAllFieldValuesRegexes(ctx, regexp.MustCompile(`<html>.*</html>`))
+	ctx = tflog.MaskAllFieldValuesRegexes(ctx, regexp.MustCompile(`(?s)<html>.*</html>`))
 	ctx = tflog.MaskMessageStrings(ctx, "Request", "Response")
 
 	transport := logging.NewLoggingHTTPTransport(http.DefaultTransport)
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,7 @@ linters: @@
         - unparam
         - unused
         - vet
+    run:
+      # Prevent false positive timeouts in CI
+      timeout: 5m