qontract-reconcile 0.10.1rc305__py3-none-any.whl → 0.10.1rc307__py3-none-any.whl

{qontract_reconcile-0.10.1rc305.dist-info → qontract_reconcile-0.10.1rc307.dist-info}/METADATA

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

@@ -77,7 +77,7 @@ reconcile/openshift_saas_deploy_trigger_images.py,sha256=Yl4lMtxqab-c04I2Ju8isAJ
 reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=VqjwgRhA-yOSq0WFPqGIJVgYkdq_UrTHcVusBzOFgMY,973
 reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=etfBGj7GDXTOhNHKc40ee5QM0Chq3oHE40HrbWgopc8,971
 reconcile/openshift_serviceaccount_tokens.py,sha256=UlBRjfAxzf9-h4uxQwHqrYnBWMUGFqqfp6KvW2lM76k,6369
-reconcile/openshift_tekton_resources.py,sha256=Fk07Vjw2Uw1qxiK2QjVehfffau84HM3HxkuYt6fCQYQ,15918
+reconcile/openshift_tekton_resources.py,sha256=_-Ujf7e3fAX4jwU7HRZrSY1jwvpwcVwoIQwdohpJkC4,16191
 reconcile/openshift_upgrade_watcher.py,sha256=KxJIBudfX0DcpSH1_evbz4gNMQi0yeOpSZLgKrs-FBw,6618
 reconcile/openshift_users.py,sha256=dKWS3AVmgMKcblafHYz1pLVnTOp1ZzfePGQCaTpVc_8,5213
 reconcile/openshift_vault_secrets.py,sha256=9rTqV6wzCQx2Oh712E_Xj8wMG7u8Oh-pY8DWjlv4mZw,1660
@@ -129,13 +129,13 @@ reconcile/aws_cloudwatch_log_retention/integration.py,sha256=W3Zct0o7677LvEt99Ui
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=L7XJWJ-rgn8BOmeMb6lBDV8lHFCUaNoHGDSD7OH03vA,2244
 reconcile/change_owners/bundle.py,sha256=Bh9v08tIw8TieG4EE9kVI9iFN1sW7Z6Zyb8DTbsv6F0,5371
-reconcile/change_owners/change_owners.py,sha256=AP5hk9QaS58Xeq_88Bxm_STCyFUulLoQbNBMzfUUs2c,14038
-reconcile/change_owners/change_types.py,sha256=3UFjyuTW0-si9pvaKfqGCWGwTiBVi7n9HZnfHk_x5iY,31486
-reconcile/change_owners/changes.py,sha256=KrtaDTM_jxyYsHPUEjJCWJr186L4a-NsxCnztdSUry4,16912
+reconcile/change_owners/change_owners.py,sha256=Lo69xee7s1pPuGOyTcDkVBeku1NcE--N3LxtMRMmSNA,14244
+reconcile/change_owners/change_types.py,sha256=nbACmO21txQY2DDF1qWFKjK9yYQTY2lr4rnAZMxYmag,31912
+reconcile/change_owners/changes.py,sha256=6-byArOCi3DCA1jFpAVMZkyhu2mh7La3eIGp07OkUX0,17242
 reconcile/change_owners/decision.py,sha256=JBMhNG8UqaKzTZgaKQLTPn8KW8CSEvq8clP76ZfQT6s,6381
 reconcile/change_owners/diff.py,sha256=H6_Xizh2BrBdU-JPQvwNPx1-cELECmtKwRD_nOfOz9E,9253
 reconcile/change_owners/implicit_ownership.py,sha256=yFUm8W5fR4B8xDQwvzKIzZmdDFGbNqCbk9L_812CyGc,4324
-reconcile/change_owners/self_service_roles.py,sha256=5aWNvjkjVrpKVusurpZrniGpxNCAVFYB3QzilCYuNFE,8822
+reconcile/change_owners/self_service_roles.py,sha256=_XtqpZ29viSJ0bCDnWqRU1Vi_oX-eC9JwQ_scbEFPAE,9209
 reconcile/change_owners/tester.py,sha256=sytxJVNJPRXWc3E8zT1ERLx7ikuSfT-7Zt1KbnS01lg,8948
 reconcile/cna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/cna/client.py,sha256=t9gJDrKf4ApBlgu8c4QUbmzrYoSo1QPsnAGfucva2_U,1562
