Merge branch 'main' into snowplow-tracker

dbt-labs · Sep 21, 2024 · cfb9e5e · cfb9e5e
2 parents c0ef010 + 7e2edee
commit cfb9e5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.changes/unreleased/Fixes-20240709-190235.yaml b/.changes/unreleased/Fixes-20240709-190235.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Do not cast unscrubbed values to a string
+time: 2024-07-09T19:02:35.755277-06:00
+custom:
+  Author: dbeatty10
+  Issue: "165"
diff --git a/dbt_common/__about__.py b/dbt_common/__about__.py
@@ -1 +1 @@
-version = "1.8.0"
+version = "1.9.0"
diff --git a/dbt_common/exceptions/base.py b/dbt_common/exceptions/base.py
@@ -10,13 +10,13 @@ def env_secrets() -> List[str]:
     return [v for k, v in os.environ.items() if k.startswith(SECRET_ENV_PREFIX) and v.strip()]
 
 
-def scrub_secrets(msg: str, secrets: List[str]) -> str:
+def scrub_secrets(msg: Any, secrets: List[str]) -> Any:
     scrubbed = str(msg)
 
     for secret in secrets:
         scrubbed = scrubbed.replace(secret, "*****")
 
-    return scrubbed
+    return msg if str(msg) == scrubbed else scrubbed
 
 
 class DbtBaseException(Exception):
@@ -240,7 +240,7 @@ def process_stack(self) -> List[str]:
         lines = []
 
         if hasattr(self.node, "build_path") and self.node.build_path:
-            lines.append(f"compiled Code at {self.node.build_path}")
+            lines.append(f"compiled code at {self.node.build_path}")
 
         return lines + DbtRuntimeError.process_stack(self)