qontract-reconcile 0.10.1rc397__py3-none-any.whl → 0.10.1rc399__py3-none-any.whl

{qontract_reconcile-0.10.1rc397.dist-info → qontract_reconcile-0.10.1rc399.dist-info}/METADATA

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

@@ -148,12 +148,12 @@ reconcile/cna/assets/asset.py,sha256=1v51uYSaD1NOc9cI_YxG7h0NOcR1ng-mkmD2UzQ8PXE
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 reconcile/cna/assets/null.py,sha256=Fby1Fbn7oNRIGNasdyhRDvXJ0ktpxv-pUAPN0lZWSzk,1684
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip/integration.py,sha256=kkag8hcVbUSFDrLVEvpJjqXz3O1HkKtzF8HOZ5jKVTU,8191
+reconcile/glitchtip/integration.py,sha256=FB1dmwrDs8z6MHfO5Za83fcPkxsVvcaw6sFymIx4C_Q,8116
 reconcile/glitchtip/reconciler.py,sha256=_Lsu5_LRqSfjYe3Tn0eGE-u8WmTJt3c2TgCRvURoEM0,12306
 reconcile/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip_project_alerts/integration.py,sha256=u_HPhzID-oNh1J08X88Q7RRmZNObGlYVCzgrnJGgcoc,9176
+reconcile/glitchtip_project_alerts/integration.py,sha256=ocKiowpcNCyJXaTbdl2CYg283dZ8lvwA85-_yllTtbg,11073
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip_project_dsn/integration.py,sha256=dQPb_izAXSlHBwksEpiTGgeybIsUsPZ1wJfMZ5voBHY,8046
+reconcile/glitchtip_project_dsn/integration.py,sha256=NSHW3qVwkeSMv7Anl6fb-UFKRLUh_dh7JfvPQVvg1cA,7946
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=RSgN-BpYC1XG_4yaLdanUGsjBwh0RGLiEFX9T_Z_cvM,4091
@@ -218,11 +218,10 @@ reconcile/gql_definitions/gitlab_members/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 reconcile/gql_definitions/gitlab_members/gitlab_instances.py,sha256=2pLJMX5VngtQ93wDG0G96N3GhpWKlnPt3tsAot6W-Jg,2089
 reconcile/gql_definitions/gitlab_members/permissions.py,sha256=eQ1A22jnPMs2aCioS_u2Fw9wkMy9wsU_RuunPt4uu6I,3320
 reconcile/gql_definitions/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/glitchtip/glitchtip_instance.py,sha256=Dyqs6tFaixcxUJR8TA3PZJ0GXtQL1tegiGFv2aAHXj0,2181
+reconcile/gql_definitions/glitchtip/glitchtip_instance.py,sha256=m0rAcytpzgbUbBNJTx892azExGTDmF8pLwUQDPWFeaI,2742
 reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=TTfg3TDkAnEOwidgq_BsvnFLwwfl9kZvnl4Hp_fVeqU,5990
-reconcile/gql_definitions/glitchtip/glitchtip_settings.py,sha256=triKpfVwYxXWyZaZ6r7B37brzbqncjb2vhlBO_33phY,2058
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=NYffd2Y8Q_fAwLeEvWvBDwHHMp49vQp2udu-uX4de50,3816
+reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=xFpu0OycGQlxdrT5TsNACk9IwOyrPuHh2Wn8-wO4m00,4206
 reconcile/gql_definitions/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/integrations/integrations.py,sha256=BVQi1KouOszucg250nYq5gQYVBwWtSgR17-Zt7sWKc0,11710
 reconcile/gql_definitions/jenkins_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -322,7 +321,7 @@ reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLm
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=PNu7sE-tDUY61E03z5w0b93fdowZ8auCl0S4_vhYOKQ,1333
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=SNJ9WLlaFnf_tblwC0xDBfrXi4SVadeFgV3llhTqbGM,10959
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=cQYT0qCQQdsG4H16zpXBnHvnF_aZy4T87SxruyxRgNc,8565
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=t4Zi1BSDBEhrEl0hFIC7bPA41IGwh3kTWlo7qCtDTLE,7176
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=mihuWynroB1Cea1Lsvf6V8Nb8PGiBdcLC0uhCX_52Y0,6966
 reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=WXzr6I0Q9NzTU8s2Dk_wdWxKN8zUwPFiXbx31CnuY0w,5237
