qontract-reconcile 0.10.1rc58__py3-none-any.whl → 0.10.1rc59__py3-none-any.whl

{qontract_reconcile-0.10.1rc58.dist-info → qontract_reconcile-0.10.1rc59.dist-info}/METADATA

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

@@ -130,13 +130,13 @@ reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=tH0oQFJsO4UrEYspqiq-ne6-ULXA4N
 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=VTRXDMlcNYykqCPRIcCDTCA188Ouxglt7Sxeu1qep4E,5102
-reconcile/change_owners/change_owners.py,sha256=0JRRPaaCCfgNpxwVfWDYCCYoa0II6OSZuiO6jpVwsLM,14392
+reconcile/change_owners/change_owners.py,sha256=WX-ekjI3IhdrJtvwieyeE32ho6cOsIOzFY3uzS25X5E,13268
 reconcile/change_owners/change_types.py,sha256=rWYmrw3rcE-lEZ-SQb3D38an5GhasaydpAtYpg5nPBU,28405
 reconcile/change_owners/changes.py,sha256=uGFukXgMkcO9xAXzF_LL0HLdNcQtSq0IyojsI1YIJTs,15889
 reconcile/change_owners/decision.py,sha256=uFuk06kzgifCg4ExaMRHEX6LIKnwaMkSQG8AeNG2uJo,4811
 reconcile/change_owners/diff.py,sha256=84pbx19C-QL1SgK16MxPqv3Ssiy1g8j0i978iSDb2kM,8840
 reconcile/change_owners/implicit_ownership.py,sha256=xga4X0OiZityQf5YRGLUSaIdr2Ij74H879-sjWzgTDk,4161
-reconcile/change_owners/self_service_roles.py,sha256=6xHBCaOeFjuFn5A3cBJZ77PdfkvOmYyHujuyohoEHb0,5173
+reconcile/change_owners/self_service_roles.py,sha256=Ya5NPHCFpzMCDmxHrrjueXCYAap7jXzm0woudUEH6lc,6754
 reconcile/change_owners/tester.py,sha256=BfJM8dsurubnyDF9UR3oV2N3ClyjLsqDNq0Hy_UdjOk,8949
 reconcile/cna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/cna/client.py,sha256=t9gJDrKf4ApBlgu8c4QUbmzrYoSo1QPsnAGfucva2_U,1562
@@ -584,8 +584,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc58.dist-info/METADATA,sha256=oWz9xx5iFJYxcx-A0cQXP8M_NngpvZJY5z4m3EuADuA,2290
-qontract_reconcile-0.10.1rc58.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc58.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc58.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc58.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc59.dist-info/METADATA,sha256=yWzIW1zwhAEPW3eHJrXNtN0Ccq3SlMTwZy-WA1tTvh0,2290
+qontract_reconcile-0.10.1rc59.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc59.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc59.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc59.dist-info/RECORD,,

reconcile/change_owners/change_owners.py

@@ -29,12 +29,9 @@ from reconcile.change_owners.implicit_ownership import (
 )
 from reconcile.change_owners.self_service_roles import (
     cover_changes_with_self_service_roles,
+    fetch_self_service_roles,
 )
-from reconcile.gql_definitions.change_owners.queries import (
-    change_types,
-    self_service_roles,
-)
-from reconcile.gql_definitions.change_owners.queries.self_service_roles import RoleV1
+from reconcile.gql_definitions.change_owners.queries import change_types
 from reconcile.utils import gql
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.mr.labels import (
@@ -78,33 +75,6 @@ def cover_changes(
     )
 
 
-def validate_self_service_role(role: RoleV1) -> None:
-    for ssc in role.self_service or []:
-        if ssc.change_type.context_schema:
-            # check that all referenced datafiles have a schema that
-            # is compatible with the change-type
-            incompatible_datafiles = [
-                df.path
-                for df in ssc.datafiles or []
-                if df.datafile_schema != ssc.change_type.context_schema
-            ]
-            if incompatible_datafiles:
-                raise ValueError(
-                    f"The datafiles {incompatible_datafiles} are not compatible with the "
-                    f"{ssc.change_type.name} change-types contextSchema {ssc.change_type.context_schema}"
-                )
-
-
-def fetch_self_service_roles(gql_api: gql.GqlApi) -> list[RoleV1]:
-    roles: list[RoleV1] = []
-    for r in self_service_roles.query(gql_api.query).roles or []:
-        if not r.self_service:
-            continue
-        validate_self_service_role(r)
-        roles.append(r)
-    return roles
-
-
 def fetch_change_type_processors(
     gql_api: gql.GqlApi, file_diff_resolver: FileDiffResolver
 ) -> list[ChangeTypeProcessor]:

reconcile/change_owners/self_service_roles.py

@@ -12,15 +12,62 @@ from reconcile.change_owners.change_types import (
     ChangeTypeProcessor,
 )
 from reconcile.change_owners.changes import BundleFileChange
+from reconcile.gql_definitions.change_owners.queries import self_service_roles
 from reconcile.gql_definitions.change_owners.queries.self_service_roles import (
     PermissionGitlabGroupMembershipV1,
     PermissionSlackUsergroupV1,
     RoleV1,
 )
+from reconcile.utils import gql
 
 
-class EmptySelfServiceRoleError(Exception):
-    pass
+class NoApproversInSelfServiceRoleError(Exception):
+    """
+    Thrown when a self-service role has no approvers
+    """
+
+
+class DatafileIncompatibleWithChangeTypeError(Exception):
+    """
+    Thrown when a datafile and a change type are hooked up
+    in a self-service role, but are not compatible schema wise.
+    """
+
+
+def fetch_self_service_roles(gql_api: gql.GqlApi) -> list[RoleV1]:
+    roles: list[RoleV1] = []
+    for r in self_service_roles.query(gql_api.query).roles or []:
+        if not r.self_service:
+            continue
+        validate_self_service_role(r)
+        roles.append(r)
+    return roles
+
+
+def validate_self_service_role(role: RoleV1) -> None:
+    """
+    Validate that a self-service role has approvers and that the referenced
+    change-types and datafiles/resources are compatible.
+    """
+    if not role.users and not role.bots:
+        raise NoApproversInSelfServiceRoleError(
+            f"The role {role.name} has no users or bots "
+            "to drive the self-service process. Add approvers to the roles."
+        )
+    for ssc in role.self_service or []:
+        if ssc.change_type.context_schema:
+            # check that all referenced datafiles have a schema that
+            # is compatible with the change-type
+            incompatible_datafiles = [
+                df.path
+                for df in ssc.datafiles or []
+                if df.datafile_schema != ssc.change_type.context_schema
+            ]
+            if incompatible_datafiles:
+                raise DatafileIncompatibleWithChangeTypeError(
+                    f"The datafiles {incompatible_datafiles} are not compatible with the "
+                    f"{ssc.change_type.name} change-types contextSchema {ssc.change_type.context_schema}"
+                )
 
 
 def cover_changes_with_self_service_roles(
@@ -66,11 +113,6 @@ def change_type_contexts_for_self_service_roles(
                         role_lookup[
                             (BundleFileType.RESOURCEFILE, res, ss.change_type.name)
                         ].append(r)
-    if orphaned_roles:
-        raise EmptySelfServiceRoleError(
-            f"The roles {', '.join([r.name for r in orphaned_roles])} have no users or bots "
-            "to drive the self-service process. Add approvers to the roles."
-        )
 
     # match every BundleChange with every relevant ChangeTypeV1
     change_type_contexts = []