qontract-reconcile 0.10.1rc1066__py3-none-any.whl → 0.10.1rc1068__py3-none-any.whl

{qontract_reconcile-0.10.1rc1066.dist-info → qontract_reconcile-0.10.1rc1068.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1066
+Version: 0.10.1rc1068
 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.1rc1066.dist-info → qontract_reconcile-0.10.1rc1068.dist-info}/RECORD

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=PHoUlP86m-TdTpB3hyoHbOEDWR0_ZO-GSBQEGTmbTmc,107514
+reconcile/cli.py,sha256=ipCFQNRFmaoo_DoeAvMY3bTYfaovOgWhRvL6TYuk1G8,107605
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -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=zFpean5UB3-u5VQLJHzik8GmhBwYoNorR-l90-D1Pis,4160
+reconcile/change_owners/change_log_tracking.py,sha256=XE-DbH3ktABaeEVdP6EoVsI6s3Nk21l6WKbHd3zMouM,5555
 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
@@ -251,6 +251,7 @@ reconcile/gql_definitions/common/app_interface_repo_settings.py,sha256=rud0rz9NI
 reconcile/gql_definitions/common/app_interface_state_settings.py,sha256=VXIK0Hmyv6GTShI86IGkjxyHGwufqUBAh617XKUAKaI,2507
 reconcile/gql_definitions/common/app_interface_vault_settings.py,sha256=w8quvdG0cSq71ZyJokPPp7MyMpoDb6-HLQ3o9JHVGRQ,1771
 reconcile/gql_definitions/common/app_quay_repos_escalation_policies.py,sha256=ckdoGse7O5uAWdZdNinkWicA2EflUb5pe8jWEBtflE8,3236
+reconcile/gql_definitions/common/apps.py,sha256=lC7uZjyHAvJXhCDPJJ-dQJInBJkUCNZoe129XMa67wo,1868
 reconcile/gql_definitions/common/aws_vpc_requests.py,sha256=2lpyy-QSfHPSTvV_zbnqzqUoFzVNl-CJDmoqd_zVSX4,2366
 reconcile/gql_definitions/common/aws_vpcs.py,sha256=Dss9dQ3xagnz3Ltg1e9mtG2PAmQGBbUzKCmmzvuN28s,1892
 reconcile/gql_definitions/common/clusters.py,sha256=Dr5AsSsTuqjAxkI9fU0fdiaP6u5qkmRpkkCcYDnU584,21868
@@ -604,6 +605,7 @@ reconcile/typed_queries/app_interface_repo_url.py,sha256=9fhgWihjWNYOmK65irBWw9j
 reconcile/typed_queries/app_interface_state_settings.py,sha256=GdtxrjKs6JONthBzXJO66wHx80v3YyHvbZScj0XFM1Q,447
 reconcile/typed_queries/app_interface_vault_settings.py,sha256=ffkKVDD5cukQWOorUIrGvpcVr3lCbUHRIz0HWX_h7gI,715
 reconcile/typed_queries/app_quay_repos_escalation_policies.py,sha256=qpO9z9ev2RSH8sdZprLxhhrrbI0kvzmliSPfIVnfPbE,397
+reconcile/typed_queries/apps.py,sha256=IzgDQnKnvGKvFsgfIkha935I1T24tAYEp_LwrLrwVgQ,339
 reconcile/typed_queries/aws_vpc_requests.py,sha256=3LmBX9usfK8Uqr-pAux2oap01sXiMdGC_ihln6w4oV8,358
 reconcile/typed_queries/aws_vpcs.py,sha256=Fd0QCwXOH46UHw3-Xo_1ghtGYgUVJDpKf5Q3r1GpJGI,339
 reconcile/typed_queries/cloudflare.py,sha256=jOsqgCzMrjomPaIWc1isTcQAGONmMIJDTBcpmCheonA,308
@@ -837,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=k4KO3TgLrvODo55ExCoJc74IVwg6ccOuyTzLkesfI8Y,130446
+tools/qontract_cli.py,sha256=scWaC5D_s4s_F9z1bdxi2yCWk8UAmVIo-6u665Y6ikA,130526
 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
@@ -868,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.1rc1066.dist-info/METADATA,sha256=2hmviOFhwYzcMOSmbPA5z3fZwzWq12ISwijO7lzrops,2213
-qontract_reconcile-0.10.1rc1066.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1066.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1066.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1066.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1068.dist-info/METADATA,sha256=t9h0tIlI0IrPewwkSB9j0KcSSRuFAboN84twelBFxLQ,2213
+qontract_reconcile-0.10.1rc1068.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1068.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1068.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1068.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -6,9 +6,13 @@ from reconcile.change_owners.bundle import (
     NoOpFileDiffResolver,
     QontractServerDiff,
 )
-from reconcile.change_owners.change_owners import fetch_change_type_processors
+from reconcile.change_owners.change_owners import (
+    fetch_change_type_processors,
+    init_gitlab,
+)
 from reconcile.change_owners.change_types import ChangeTypeContext
 from reconcile.change_owners.changes import aggregate_file_moves, parse_bundle_changes
+from reconcile.typed_queries.apps import get_apps
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.runtime.integration import (
@@ -24,8 +28,10 @@ BUNDLE_DIFFS_OBJ = "bundle-diffs.json"
 @dataclass
 class ChangeLogItem:
     commit: str
+    created_at: str
     change_types: list[str] = field(default_factory=list)
     error: bool = False
+    apps: list[str] = field(default_factory=list)
 
 
 @dataclass
@@ -34,6 +40,7 @@ class ChangeLog:
 
 
 class ChangeLogIntegrationParams(PydanticRunParams):
+    gitlab_project_id: str
     process_existing: bool = False
 
 
@@ -55,6 +62,8 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
             )
             if ctp.labels and "change_log_tracking" in ctp.labels
         ]