@@ -457,7 +456,6 @@ reconcile/typed_queries/clusters_minimal.py,sha256=flvs4oXVR4b971h-zMTK3C2GL3bjM
 reconcile/typed_queries/clusters_with_peering.py,sha256=lIai7SJJD0bqIJbe7virgrbYRqjLouSL2OpJD0itpAY,330
 reconcile/typed_queries/github_orgs.py,sha256=UZhoPl8qvA_tcO7CZlN8GuMKckt3ywd47Suu61rgHsc,258
 reconcile/typed_queries/gitlab_instances.py,sha256=ZVQHy2W9xIp53f5qYkjKLHLHgOVtQpxTfcmM1C2046g,291
-reconcile/typed_queries/glitchtip_settings.py,sha256=Hwq8H73PTK-ZIysGEqWcPEqYyRjETS91h9odp-T5ce0,721
 reconcile/typed_queries/jira_settings.py,sha256=i0ddx5xxHrM1v-9mtL_6OB-jBFLw7-HS6xenpIDjrkw,570
 reconcile/typed_queries/namespaces.py,sha256=vItPrn7sfcHOix-VvkzQkf54_ljzI_ymyxh5esdBJ5Y,262
 reconcile/typed_queries/namespaces_minimal.py,sha256=rUtqNQ0ORXXUTQfnpsMURymAJ4gYtE77V-Lb3LiJFEY,278
@@ -548,7 +546,7 @@ reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO6
 reconcile/utils/cloud_resource_best_practice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/cloud_resource_best_practice/aws_rds.py,sha256=ZMQ7jT1HQbPIw0yJ7dXlDc6IETKUsLX3azWOvf5QLe0,2246
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
-reconcile/utils/glitchtip/client.py,sha256=lusu2b8PdnJanvQl4lK-mMqRZ6lXETXx0RJAGQRwfRE,10316
+reconcile/utils/glitchtip/client.py,sha256=LpWiTg6ddmJPcB8LPEARai2nP9NrN4O8Gmtd8VZ9Iz0,10438
 reconcile/utils/glitchtip/models.py,sha256=Ic-RimRgMFskdbyYL6fQuOLwC2dGrt4y70-p-OqbQ-c,6197
 reconcile/utils/internal_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/internal_groups/client.py,sha256=abREA8RwXKybXFjCK8CAcCr-iUp2r0tAbIEJ-c-PXws,4538
@@ -615,8 +613,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.1rc397.dist-info/METADATA,sha256=z4kimdW8MbXFkm5-MnD5gGyw6YL6FEZYPVGzeFVKywE,2347
-qontract_reconcile-0.10.1rc397.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc397.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc397.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc397.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc399.dist-info/METADATA,sha256=8Rhg2IJPlLsVXNXBbLK1INKk5ke86eV9Z67fDjHGShA,2347
+qontract_reconcile-0.10.1rc399.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+qontract_reconcile-0.10.1rc399.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
+qontract_reconcile-0.10.1rc399.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc399.dist-info/RECORD,,

reconcile/glitchtip/integration.py

