qontract-reconcile 0.10.1rc786__py3-none-any.whl → 0.10.1rc788__py3-none-any.whl

{qontract_reconcile-0.10.1rc786.dist-info → qontract_reconcile-0.10.1rc788.dist-info}/METADATA

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

@@ -186,12 +186,12 @@ reconcile/external_resources/metrics.py,sha256=m2TIOao2N7pD6k45driFbBGVCC_N7ai44
 reconcile/external_resources/model.py,sha256=FJUb7rHU2l7YSAv-t4QaacL9pqheFBxhPydWSPqu3vY,7413
 reconcile/external_resources/reconciler.py,sha256=E50X_lnOD0OWYXMzyZld1P6dCFJFYjHGyICWff9bxlc,9323
 reconcile/external_resources/secrets_sync.py,sha256=g-ksvzmTlCTwo3PM3FgYXm0LUBcnwfAxcvisuR1jAMY,7982
-reconcile/external_resources/state.py,sha256=V1lpgr0SmESA_x_MAk_tz3GCH9bfzvNmA21u6jHlGzU,9332
+reconcile/external_resources/state.py,sha256=LrZ_-9DRmKOdPlYgxgaYlGAOa6lzKDgcmn-Zc4AQDX0,9333
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip/integration.py,sha256=Y7ofQg_xCt3dOln3pjeXp7rAnwohCgD2zcUAb-Hciis,8375
 reconcile/glitchtip/reconciler.py,sha256=nUvDv7qG1ly0cA16MmlL6NV71yl1mJYLT2mui7lmi0Y,12402
 reconcile/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip_project_alerts/integration.py,sha256=ADOAUysOF2iY3hVPa2xoCQPts-ydRjy_bISxaMFIxlY,11953
+reconcile/glitchtip_project_alerts/integration.py,sha256=EJBZJldOyK_ECAfgr1RjxabtsVRIBbZcW-7JU4cwVsA,12429
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=qt2a33FOUUlCyonSHm3nUb7pNXgLAq8sv_JQCm6Vj3U,8113
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -297,7 +297,7 @@ reconcile/gql_definitions/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 reconcile/gql_definitions/glitchtip/glitchtip_instance.py,sha256=VLtAz0MQOdioh3K0viBOvDS-irrEFNnvqD6qxwG8n3M,2710
 reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=oFijq1LIQysUM-IOyNUjxVZgRD93NK12lNvJuBq4vjE,6008
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=9gtwIyJOuhM6u-aIIsU2KEobG_aoAEhSsIGM-gkFrqM,4201
+reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=tZhSFb5eIIc5BOgMPQeV9tEwrVu1MnrxaQ5pQ0zEKk4,4468
 reconcile/gql_definitions/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/integrations/integrations.py,sha256=LfpgVbCCCk20ohwP5pDea5fwxMFGrcgE6J_WHBuGqek,11595
 reconcile/gql_definitions/jenkins_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -785,8 +785,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc786.dist-info/METADATA,sha256=zg_8UE4AWFXth3D4RUmhNeKdk5Qr0zu7CfO_FeJ35MQ,2364
-qontract_reconcile-0.10.1rc786.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc786.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc786.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc786.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc788.dist-info/METADATA,sha256=35KzCcK2CjxIE0CCyx17qxBc0-537HWxpoFAL42iIwI,2364
+qontract_reconcile-0.10.1rc788.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc788.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc788.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc788.dist-info/RECORD,,

reconcile/external_resources/state.py

@@ -224,7 +224,7 @@ class ExternalResourcesStateDynamoDB:
         to check if a resource has been removed from the configuration.
         Getting less data from DynamoDb saves money and the logic does not need it.
         """
-        logging.info("Getting Managed resources from DynamoDb")
+        logging.debug("Getting Managed resources from DynamoDb")
         partials = {}
         for item in self.aws_api.dynamodb.boto3_client.scan(
             TableName=self._table, ProjectionExpression=self.PARTIALS_PROJECTED_VALUES

reconcile/glitchtip_project_alerts/integration.py

@@ -10,6 +10,7 @@ from typing import (
 )
 from urllib.parse import urlencode
 
+from reconcile import jira_permissions_validator
 from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
     query as glitchtip_instance_query,
 )
@@ -24,6 +25,7 @@ from reconcile.gql_definitions.glitchtip_project_alerts.glitchtip_project import
 )
 from reconcile.utils import gql
 from reconcile.utils.differ import diff_iterables
+from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.glitchtip.client import GlitchtipClient
 from reconcile.utils.glitchtip.models import (
     Organization,
@@ -121,35 +123,43 @@ class GlitchtipProjectAlertsIntegration(
                     )
                 )
             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"
+                jira_project_key = None
+                if glitchtip_project.jira.project:
+                    jira_project_key = glitchtip_project.jira.project
+                elif (
+                    glitchtip_project.jira.board
+                    and integration_is_enabled(
+                        QONTRACT_INTEGRATION, glitchtip_project.jira.board
+                    )
+                    and integration_is_enabled(
+                        jira_permissions_validator.QONTRACT_INTEGRATION,
+                        glitchtip_project.jira.board,
                     )
+                ):
+                    jira_project_key = glitchtip_project.jira.board.name
 
-                params: dict[str, str | list] = {}
-                if gjb_token:
-                    params["token"] = gjb_token
-                if glitchtip_project.jira.labels:
-                    params["labels"] = glitchtip_project.jira.labels
-                url = f"{gjb_alert_url}/{jira_project_key}?{urlencode(params, True)}"
-                alerts.append(
-                    ProjectAlert(
-                        name=GJB_ALERT_NAME,
-                        timespan_minutes=1,
-                        quantity=1,
-                        recipients=[
-                            ProjectAlertRecipient(
-                                recipient_type=RecipientType.WEBHOOK,
-                                url=url,
-                            )
-                        ],
+                if jira_project_key:
+                    params: dict[str, str | list] = {}
+                    if gjb_token:
+                        params["token"] = gjb_token
+                    if glitchtip_project.jira.labels:
+                        params["labels"] = glitchtip_project.jira.labels
+                    url = (
+                        f"{gjb_alert_url}/{jira_project_key}?{urlencode(params, True)}"
+                    )
+                    alerts.append(
+                        ProjectAlert(
+                            name=GJB_ALERT_NAME,
+                            timespan_minutes=1,
+                            quantity=1,
+                            recipients=[
+                                ProjectAlertRecipient(
+                                    recipient_type=RecipientType.WEBHOOK,
+                                    url=url,
+                                )
+                            ],
+                        )
                     )
-                )
             # check for duplicates
             if not webhook_urls_are_unique(alerts):
                 raise ValueError(

reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py

@@ -60,6 +60,9 @@ query GlitchtipProjectsWithAlerts {
       project
       board {
         name
+        disable {
+          integrations
+        }
       }
       labels
     }
@@ -104,8 +107,13 @@ class GlitchtipProjectAlertV1(ConfiguredBaseModel):
     recipients: list[Union[GlitchtipProjectAlertRecipientWebhookV1, GlitchtipProjectAlertRecipientEmailV1, GlitchtipProjectAlertRecipientV1]] = Field(..., alias="recipients")
 
 
+class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
+    integrations: Optional[list[str]] = Field(..., alias="integrations")
+
+
 class JiraBoardV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
 
 
 class GlitchtipProjectJiraV1(ConfiguredBaseModel):