+        apps = get_apps()
+        app_name_by_path = {a.path: a.name for a in apps}
 
         integration_state = init_state(
             integration=self.name,
@@ -74,6 +83,9 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                 ChangeLogItem(**i)  # type: ignore[arg-type]
                 for i in existing_change_log.items
             ]
+        gl = init_gitlab(self.params.gitlab_project_id)
+        if defer:
+            defer(gl.cleanup)
         change_log = ChangeLog()
         for item in diff_state.ls():
             key = item.lstrip("/")
@@ -88,8 +100,10 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                     continue
 
             logging.info(f"Processing commit {commit}")
+            gl_commit = gl.project.commits.get(commit)
             change_log_item = ChangeLogItem(
                 commit=commit,
+                created_at=gl_commit.created_at,
             )
             change_log.items.append(change_log_item)
             obj = diff_state.get(key, None)
@@ -101,6 +115,22 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
             changes = aggregate_file_moves(parse_bundle_changes(diff))
             for change in changes:
                 logging.debug(f"Processing change {change}")
+                change_versions = filter(None, [change.old, change.new])
+                match change.fileref.schema:
+                    case "/app-sre/app-1.yml":
+                        changed_apps = {c["name"] for c in change_versions}
+                        change_log_item.apps.extend(changed_apps)
+                    case "/app-sre/saas-file-2.yml" | "/openshift/namespace-1.yml":
+                        changed_apps = {
+                            name
+                            for c in change_versions
+                            if (name := app_name_by_path.get(c["app"]["$ref"]))
+                        }
+                        change_log_item.apps.extend(changed_apps)
+
+                # TODO(maorfr): switch apps to set
+                change_log_item.apps = list(set(change_log_item.apps))
+
                 for ctp in change_type_processors:
                     logging.info(f"Processing change type {ctp.name}")
                     ctx = ChangeTypeContext(
@@ -115,5 +145,8 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                         if ctp.name not in change_log_item.change_types:
                             change_log_item.change_types.append(ctp.name)
 
+        change_log.items = sorted(
+            change_log.items, key=lambda i: i.created_at, reverse=True
+        )
         if not dry_run:
             integration_state.add(BUNDLE_DIFFS_OBJ, asdict(change_log), force=True)

reconcile/cli.py

@@ -3558,13 +3558,14 @@ def change_owners(
 
 
 @integration.command(short_help="Analyze bundle diffs by change types.")
+@gitlab_project_id
 @click.option(
     "--process-existing/--no-process-existing",
     default=False,
     help="wait for pending/running pipelines before acting.",
 )
 @click.pass_context
-def change_log_tracking(ctx, process_existing):
+def change_log_tracking(ctx, gitlab_project_id, process_existing):
     from reconcile.change_owners.change_log_tracking import (
         ChangeLogIntegration,
         ChangeLogIntegrationParams,
@@ -3573,6 +3574,7 @@ def change_log_tracking(ctx, process_existing):
     run_class_integration(
         ChangeLogIntegration(
             ChangeLogIntegrationParams(
+                gitlab_project_id=gitlab_project_id,
                 process_existing=process_existing,
             )
         ),

reconcile/gql_definitions/common/apps.py

@@ -0,0 +1,72 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query Apps {
+  apps: apps_v1 {
+    path
+    name
+    parentApp {
+      path
+      name
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class AppV1_AppV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+    name: str = Field(..., alias="name")
+
+
+class AppV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+    name: str = Field(..., alias="name")
+    parent_app: Optional[AppV1_AppV1] = Field(..., alias="parentApp")
+
+
+class AppsQueryData(ConfiguredBaseModel):
+    apps: Optional[list[AppV1]] = Field(..., alias="apps")
+
+
+def query(query_func: Callable, **kwargs: Any) -> AppsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        AppsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return AppsQueryData(**raw_data)

reconcile/typed_queries/apps.py

@@ -0,0 +1,11 @@
+from collections.abc import Callable
+
+from reconcile.gql_definitions.common.apps import AppV1, query
+from reconcile.utils import gql
+
+
+def get_apps(query_func: Callable | None = None) -> list[AppV1]:
+    if not query_func:
+        gqlapi = gql.get_api()
+        query_func = gqlapi.query
+    return query(query_func=query_func).apps or []

tools/qontract_cli.py

@@ -48,6 +48,7 @@ from reconcile.aus.base import (
 from reconcile.aus.models import OrganizationUpgradeSpec
 from reconcile.change_owners.bundle import NoOpFileDiffResolver
 from reconcile.change_owners.change_log_tracking import (
+    BUNDLE_DIFFS_OBJ,
     ChangeLog,
     ChangeLogIntegration,
     ChangeLogIntegrationParams,
@@ -2893,7 +2894,7 @@ def change_log_tracking(ctx):
     state = init_state(
         integration=ChangeLogIntegration(ChangeLogIntegrationParams()).name
     )
-    change_log = ChangeLog(**state.get("bundle-diffs.json"))
+    change_log = ChangeLog(**state.get(BUNDLE_DIFFS_OBJ))
     data: list[dict[str, str]] = []
     for item in change_log.items:
         change_log_item = ChangeLogItem(**item)
@@ -2905,12 +2906,13 @@ def change_log_tracking(ctx):
         ]
         item = {
             "commit": f"[{commit}]({repo_url}/commit/{commit})",
+            "apps": ", ".join(change_log_item.apps),
             "changes": ", ".join(covered_change_types_descriptions),
             "error": change_log_item.error,
         }
         data.append(item)
 
-    columns = ["commit", "changes", "error"]
+    columns = ["commit", "apps", "changes", "error"]
     print_output(ctx.obj["options"], data, columns)