@@ -161,7 +161,7 @@ reconcile/gql_definitions/aws_ami_cleanup/asg_namespaces.py,sha256=hu0f4DQ5a6mP4
 reconcile/gql_definitions/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/queries/change_types.py,sha256=PibaJdWLxHYflYfLFEaub-0fvVcp8C8Apw3LRU6ScD8,5131
-reconcile/gql_definitions/change_owners/queries/self_service_roles.py,sha256=d4_C0H4QKkbQHdXMKm7m9MTX4_WoIhHUXiXtOzYsasM,3920
+reconcile/gql_definitions/change_owners/queries/self_service_roles.py,sha256=bR3RM5GQjIiC2hgBOZowsJyLoIIo4ey0E3KvUxnyLrI,3987
 reconcile/gql_definitions/cna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/cna/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/cna/queries/cna_provisioners.py,sha256=MxCdDVZkB_tBYTVevJhpymtLV93gT6cdDZfTPHX5bRc,3014
@@ -541,7 +541,7 @@ reconcile/utils/mr/aws_access.py,sha256=SOo2jPMexscMnKwtIU4s6mMDBOXW3Hxjdi6xDG9s
 reconcile/utils/mr/base.py,sha256=in_t7LhCiN2QwmGqUnMXIPF_EPnfqjRZjYyPKLWrRrk,7142
 reconcile/utils/mr/clusters_updates.py,sha256=0ibxkcBNyQWsgdG5hTaN1THHuQCAwGqXR1bSp6V2ov0,2123
 reconcile/utils/mr/glitchtip_access_reporter.py,sha256=_k-FN244Zu5IrQU1sa4bktfChY3HqDDiweMP_OXDrHE,5065
-reconcile/utils/mr/labels.py,sha256=8suyIzbuvTzXhdbqmbITe979Wt1Lpcew4g65dpWs0Fw,554
+reconcile/utils/mr/labels.py,sha256=4OMgZbQZw2MUcfq8Bee_g583LmwHB5YIEoVrW7TcTRo,634
 reconcile/utils/mr/notificator.py,sha256=2Xyg5Xh3xFQITdTmZ8Nry5qe0uC_w_On4uMPdlN5Bl4,2998
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=qypdCoH_P3UBY_GpF6tWowSwSp1ZHN0BwoPy0kjxOLE,1530
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=u6J9zxvqNFXZW681B9dfPIO5zJWa-Z6PLDIow4uIg0A,2736
@@ -587,7 +587,7 @@ tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/app_interface_reporter.py,sha256=8HUH8kkW50-plKgiTgCiFINJNN_cl4ZFzmY4aSnRaNk,18270
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=PXN5wxl6OX8sxddPaakDF3X79nFLvpm-lz0mWLVelw0,2806
-tools/qontract_cli.py,sha256=ug7eW4DaeFxRN0HY1lUUJYCBue8kdvb1id0SvHx_7Hk,96551
+tools/qontract_cli.py,sha256=oXeUs9wMv7S3u4CzmnAXuK8nn9bcmMB2873lzeEwMlE,96717
 tools/sd_app_sre_alert_report.py,sha256=utFZCreITuTZTiOaFNCaVPyFK0zxFZbc_ElcngGbiW8,4346
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=JryinrDdvztN931enUY3FuDeLVnfs6y58mnK7itNK6Y,4940
@@ -597,8 +597,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc305.dist-info/METADATA,sha256=mrB4oq5qHOf_qQXlCI3sIiCcS0dp0VI9jcXdHnvydBU,2284
-qontract_reconcile-0.10.1rc305.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc305.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc305.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc305.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc307.dist-info/METADATA,sha256=Ad4be8KypBclzvWnBfRX2UtI_M_2YIb69AtKEroAkrs,2284
+qontract_reconcile-0.10.1rc307.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+qontract_reconcile-0.10.1rc307.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
+qontract_reconcile-0.10.1rc307.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc307.dist-info/RECORD,,

