envoy.base.utils(0.5.8): Fix project commit escape (#2536)

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · Jan 13, 2025 · 47e9244 · 47e9244
1 parent d074c60
commit 47e9244
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/envoy.base.utils/VERSION b/envoy.base.utils/VERSION
@@ -1 +1 @@
-0.5.8-dev
+0.5.8
diff --git a/envoy.base.utils/envoy/base/utils/abstract/project/project.py b/envoy.base.utils/envoy/base/utils/abstract/project/project.py
@@ -350,6 +350,7 @@ async def _git_commit(
             else [])
         await self._exec(
             " ".join(("git", "add", *changed)))
+        msg = msg.replace("'", r"\'")
         await self._exec(
             " ".join((
                 "git", "commit", *author_args, *changed,

diff --git a/envoy.base.utils/tests/test_abstract_project.py b/envoy.base.utils/tests/test_abstract_project.py
@@ -1072,8 +1072,13 @@ async def test_abstract_project__git_commit(iters, patches):
         m_exec.call_args_list
         == [[(" ".join(["git", "add", *changed]), ),
              {}],
-            [(" ".join(["git", "commit", *changed, "-m", f"'{msg}'"]), ),
+            [(" ".join([
+                "git", "commit", *changed,
+                "-m", f"'{msg.replace.return_value}'"]), ),
              {}]])
+    assert (
+        msg.replace.call_args
+        == [("'", r"\'"), {}])
 
 
 @pytest.mark.parametrize("returns", [None, 0, 23, "cabbage"])