Substitute template variables in parallel

Author: sbp

atr/construct.py

@@ -18,6 +18,7 @@
 import dataclasses
 import datetime
 import hashlib
+import re
 from collections.abc import Mapping
 from typing import Final, Literal, TypedDict, overload
 
@@ -413,6 +414,8 @@ def _substitute(text: str, values: _VoteSubjectValues, context: Literal["vote_su
 def _substitute(text: str, values: _VoteValues, context: Literal["vote"]) -> str: ...
 def _substitute(text: str, values: Mapping[str, object], context: Context) -> str:
     _ = context  # marks as unused for pyright - we're using the value to pick the right overload
-    for name, value in values.items():
-        text = text.replace(f"{{{{{name}}}}}", str(value))
-    return text
+    if not values:
+        return text
+    names = "|".join(re.escape(name) for name in values)
+    pattern = re.compile(r"\{\{(" + names + r")\}\}")
+    return pattern.sub(lambda match: str(values[match.group(1)]), text)

tests/unit/test_construct_announce.py

@@ -49,6 +49,47 @@ def revision(self, **kwargs: object) -> MockQuery:
         return MockQuery(self._revision)
 
 
+@pytest.mark.asyncio
+async def test_announce_release_subject_and_body_does_not_expand_injected_tag(monkeypatch) -> None:
+    committee = SimpleNamespace(key="myproject", is_podling=False, display_name="Apache MyProject")
+    project = SimpleNamespace(
+        short_display_name="Apache MyProject",
+        name="MyProject",
+        key="myproject",
+        bug_database="bug_database",
+        download_page="download_page",
+        homepage="homepage",
+        lifecycle_page="lifecycle_page",
+        mailing_lists="mailing_lists",
+        repository="repository",
+    )
+    release = SimpleNamespace(key="myproject-1.0.0", committee=committee, project=project)
+    revision = SimpleNamespace(number="1", tag="{{YOUR_FULL_NAME}}")
+
+    monkeypatch.setattr(
+        construct.config,
+        "get",
+        lambda: SimpleNamespace(APP_HOST="downloads.apache.org", SVN_PUBLISH_URL=None),
+    )
+    monkeypatch.setattr(construct.db, "session", _mock_session_factory(MockDBSession(release, revision)))
+
+    _subject, body = await construct.announce_release_subject_and_body(
+        "{{PROJECT_NAME}} {{VERSION}}",
+        "Tag: {{TAG}}\nName: {{YOUR_FULL_NAME}}",
+        construct.AnnounceReleaseOptions(
+            asfuid="example",
+            fullname="Example User",
+            project_key=safe.ProjectKey("myproject"),
+            version_key=safe.VersionKey("1.0.0"),
+            revision_number=safe.RevisionNumber("1"),
+        ),
+    )
+
+    tag_line, name_line = body.split("\n")
+    assert tag_line == "Tag: {{YOUR_FULL_NAME}}"
+    assert name_line == "Name: Example User"
+
+
 @pytest.mark.asyncio
 async def test_announce_release_subject_and_body_uses_podling_downloads_url(monkeypatch) -> None:
     committee = SimpleNamespace(key="myproject", is_podling=True, display_name="Apache MyProject (podling)")
@@ -129,6 +170,16 @@ async def test_announce_release_subject_and_body_uses_top_level_downloads_url(mo
     assert body == "https://downloads.apache.org/downloads/myproject/"
 
 
+def test_substitute_does_not_rescan_replacement_values() -> None:
+    result = construct._substitute(
+        "{{PROJECT_NAME}} {{VERSION}} {{UNKNOWN}}",
+        {"PROJECT_NAME": "{{VERSION}}", "VERSION": "1.0.0"},
+        "announce_subject",
+    )
+
+    assert result == "{{VERSION}} 1.0.0 {{UNKNOWN}}"
+
+
 def _mock_session_factory(data: MockDBSession):
     @contextlib.asynccontextmanager
     async def _session():