qontract-reconcile 0.10.1rc882__py3-none-any.whl → 0.10.1rc884__py3-none-any.whl

{qontract_reconcile-0.10.1rc882.dist-info → qontract_reconcile-0.10.1rc884.dist-info}/METADATA

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

@@ -197,7 +197,7 @@ reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 reconcile/glitchtip/integration.py,sha256=SCfdllg0cywCyLKCA66yUm9Z_Sb8t5E0jDEKdwRk6HI,8372
 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=HI_HgvTTc2K-8Md0SpEBs6tOZ3CQm-AbOatbw_NrKqg,12425
+reconcile/glitchtip_project_alerts/integration.py,sha256=VFvKHso8CgsvRT8Bv5ASSehOtE39w8Cvy9SaNSgPIM0,13846
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=5c8RVIO3Wjz2kBfB52EmxZ6VP2JQ1rLGMM9lybNhdAE,8109
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -311,7 +311,7 @@ reconcile/gql_definitions/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 reconcile/gql_definitions/glitchtip/glitchtip_instance.py,sha256=QUfLhRkdE_-SorWgLBB8LHFD6kihbFwEoVByCLax3yM,2781
 reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=AojrkCDGbVjY0TOkfookz-9tqLA9txY7_xNdsWe174c,6004
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=pnkysdaQtdiVVxz9s7V8qttFygqcXOuXREd4LF7tCW8,4466
+reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=Pv6RcuIzpNmGc43eEq64nnKG0Dr7H0wjy5Xg1_oRltM,5197
 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
@@ -472,7 +472,7 @@ reconcile/terraform_init/integration.py,sha256=xcFKTc_or3xB3kE_I3OECNkkgbwALIwwd
 reconcile/terraform_init/merge_request.py,sha256=3CYtgSd7Q9zjKg4wsDz437EPCRfGeZZ8fZ0Y-ChKXJY,1475
 reconcile/terraform_init/merge_request_manager.py,sha256=fMcT6hbdEF3nFATJpvr8BedvQHq_MzFkgVJSloBNwOQ,3101
 reconcile/terraform_vpc_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/terraform_vpc_resources/integration.py,sha256=hQX5JWrC-MSwICs4FMJ_pbTa5eTQP6VrmE58z_XYclg,8204
+reconcile/terraform_vpc_resources/integration.py,sha256=evBNlUo5KwXoY3az7rOKaV3d7W578wRU2N98zJrKXYI,8209
 reconcile/terraform_vpc_resources/merge_request.py,sha256=loRymUigCIvaaT0s_NzktZchh-DGRQnCICdBSCAcFPY,1503
 reconcile/terraform_vpc_resources/merge_request_manager.py,sha256=Vj2nuQbQyrL4q_il1My-bLxYNh_r3YXqX45P8fwtP6Q,3259
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -702,7 +702,7 @@ reconcile/utils/sqs_gateway.py,sha256=gFl9DM4DmGnptuxTOe4lS3YTyE80eSAvK42ljS8h4d
 reconcile/utils/state.py,sha256=DRxzuOw3Iha-b2esBMjZTZ5K-OxfrGbkyEvpTT5xHTs,16369
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=mZEKpu6nbfiQd60wRkc8-5sljBTUTOgaAKnF89itMzU,32085
+reconcile/utils/terraform_client.py,sha256=XYtCz4af3BvJ6loDheOzDE6d4IZXOMFr4LCf2jqx3EU,32481
 reconcile/utils/terrascript_aws_client.py,sha256=msKley24-PiYt3lsPUNzKh2tpMj4MpGjF7lXFr0sBM0,276187
 reconcile/utils/three_way_diff_strategy.py,sha256=OniTnogBkdgy_7Xg51N1MgjS-Qtk8uM1ccjWaiXxiV8,4895
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -838,8 +838,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc882.dist-info/METADATA,sha256=h86zL76A3OqZCu_IiZB3FL-aoKD2jRhyQV3yAgRGVI8,2273
-qontract_reconcile-0.10.1rc882.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc882.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc882.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc882.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc884.dist-info/METADATA,sha256=9uV_JpZyviuoBDMGVALW8Dggyct-WRRrS6pEGcGUD00,2273
+qontract_reconcile-0.10.1rc884.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc884.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc884.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc884.dist-info/RECORD,,

reconcile/glitchtip_project_alerts/integration.py

@@ -123,30 +123,16 @@ class GlitchtipProjectAlertsIntegration(
                     )
                 )
             if glitchtip_project.jira and gjb_alert_url:
-                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[str]] = {}
+                token_params = {"token": gjb_token} if gjb_token else {}
+                alert_labels = glitchtip_project.jira.labels or []
 
