qontract-reconcile 0.10.1rc1071__py3-none-any.whl → 0.10.1rc1072__py3-none-any.whl

{qontract_reconcile-0.10.1rc1071.dist-info → qontract_reconcile-0.10.1rc1072.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1071
+Version: 0.10.1rc1072
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1071.dist-info → qontract_reconcile-0.10.1rc1072.dist-info}/RECORD

@@ -161,7 +161,7 @@ reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256
 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=ZIlXRo6Z2raeWSCUqYsexBdol-q-r9kWJs5O_YPaEYk,5273
-reconcile/change_owners/change_log_tracking.py,sha256=XE-DbH3ktABaeEVdP6EoVsI6s3Nk21l6WKbHd3zMouM,5555
+reconcile/change_owners/change_log_tracking.py,sha256=dmjtD1zJ7tFC355fe82pmqChQdkIJjXAmcsqqwbLWuA,5834
 reconcile/change_owners/change_owners.py,sha256=0HRJhDm0oW3uYJFgzynqA1gA0lbhalhSkmWOiQmr-NM,17062
 reconcile/change_owners/change_types.py,sha256=TjVtvmkU0s8w2NA6qvWQccB6PwlCrChFySlsHLYZjpE,32027
 reconcile/change_owners/changes.py,sha256=pa3cNAL-Xawh700ARJJQjY0p09NA1J2329RcE0F0MHM,17224
@@ -839,7 +839,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=02oYg1l8ADkfGIH1QxkUvBs72Itu_LXM4gMu39GI3E4,130479
+tools/qontract_cli.py,sha256=b-CcgDr-o91gRCxiKka3MrbP9Pb9FjW5VcdyxuPzg3k,130544
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -870,8 +870,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1071.dist-info/METADATA,sha256=lkxennEtXd4pdqXqbrgp94jY5GLsnJV84np3cwcm5zs,2213
-qontract_reconcile-0.10.1rc1071.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1071.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1071.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1071.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1072.dist-info/METADATA,sha256=3DGV1p_ONSF7YyGVdoAzLKcLRzCKpxc2Ta2HufdLsJM,2213
+qontract_reconcile-0.10.1rc1072.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1072.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1072.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1072.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -15,6 +15,7 @@ from reconcile.change_owners.changes import aggregate_file_moves, parse_bundle_c
 from reconcile.typed_queries.apps import get_apps
 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,
@@ -28,7 +29,7 @@ BUNDLE_DIFFS_OBJ = "bundle-diffs.json"
 @dataclass
 class ChangeLogItem:
     commit: str
-    created_at: str
+    merged_at: str
     change_types: list[str] = field(default_factory=list)
     error: bool = False
     apps: list[str] = field(default_factory=list)
@@ -101,9 +102,15 @@ 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,
-                created_at=gl_commit.created_at,
+                merged_at=merged_at,
             )
             change_log.items.append(change_log_item)
             obj = diff_state.get(key, None)
@@ -146,7 +153,7 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                             change_log_item.change_types.append(ctp.name)
 
         change_log.items = sorted(
-            change_log.items, key=lambda i: i.created_at, reverse=True
+            change_log.items, key=lambda i: i.merged_at, reverse=True
         )
         if not dry_run:
             integration_state.add(BUNDLE_DIFFS_OBJ, asdict(change_log), force=True)

tools/qontract_cli.py

@@ -2903,13 +2903,14 @@ def change_log_tracking(ctx):
         ]
         item = {
             "commit": f"[{commit}]({repo_url}/commit/{commit})",
+            "merged_at": change_log_item.merged_at,
             "apps": ", ".join(change_log_item.apps),
             "changes": ", ".join(covered_change_types_descriptions),
             "error": change_log_item.error,
         }
         data.append(item)
 
-    columns = ["commit", "apps", "changes", "error"]
+    columns = ["commit", "merged_at", "apps", "changes", "error"]
     print_output(ctx.obj["options"], data, columns)