Skip to content

Commit ff56a20

Browse files
authored
chore: modify pr description (#2568)
In this PR: - Wrap commit message with `BEGIN_COMMIT_OVERRIDE` and `BEGIN_COMMIT_OVERRIDE`. Context: we found out that the commit messages in googleapis/google-cloud-java#10529 didn't appear in the release notes. @chingor13 pointed out that we should wrap commit messages with `BEGIN_COMMIT_OVERRIDE` and `BEGIN_COMMIT_OVERRIDE` so that release-please can pick them up from a merged PR.
1 parent b2c3f6a commit ff56a20

File tree

5 files changed

+38
-3
lines changed

5 files changed

+38
-3
lines changed

library_generation/generate_pr_description.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from library_generation.utils.commit_message_formatter import format_commit_message
2424
from library_generation.utilities import get_file_paths
2525
from library_generation.utils.commit_message_formatter import wrap_nested_commit
26+
from library_generation.utils.commit_message_formatter import wrap_override_commit
2627

2728

2829
@click.group(invoke_without_command=False)
@@ -175,7 +176,11 @@ def __combine_commit_messages(
175176
f"[googleapis/googleapis@{short_sha}](https://github.com/googleapis/googleapis/commit/{commit.hexsha})"
176177
)
177178

178-
messages.extend(format_commit_message(commits=commits, is_monorepo=is_monorepo))
179+
messages.extend(
180+
wrap_override_commit(
181+
format_commit_message(commits=commits, is_monorepo=is_monorepo)
182+
)
183+
)
179184

180185
return "\n".join(messages)
181186

library_generation/test/resources/integration/google-cloud-java/pr-description-golden.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Qualified commits are:
66
[googleapis/googleapis@0733fdb](https://github.com/googleapis/googleapis/commit/0733fdb5f745192f9f3c95f8d08039286567cbcc)
77
[googleapis/googleapis@9e35c62](https://github.com/googleapis/googleapis/commit/9e35c620157d7b11cb5b2e5d0249c5caaee824f3)
88
[googleapis/googleapis@36dedd0](https://github.com/googleapis/googleapis/commit/36dedd0d9020c19d1c8259003c2fe9656ada7471)
9+
BEGIN_COMMIT_OVERRIDE
910
BEGIN_NESTED_COMMIT
1011
docs: [cloudcontrolspartner] update documentation URL
1112

@@ -49,4 +50,5 @@ feat: [cloudcontrolspartner] added CloudControlsPartner API
4950

5051
PiperOrigin-RevId: 606720708
5152

52-
END_NESTED_COMMIT
53+
END_NESTED_COMMIT
54+
END_COMMIT_OVERRIDE

library_generation/test/resources/integration/java-bigtable/pr-description-golden.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ This pull request is generated with proto changes between googleapis commit 6790
22
Qualified commits are:
33
[googleapis/googleapis@fbcfef0](https://github.com/googleapis/googleapis/commit/fbcfef09510b842774530989889ed1584a8b5acb)
44
[googleapis/googleapis@63d2a60](https://github.com/googleapis/googleapis/commit/63d2a60056ad5b156c05c7fb13138fc886c3b739)
5+
BEGIN_COMMIT_OVERRIDE
56
BEGIN_NESTED_COMMIT
67
fix: extend timeouts for deleting snapshots, backups and tables
78

@@ -13,4 +14,5 @@ chore: update retry settings for backup rpcs
1314

1415
PiperOrigin-RevId: 605367937
1516

16-
END_NESTED_COMMIT
17+
END_NESTED_COMMIT
18+
END_COMMIT_OVERRIDE

library_generation/test/utils/commit_message_formatter_unit_tests.py

+13
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
from library_generation.utils.commit_message_formatter import format_commit_message
1818
from library_generation.utils.commit_message_formatter import wrap_nested_commit
19+
from library_generation.utils.commit_message_formatter import wrap_override_commit
1920

2021

2122
class CommitMessageFormatterTest(unittest.TestCase):
@@ -114,3 +115,15 @@ def test_wrap_nested_commit_success(self):
114115
],
115116
wrap_nested_commit(messages),
116117
)
118+
119+
def test_wrap_override_commit_success(self):
120+
messages = ["a commit message", "another message"]
121+
self.assertEqual(
122+
[
123+
"BEGIN_COMMIT_OVERRIDE",
124+
"a commit message",
125+
"another message",
126+
"END_COMMIT_OVERRIDE",
127+
],
128+
wrap_override_commit(messages),
129+
)

library_generation/utils/commit_message_formatter.py

+13
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,16 @@ def wrap_nested_commit(messages: List[str]) -> List[str]:
6262
result.extend(messages)
6363
result.append("END_NESTED_COMMIT")
6464
return result
65+
66+
67+
def wrap_override_commit(messages: List[str]) -> List[str]:
68+
"""
69+
Wrap message between `BEGIN_COMMIT_OVERRIDE` and `END_COMMIT_OVERRIDE`.
70+
71+
:param messages: a (multi-line) commit message, one line per item.
72+
:return: wrapped messages.
73+
"""
74+
result = ["BEGIN_COMMIT_OVERRIDE"]
75+
result.extend(messages)
76+
result.append("END_COMMIT_OVERRIDE")
77+
return result

0 commit comments

Comments
 (0)