@@ -29,7 +29,6 @@ from reconcile.ldap_groups.integration import LdapGroupsIntegration
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
-from reconcile.typed_queries.glitchtip_settings import get_glitchtip_settings
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.glitchtip import (
@@ -176,7 +175,6 @@ def run(
     gqlapi = gql.get_api()
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-    read_timeout, max_retries, mail_domain = get_glitchtip_settings()
     internal_groups_client = get_internal_groups_client(gqlapi.query, secret_reader)
     if defer:
         defer(internal_groups_client.close)
@@ -191,8 +189,8 @@ def run(
         glitchtip_client = GlitchtipClient(
             host=glitchtip_instance.console_url,
             token=secret_reader.read_secret(glitchtip_instance.automation_token),
-            read_timeout=read_timeout,
-            max_retries=max_retries,
+            read_timeout=glitchtip_instance.read_timeout,
+            max_retries=glitchtip_instance.max_retries,
         )
         current_state = fetch_current_state(
             glitchtip_client=glitchtip_client,
@@ -207,7 +205,7 @@ def run(
                 for p in glitchtip_projects
                 if p.organization.instance.name == glitchtip_instance.name
             ],
-            mail_domain=mail_domain,
+            mail_domain=glitchtip_instance.mail_domain or "redhat.com",
             internal_groups_client=internal_groups_client,
         )
 

reconcile/glitchtip_project_alerts/integration.py

@@ -8,6 +8,7 @@ from typing import (
     Any,
     Optional,
 )
+from urllib.parse import quote
 
 from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
     query as glitchtip_instance_query,
@@ -21,7 +22,6 @@ from reconcile.gql_definitions.glitchtip_project_alerts.glitchtip_project import
 from reconcile.gql_definitions.glitchtip_project_alerts.glitchtip_project import (
     query as glitchtip_project_query,
 )
-from reconcile.typed_queries.glitchtip_settings import get_glitchtip_settings
 from reconcile.utils import gql
 from reconcile.utils.differ import diff_iterables
 from reconcile.utils.glitchtip.client import GlitchtipClient
@@ -38,7 +38,7 @@ from reconcile.utils.runtime.integration import (
 )
 
 QONTRACT_INTEGRATION = "glitchtip-project-alerts"
-
+GJB_ALERT_NAME = "Glitchtip-Jira-Bridge-Integration"
 ProjectStates = dict[str, Project]
 
 
@@ -79,7 +79,10 @@ class GlitchtipProjectAlertsIntegration(
         raise TypeError("Unsupported type")
 
     def fetch_desired_state(
-        self, glitchtip_projects: Iterable[GlitchtipProjectsV1]
+        self,
+        glitchtip_projects: Iterable[GlitchtipProjectsV1],
+        gjb_alert_url: str | None,
+        gjb_token: str | None,
     ) -> list[Organization]:
         organizations: dict[str, Organization] = {}
         for glitchtip_project in glitchtip_projects:
@@ -87,13 +90,13 @@ class GlitchtipProjectAlertsIntegration(
                 glitchtip_project.organization.name,
                 Organization(name=glitchtip_project.organization.name),
             )
-            project = Project(
-                name=glitchtip_project.name,
-                platform=None,
-                slug=glitchtip_project.project_id
-                if glitchtip_project.project_id
-                else "",
-                alerts=[
+            alerts = []
+            for alert in glitchtip_project.alerts or []:
+                if alert.name == GJB_ALERT_NAME:
+                    raise ValueError(
+                        f"'{GJB_ALERT_NAME}' alert name is reserved. Please use another name."
+                    )
+                alerts.append(
                     ProjectAlert(
                         name=alert.name,
                         timespan_minutes=alert.timespan_minutes,
@@ -103,8 +106,42 @@ class GlitchtipProjectAlertsIntegration(
                             for recp in alert.recipients
                         ],
                     )
-                    for alert in glitchtip_project.alerts or []
-                ],
+                )
+            if glitchtip_project.jira and gjb_alert_url:
+                if not (jira_project_key := glitchtip_project.jira.project):
+                    if glitchtip_project.jira.board:
+                        jira_project_key = glitchtip_project.jira.board.name
+
+                # this shouldn't happen, because our schemas enforce it
+                if not jira_project_key:
+                    raise ValueError(
+                        "Either jira.project or jira.board must be set for Jira integration"
+                    )
+
+                url = f"{gjb_alert_url}/{jira_project_key}"
+                if gjb_token:
+                    url += f"?token={quote(gjb_token)}"
+
+                alerts.append(
+                    ProjectAlert(
+                        name=GJB_ALERT_NAME,
+                        timespan_minutes=1,
+                        quantity=1,
+                        recipients=[
+                            ProjectAlertRecipient(
+                                recipient_type=RecipientType.WEBHOOK,
+                                url=url,
+                            )
+                        ],
+                    )
+                )
+            project = Project(
+                name=glitchtip_project.name,
+                platform=None,
+                slug=glitchtip_project.project_id
+                if glitchtip_project.project_id
+                else "",
+                alerts=alerts,
             )
 
             organization.projects.append(project)
@@ -199,7 +236,6 @@ class GlitchtipProjectAlertsIntegration(
 
     def run(self, dry_run: bool) -> None:
         gqlapi = gql.get_api()
-        read_timeout, max_retries, _ = get_glitchtip_settings()
         # data
         glitchtip_instances = glitchtip_instance_query(
             query_func=gqlapi.query
@@ -215,20 +251,29 @@ class GlitchtipProjectAlertsIntegration(
         for glitchtip_instance in glitchtip_instances:
             if self.params.instance and glitchtip_instance.name != self.params.instance:
                 continue
+            glitchtip_jira_bridge_token = (
+                self.secret_reader.read_secret(
+                    glitchtip_instance.glitchtip_jira_bridge_token
+                )
+                if glitchtip_instance.glitchtip_jira_bridge_token
+                else None
+            )
 
             glitchtip_client = GlitchtipClient(
                 host=glitchtip_instance.console_url,
                 token=self.secret_reader.read_secret(
                     glitchtip_instance.automation_token
                 ),
-                read_timeout=read_timeout,
-                max_retries=max_retries,
+                read_timeout=glitchtip_instance.read_timeout,
+                max_retries=glitchtip_instance.max_retries,
             )
             current_state = self.fetch_current_state(glitchtip_client=glitchtip_client)
             desired_state = self.fetch_desired_state(
                 glitchtip_projects=glitchtip_projects_by_instance[
                     glitchtip_instance.name
-                ]
+                ],
+                gjb_alert_url=glitchtip_instance.glitchtip_jira_bridge_alert_url,
+                gjb_token=glitchtip_jira_bridge_token,
             )
             self.reconcile(
                 glitchtip_client=glitchtip_client,

reconcile/glitchtip_project_dsn/integration.py

@@ -27,7 +27,6 @@ from reconcile.gql_definitions.glitchtip.glitchtip_project import (
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
-from reconcile.typed_queries.glitchtip_settings import get_glitchtip_settings
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
@@ -175,7 +174,6 @@ def run(
 ) -> None:
     # settings
     vault_settings = get_app_interface_vault_settings()
-    read_timeout, max_retries, _ = get_glitchtip_settings()
 
     # data
     gqlapi = gql.get_api()
@@ -208,8 +206,8 @@ def run(
         glitchtip_client = GlitchtipClient(
             host=glitchtip_instance.console_url,
             token=secret_reader.read_secret(glitchtip_instance.automation_token),
-            read_timeout=read_timeout,
-            max_retries=max_retries,
+            read_timeout=glitchtip_instance.read_timeout,
+            max_retries=glitchtip_instance.max_retries,
         )
         threaded.run(
             fetch_current_state,

reconcile/gql_definitions/glitchtip/glitchtip_instance.py

@@ -38,6 +38,13 @@ query GlitchtipInstance {
     automationToken {
       ...VaultSecret
     }
+    readTimeout
+    maxRetries
+    mailDomain
+    glitchtipJiraBridgeAlertUrl
+    glitchtipJiraBridgeToken {
+      ...VaultSecret
+    }
   }
 }
 """
@@ -54,6 +61,15 @@ class GlitchtipInstanceV1(ConfiguredBaseModel):
     console_url: str = Field(..., alias="consoleUrl")
     automation_user_email: VaultSecret = Field(..., alias="automationUserEmail")
     automation_token: VaultSecret = Field(..., alias="automationToken")
+    read_timeout: Optional[int] = Field(..., alias="readTimeout")
+    max_retries: Optional[int] = Field(..., alias="maxRetries")
+    mail_domain: Optional[str] = Field(..., alias="mailDomain")
+    glitchtip_jira_bridge_alert_url: Optional[str] = Field(
+        ..., alias="glitchtipJiraBridgeAlertUrl"
+    )
+    glitchtip_jira_bridge_token: Optional[VaultSecret] = Field(
+        ..., alias="glitchtipJiraBridgeToken"
+    )
 
 
 class GlitchtipInstanceQueryData(ConfiguredBaseModel):

reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py

@@ -56,6 +56,12 @@ query GlitchtipProjectsWithAlerts {
         }
       }
     }
+    jira {
+      project
+      board {
+        name
+      }
+    }
   }
 }
 """
@@ -103,11 +109,21 @@ class GlitchtipProjectAlertV1(ConfiguredBaseModel):
     ] = Field(..., alias="recipients")
 
 
+class JiraBoardV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
+class GlitchtipProjectJiraV1(ConfiguredBaseModel):
+    project: Optional[str] = Field(..., alias="project")
+    board: Optional[JiraBoardV1] = Field(..., alias="board")
+
+
 class GlitchtipProjectsV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     project_id: Optional[str] = Field(..., alias="projectId")
     organization: GlitchtipOrganizationV1 = Field(..., alias="organization")
     alerts: Optional[list[GlitchtipProjectAlertV1]] = Field(..., alias="alerts")
+    jira: Optional[GlitchtipProjectJiraV1] = Field(..., alias="jira")
 
 
 class GlitchtipProjectsWithAlertsQueryData(ConfiguredBaseModel):

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -56,14 +56,9 @@ class Renderer:
                 **namespace_selector
             )
             # Check if the target namespace is addressed by the selector
-            return (
-                len(
-                    get_namespaces_by_selector(
-                        namespaces=[subscriber.target_namespace],
-                        namespace_selector=selector,
-                    )
-                )
-                == 1
+            return is_namespace_addressed_by_selector(
+                namespace=subscriber.target_namespace,
+                namespace_selector=selector,
             )
         return target["namespace"]["$ref"] == subscriber.target_namespace.path
 
@@ -158,56 +153,33 @@ class Renderer:
         return f"[auto-promotion] event for channel(s) {channels}"
 
 
-def get_namespaces_by_selector(
-    namespaces: list[SaasTargetNamespace],
-    namespace_selector: SaasResourceTemplateTargetNamespaceSelectorV1,
-) -> list[SaasTargetNamespace]:
-    """
-    # TODO: for whatever reason tox fails to import this from saas_files.
-    Interestingly it works outside of tox, but to get going we simply
-    copy the function here - very bad style but works for now
+def _parse_expression(expression: str) -> Any:
+    try:
+        return parser.parse(expression)
+    except JsonPathParserError as e:
+        raise RuntimeError(
+            f"Invalid jsonpath expression in namespaceSelector '{expression}' :{e}"
+        )
 
-    Copy of reconcile.typed_queries.saas_files.get_namespaces_by_selector
-    """
 
-    # json representation of all the namespaces to filter on
+def is_namespace_addressed_by_selector(
+    namespace: SaasTargetNamespace,
+    namespace_selector: SaasResourceTemplateTargetNamespaceSelectorV1,
+) -> bool:
+    # json representation of namespace to filter on
     # remove all the None values to simplify the jsonpath expressions
-    namespaces_as_dict = {
-        "namespace": [ns.dict(by_alias=True, exclude_none=True) for ns in namespaces]
+    namespace_as_dict = {
+        "namespace": [namespace.dict(by_alias=True, exclude_none=True)]
     }
 
-    def _get_namespace_by_cluster_and_name(
-        cluster_name: str, name: str
-    ) -> SaasTargetNamespace:
-        for ns in namespaces:
-            if ns.cluster.name == cluster_name and ns.name == name:
-                return ns
-        # this should never ever happen - just make mypy happy
-        raise RuntimeError(f"namespace '{name}' not found in cluster '{cluster_name}'")
+    do_include = any(
+        _parse_expression(include).find(namespace_as_dict)
+        for include in namespace_selector.json_path_selectors.include or []
+    )
 
-    filtered_namespaces: dict[str, Any] = {}
+    do_exclude = any(
+        _parse_expression(exclude).find(namespace_as_dict)
+        for exclude in namespace_selector.json_path_selectors.exclude or []
+    )
 
-    try:
-        for include in namespace_selector.json_path_selectors.include:
-            for match in parser.parse(include).find(namespaces_as_dict):
-                cluster_name = match.value["cluster"]["name"]
-                ns_name = match.value["name"]
-                filtered_namespaces[
-                    f"{cluster_name}-{ns_name}"
-                ] = _get_namespace_by_cluster_and_name(cluster_name, ns_name)
-    except JsonPathParserError as e:
-        raise RuntimeError(
-            f"Invalid jsonpath expression in namespaceSelector '{include}' :{e}"
-        )
-
-    try:
-        for exclude in namespace_selector.json_path_selectors.exclude or []:
-            for match in parser.parse(exclude).find(namespaces_as_dict):
-                cluster_name = match.value["cluster"]["name"]
-                ns_name = match.value["name"]
-                filtered_namespaces.pop(f"{cluster_name}-{ns_name}", None)
-    except JsonPathParserError as e:
-        raise RuntimeError(
-            f"Invalid jsonpath expression in namespaceSelector '{exclude}' :{e}"
-        )
-    return list(filtered_namespaces.values())
+    return do_include and not do_exclude

reconcile/utils/glitchtip/client.py

@@ -31,12 +31,16 @@ def get_next_url(links: dict[str, dict[str, str]]) -> Optional[str]:
 
 class GlitchtipClient:  # pylint: disable=too-many-public-methods
     def __init__(
-        self, host: str, token: str, max_retries: int = 3, read_timeout: float = 30
+        self,
+        host: str,
+        token: str,
+        max_retries: int | None = None,
+        read_timeout: float | None = None,
     ) -> None:
         self.host = host
         self.token = token
-        self.max_retries = max_retries
-        self.read_timeout = read_timeout
+        self.max_retries = max_retries if max_retries is not None else 3
+        self.read_timeout = read_timeout if read_timeout is not None else 30
         self._thread_local = threading.local()
 
     @property

reconcile/gql_definitions/glitchtip/glitchtip_settings.py

@@ -1,70 +0,0 @@
-"""
-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 GlitchtipSettings {
-  settings: app_interface_settings_v1 {
-    glitchtip {
-      readTimeout
-      maxRetries
-      mailDomain
-    }
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union = True
-        extra = Extra.forbid
-
-
-class GlitchtipSettingsV1(ConfiguredBaseModel):
-    read_timeout: Optional[int] = Field(..., alias="readTimeout")
-    max_retries: Optional[int] = Field(..., alias="maxRetries")
-    mail_domain: Optional[str] = Field(..., alias="mailDomain")
-
-
-class AppInterfaceSettingsV1(ConfiguredBaseModel):
-    glitchtip: Optional[GlitchtipSettingsV1] = Field(..., alias="glitchtip")
-
-
-class GlitchtipSettingsQueryData(ConfiguredBaseModel):
-    settings: Optional[list[AppInterfaceSettingsV1]] = Field(..., alias="settings")
-
-
-def query(query_func: Callable, **kwargs: Any) -> GlitchtipSettingsQueryData:
-    """
-    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:
-        GlitchtipSettingsQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return GlitchtipSettingsQueryData(**raw_data)

reconcile/typed_queries/glitchtip_settings.py

@@ -1,18 +0,0 @@
-from reconcile.gql_definitions.glitchtip.glitchtip_settings import query
-from reconcile.utils import gql
-
-
-def get_glitchtip_settings(
-    read_timeout: int = 30, max_retries: int = 3, mail_domain: str = "redhat.com"
-) -> tuple[int, int, str]:
-    """Returns Glitchtip Settings."""
-    gqlapi = gql.get_api()
-    if _s := query(query_func=gqlapi.query).settings:
-        if _gs := _s[0].glitchtip:
-            if _gs.read_timeout is not None:
-                read_timeout = _gs.read_timeout
-            if _gs.max_retries is not None:
-                max_retries = _gs.max_retries
-            if _gs.mail_domain is not None:
-                mail_domain = _gs.mail_domain
-    return read_timeout, max_retries, mail_domain