qontract-reconcile 0.10.2.dev196__py3-none-any.whl → 0.10.2.dev197__py3-none-any.whl

{qontract_reconcile-0.10.2.dev196.dist-info → qontract_reconcile-0.10.2.dev197.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev196
+Version: 0.10.2.dev197
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev196.dist-info → qontract_reconcile-0.10.2.dev197.dist-info}/RECORD

@@ -166,7 +166,7 @@ reconcile/change_owners/README.md,sha256=NEXVw4SioTWTGo9elSQUjqY10RIUoisl4zkzEBv
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
 reconcile/change_owners/bundle.py,sha256=h30fU-JmLH5a-rCAovpzTeTkkkgZztsZ5A2raee0YuU,5355
-reconcile/change_owners/change_log_tracking.py,sha256=6MXABuPbLQwLeFZE_J2SS9Sx23fAVAtPRWKSBxjQrSo,8850
+reconcile/change_owners/change_log_tracking.py,sha256=lRHdC6-sqzUClmoVNq8v5rygAzeQJRxbKbJNDB3YI8E,9499
 reconcile/change_owners/change_owners.py,sha256=7tESnSX2-psNGPIF63OeK5f-m3iqwanaGjt03FIjWXU,17111
 reconcile/change_owners/change_types.py,sha256=5eSvS2_npUriq9RN4LdAWdYUiNzF91K1pDUEVYDIQ4k,32023
 reconcile/change_owners/changes.py,sha256=YTqwUYutQ6JVSSYmC2Ph5ROCiVix42Vnzy47-i57z4Q,18119
@@ -809,7 +809,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev196.dist-info/METADATA,sha256=uRgPJGf2hvsWk3jhJUQz581Qv8WkL4Q4R70sX5tYxSo,24555
-qontract_reconcile-0.10.2.dev196.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev196.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev196.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev197.dist-info/METADATA,sha256=rege7bsatzPbGGlyw26PU4oHYZuVuqVjfy8pKkGr4Sk,24555
+qontract_reconcile-0.10.2.dev197.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev197.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev197.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -2,6 +2,9 @@ import logging
 from collections import defaultdict
 from collections.abc import Callable
 
+from gitlab.v4.objects import (
+    ProjectCommit,
+)
 from pydantic import BaseModel
 
 from reconcile.change_owners.bundle import (
@@ -23,7 +26,6 @@ from reconcile.typed_queries.jenkins import get_jenkins_configs
 from reconcile.typed_queries.namespaces import get_namespaces
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
-from reconcile.utils.gitlab_api import MRState
 from reconcile.utils.runtime.integration import (
     PydanticRunParams,
     QontractReconcileIntegration,
@@ -32,6 +34,7 @@ from reconcile.utils.state import init_state
 
 QONTRACT_INTEGRATION = "change-log-tracking"
 BUNDLE_DIFFS_OBJ = "bundle-diffs.json"
+DEFAULT_MERGE_COMMIT_PREFIX = "Merge branch '"
 
 
 class ChangeLogItem(BaseModel):
@@ -66,6 +69,25 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
     def name(self) -> str:
         return QONTRACT_INTEGRATION
 
+    @staticmethod
+    def _get_description_from_commit(commit: ProjectCommit) -> str:
+        """
+        Extracts the description from a commit message.
+        Skip the default merge commit template.
+        Merge branch '%{source_branch}' into '%{target_branch}'
+        https://gitlab.cee.redhat.com/help/user/project/merge_requests/commit_templates#default-template-for-merge-commits
+
+        :param commit: ProjectCommit object from GitLab API
+        :return: Extracted description or an empty string if not found
+        """
+        for message in commit.message.splitlines():
+            trimmed_message = message.strip()
+            if trimmed_message and not trimmed_message.startswith(
+                DEFAULT_MERGE_COMMIT_PREFIX
+            ):
+                return trimmed_message
+        return ""
+
     @defer
     def run(
         self,
@@ -118,16 +140,10 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
 
             logging.info(f"Processing commit {commit}")
             gl_commit = gl.project.commits.get(commit)
-            merged_at = max(
-                mr["merged_at"]
-                for mr in gl_commit.merge_requests()
-                if mr["state"] == MRState.MERGED
-                and mr["target_branch"] == gl.project.default_branch
-            )
             change_log_item = ChangeLogItem(
                 commit=commit,
-                merged_at=merged_at,
-                description=gl_commit.message.split("\n")[2],
+                merged_at=gl_commit.committed_date,
+                description=self._get_description_from_commit(gl_commit),
             )
             change_log.items.append(change_log_item)
             obj = diff_state.get(key, None)