reconcile/change_owners/change_owners.py

@@ -40,6 +40,7 @@ from reconcile.utils.mr.labels import (
     HOLD,
     NOT_SELF_SERVICEABLE,
     SELF_SERVICEABLE,
+    change_owner_label,
     prioritized_approval_label,
 )
 from reconcile.utils.output import format_table
@@ -94,7 +95,7 @@ def manage_conditional_label(
     current_labels: list[str],
     conditional_labels: dict[str, bool],
     dry_run: bool = True,
-) -> list[str]:
+) -> set[str]:
     new_labels = current_labels.copy()
     for label, condition in conditional_labels.items():
         if condition and label not in new_labels:
@@ -105,7 +106,7 @@ def manage_conditional_label(
             logging.info(f"removing label {label}")
             if not dry_run:
                 new_labels.remove(label)
-    return new_labels
+    return set(new_labels)
 
 
 def write_coverage_report_to_mr(
@@ -377,6 +378,12 @@ def run(
                 conditional_labels=conditional_labels,
                 dry_run=False,
             )
+
+            # change-owner labels
+            for bc in changes:
+                for label in bc.change_owner_labels:
+                    labels.add(change_owner_label(label))
+
             if mr_management_enabled:
                 gl.set_labels_on_merge_request(merge_request, labels)
             else:

reconcile/change_owners/change_types.py

@@ -79,6 +79,16 @@ class DiffCoverage:
 
     parent: Optional["DiffCoverage"] = None
 
+    @property
+    def change_owner_labels(self) -> set[str]:
+        """
+        Returns a list of change-owner labels of all involved change-type contexts.
+        """
+        labels = {label for c in self.coverage for label in c.change_owner_labels or {}}
+        for _split in self._split_into:
+            labels.update(_split.change_owner_labels)
+        return labels
+
     def relative_path(self) -> jsonpath_ng.JSONPath:
         if self.parent:
             path = remove_prefix_from_path(self.diff.path, self.parent.diff.path)
@@ -831,6 +841,7 @@ class ChangeTypeContext:
     context_file: FileRef
     approvers: list[Approver]
     approver_reachability: Optional[list[ApproverReachability]] = None
+    change_owner_labels: Optional[set[str]] = None
 
     @property
     def disabled(self) -> bool:

reconcile/change_owners/changes.py

@@ -196,6 +196,17 @@ class BundleFileChange:
             coverages.extend(dc.fine_grained_diff_coverages().values())
         return coverages
 
+    @property
+    def change_owner_labels(self) -> set[str]:
+        """
+        returns the set of change owner labels that are attached to the
+        BundleFileChanges DiffCoverage
+        """
+        labels = set()
+        for dc in self.diff_coverage:
+            labels.update(dc.change_owner_labels)
+        return labels
+
     def involved_change_types(self) -> list[ChangeTypeProcessor]:
         """
         returns all the change-types that are involved in the coverage

reconcile/change_owners/self_service_roles.py

@@ -21,6 +21,8 @@ from reconcile.gql_definitions.change_owners.queries.self_service_roles import (
 )
 from reconcile.utils import gql
 
+CHANGE_OWNERS_LABELS_LABEL = "change-owners-labels"
+
 
 class NoApproversInSelfServiceRoleError(Exception):
     """
@@ -201,6 +203,7 @@ def change_type_contexts_for_self_service_roles(
                                 approver_reachability=approver_reachability_from_role(
                                     role
                                 ),
+                                change_owner_labels=change_type_labels_from_role(role),
                                 context_file=ownership.context_file_ref,
                             ),
                         )
@@ -208,6 +211,13 @@ def change_type_contexts_for_self_service_roles(
     return change_type_contexts
 
 
+def change_type_labels_from_role(role: RoleV1) -> set[str]:
+    change_owner_labels = (
+        role.labels.get(CHANGE_OWNERS_LABELS_LABEL, "") if role.labels else ""
+    )
+    return {label.strip() for label in change_owner_labels.split(",")}
+
+
 def approver_reachability_from_role(role: RoleV1) -> list[ApproverReachability]:
     reachability: list[ApproverReachability] = []
     for permission in role.permissions or []:

reconcile/gql_definitions/change_owners/queries/self_service_roles.py

@@ -22,6 +22,7 @@ DEFINITION = """
 query SelfServiceRolesQuery($name: String) {
   roles: roles_v1(name: $name) {
     name
+    labels
     path
     self_service {
       change_type {
@@ -107,6 +108,7 @@ class PermissionGitlabGroupMembershipV1(PermissionV1):
 
 class RoleV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    labels: Optional[Json] = Field(..., alias="labels")
     path: str = Field(..., alias="path")
     self_service: Optional[list[SelfServiceConfigV1]] = Field(..., alias="self_service")
     users: list[UserV1] = Field(..., alias="users")

reconcile/openshift_tekton_resources.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import sys
+from collections.abc import Mapping
 from typing import (
     Any,
     Optional,
@@ -147,17 +148,6 @@ def fetch_desired_resources(
         cluster = tknp["namespace"]["cluster"]["name"]
         deploy_resources = tknp.get("deployResources") or DEFAULT_DEPLOY_RESOURCES
 
-        # Remove None values
-        deploy_resources = {
-            item: {
-                k: v
-                for k, v in (deploy_resources.get(item) or {}).items()
-                if v is not None
-            }
-            for item, values in deploy_resources.items()
-            if values is not None
-        }
-
         # a dict with task template names as keys and types as values
         # we'll use it when building the pipeline object to make sure
         # that all tasks referenced exist and to be able to set the
@@ -240,6 +230,22 @@ def build_one_per_namespace_task(
     return task
 
 
+def _curate_deploy_resources(deploy_resources: Mapping[str, Any]) -> dict[str, Any]:
+    """Removes empty (None) values in deploy_resources dicts
+
+    :param deploy_resources: dictionary with the resources returned by Gql
+    :return: dict with the resources without None values
+    """
+    resources = {
+        item: {
+            k: v for k, v in (deploy_resources.get(item) or {}).items() if v is not None
+        }
+        for item, values in deploy_resources.items()
+        if values is not None
+    }
+    return resources
+
+
 def build_one_per_saas_file_task(
     task_template_config: dict[str, str],
     saas_file: dict[str, Any],
@@ -266,7 +272,7 @@ def build_one_per_saas_file_task(
     resources_configured = False
     for step in task["spec"]["steps"]:
         if step["name"] == step_name:
-            step["computeResources"] = (
+            step["computeResources"] = _curate_deploy_resources(
                 saas_file.get("deployResources") or deploy_resources
             )
             resources_configured = True

reconcile/utils/mr/labels.py

@@ -15,3 +15,7 @@ NOT_SELF_SERVICEABLE = "not-self-serviceable"
 
 def prioritized_approval_label(priority: str) -> str:
     return f"{APPROVED}: {priority}"
+
+
+def change_owner_label(label: str) -> str:
+    return f"change-owner/{label}"

tools/qontract_cli.py

@@ -98,6 +98,7 @@ from reconcile.utils.keycloak import (
 from reconcile.utils.mr.labels import (
     SAAS_FILE_UPDATE,
     SELF_SERVICEABLE,
+    change_owner_label,
 )
 from reconcile.utils.oc import (
     OC_Map,
@@ -1847,7 +1848,11 @@ def app_interface_review_queue(ctx) -> None:
                 continue
             if SAAS_FILE_UPDATE in labels:
                 continue
-            if SELF_SERVICEABLE in labels:
+            if (
+                SELF_SERVICEABLE in labels
+                and change_owner_label("show-self-serviceable-in-review-queue")
+                not in labels
+            ):
                 continue
 
             pipelines = mr.pipelines()