-                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)}"
-                    )
+                if glitchtip_project.jira.project:
+                    params = {
+                        "labels": alert_labels,
+                        "components": glitchtip_project.jira.components or [],
+                    } | token_params
+                    url = f"{gjb_alert_url}/{glitchtip_project.jira.project}?{urlencode(params, True)}"
                     alerts.append(
                         ProjectAlert(
                             name=GJB_ALERT_NAME,
@@ -160,6 +146,47 @@ class GlitchtipProjectAlertsIntegration(
                             ],
                         )
                     )
+
+                elif (
+                    glitchtip_project.jira.escalation_policy
+                    and glitchtip_project.jira.escalation_policy.channels.jira_board
+                ):
+                    # definition via escalation policy
+                    channels = glitchtip_project.jira.escalation_policy.channels
+                    for board in channels.jira_board:
+                        if not integration_is_enabled(
+                            QONTRACT_INTEGRATION, board
+                        ) or not integration_is_enabled(
+                            jira_permissions_validator.QONTRACT_INTEGRATION, board
+                        ):
+                            continue
+                        params = {
+                            "labels": alert_labels + (channels.jira_labels or []),
+                            "components": [channels.jira_component]
+                            if channels.jira_component
+                            else [],
+                        } | token_params
+                        if board.issue_type:
+                            params["issue_type"] = board.issue_type
+                        url = f"{gjb_alert_url}/{board.name}?{urlencode(params, True)}"
+                        alerts.append(
+                            ProjectAlert(
+                                name=GJB_ALERT_NAME,
+                                timespan_minutes=1,
+                                quantity=1,
+                                recipients=[
+                                    ProjectAlertRecipient(
+                                        recipient_type=RecipientType.WEBHOOK,
+                                        url=url,
+                                    )
+                                ],
+                            )
+                        )
+                else:
+                    raise ValueError(
+                        "Jira integration requires either project or escalation policy to be set"
+                    )
+
             # check for duplicates
             if not webhook_urls_are_unique(alerts):
                 raise ValueError(

reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py

@@ -58,10 +58,18 @@ query GlitchtipProjectsWithAlerts {
     }
     jira {
       project
-      board {
-        name
-        disable {
-          integrations
+      components
+      escalationPolicy {
+        channels {
+          jiraBoard {
+            name
+            issueType
+            disable {
+              integrations
+            }
+          }
+          jiraComponent
+          jiraLabels
         }
       }
       labels
@@ -113,12 +121,24 @@ class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
 
 class JiraBoardV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    issue_type: Optional[str] = Field(..., alias="issueType")
     disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
 
 
+class AppEscalationPolicyChannelsV1(ConfiguredBaseModel):
+    jira_board: list[JiraBoardV1] = Field(..., alias="jiraBoard")
+    jira_component: Optional[str] = Field(..., alias="jiraComponent")
+    jira_labels: Optional[list[str]] = Field(..., alias="jiraLabels")
+
+
+class AppEscalationPolicyV1(ConfiguredBaseModel):
+    channels: AppEscalationPolicyChannelsV1 = Field(..., alias="channels")
+
+
 class GlitchtipProjectJiraV1(ConfiguredBaseModel):
     project: Optional[str] = Field(..., alias="project")
-    board: Optional[JiraBoardV1] = Field(..., alias="board")
+    components: Optional[list[str]] = Field(..., alias="components")
+    escalation_policy: Optional[AppEscalationPolicyV1] = Field(..., alias="escalationPolicy")
     labels: Optional[list[str]] = Field(..., alias="labels")
 
 

reconcile/terraform_vpc_resources/integration.py

@@ -164,7 +164,7 @@ class TerraformVpcResources(QontractReconcileIntegration[TerraformVpcResourcesPa
             thread_pool_size=thread_pool_size,
         )
 
-        tf_client.plan(enable_deletion=enable_deletion)
+        tf_client.safe_plan(enable_deletion=enable_deletion)
 
         if dry_run:
             sys.exit(ExitCodes.SUCCESS)

reconcile/utils/terraform_client.py

@@ -209,6 +209,15 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             self.created_users.extend(created_users)
         return disabled_deletions_detected, errors
 
+    def safe_plan(self, enable_deletion: bool) -> None:
+        """Raises exception if errors are detected at plan step"""
+        disable_deletions_detected, errors = self.plan(enable_deletion)
+
+        if errors:
+            raise RuntimeError("Terraform plan has errors")
+        if disable_deletions_detected:
+            raise RuntimeError("Terraform plan has disabled deletions detected")
+
     @retry()
     def terraform_plan(
         self, spec: TerraformSpec, enable_deletion: bool