SERVER-92729 Ignore whitespace for commit message validation comparisons (#25191)

GitOrigin-RevId: 4b0e45d

Author: smcclure15

buildscripts/tests/test_validate_commit_message.py

@@ -59,6 +59,11 @@ def test_invalid(self):
                 binsha=b"deadbeefdeadbeefdead",
                 message="SERVER-123 asdf\nAnything in this description will be included in the commit message. Replace or delete this text before merging. Add links to testing in the comments of the PR.",
             ),  # Contains some banned strings
+            Commit(
+                repo=fake_repo,
+                binsha=b"deadbeefdeadbeefdead",
+                message="SERVER-123 asdf\nAnything\n\n in this description will be included in the commit message.\nReplace or delete this text before merging. Add links to testing in the\ncomments of the PR.",
+            ),  # Contains some banned strings with extra newlines
         ]
 
         self.assertTrue(all(is_valid_commit(message) == False for message in messages))

buildscripts/validate_commit_message.py

@@ -70,10 +70,13 @@ def is_valid_commit(commit: Commit) -> bool:
         )
         return False
 
+    # Remove all whitespace from comparisons. GitHub line-wraps commit messages, which adds
+    # newline characters that otherwise would not match verbatim such banned strings.
+    stripped_message = "".join(commit.message.split())
     for banned_string in BANNED_STRINGS:
-        if banned_string in commit.message:
+        if "".join(banned_string.split()) in stripped_message:
             LOGGER.error(
-                "Commit contains banned string",
+                "Commit contains banned string (ignoring whitespace)",
                 banned_string=banned_string,
                 commit_hexsha=commit.hexsha,
                 commit_message=commit.message,