qontract-reconcile 0.10.1rc737__py3-none-any.whl → 0.10.1rc739__py3-none-any.whl

{qontract_reconcile-0.10.1rc737.dist-info → qontract_reconcile-0.10.1rc739.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 reconcile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/acs_notifiers.py,sha256=1UBRTGsLrMUxpgm3WGceNyCmY9MZwUht4t26eIMWOLU,5589
-reconcile/acs_policies.py,sha256=1iRYmMdz0YtqyQgA9O0uGQdmMKUCCe-ApRa6LIEAdps,8769
+reconcile/acs_notifiers.py,sha256=YIV9TrgWjBD8nFbrBvvU8-9s-AdezY4X5t90bFROCtM,4451
+reconcile/acs_policies.py,sha256=xNbhIlwE1u2URbEQcX-3C-pTu--XjrKAqGj0-Wd85dY,9152
 reconcile/acs_rbac.py,sha256=JEDevU4AdhTjMW-fAnNG3iw6Od5tYxGuYSirmu9KurI,22657
 reconcile/aws_ami_share.py,sha256=eeu0TI3M5yyUaozyAq_aW3tir-9be4YFguOXvIvKHSo,3757
 reconcile/aws_ecr_image_pull_secrets.py,sha256=TGEc_0nv8oxV2HqA8VdcM4HHP-B1YqmNOOU6FPwVFTY,2328
@@ -186,7 +186,7 @@ reconcile/glitchtip_project_dsn/integration.py,sha256=qt2a33FOUUlCyonSHm3nUb7pNX
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
-reconcile/gql_definitions/acs/acs_policies.py,sha256=negfb87RDVH7WT1qiouD8ywfgH4Iumsv9Q2bf9rbjcA,7089
+reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
 reconcile/gql_definitions/acs/acs_rbac.py,sha256=cZsIlCWliPQdQHgmBsIMx54fJNOtkdRXLzmOKZmJNHk,3009
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=zrZCHaxkffdX2bvFUt1Hd_czViI3v3FPhZz5vJQ73jI,4301
@@ -434,8 +434,8 @@ reconcile/terraform_init/merge_request_manager.py,sha256=fMcT6hbdEF3nFATJpvr8Bed
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/conftest.py,sha256=rQousYrxUz-EwAIbsYO6bIwR1B4CrOz9y_zaUVo2lfI,4466
 reconcile/test/fixtures.py,sha256=9SDWAUlSd1rCx7z3GhULHcpr-I6FyCsXxaFAZIqYQsQ,591
-reconcile/test/test_acs_notifiers.py,sha256=LIVXu7EBlfKh5CWgR5jcA0vJ4IhUtxkZM6-1im204rc,12865
-reconcile/test/test_acs_policies.py,sha256=9TPGbF4mS2B18S7ldibZrugztaTQvcrBFvzs5eXbN-E,19211
+reconcile/test/test_acs_notifiers.py,sha256=xf3WL6q6V7KQdTVSx6YI-pa4yzOX3mkvIJomgPUc3Mw,12746
+reconcile/test/test_acs_policies.py,sha256=8pwnXpAO-0OI-6oubjf_oPPlpZjVldeZfJJ9uhsNMWM,17579
 reconcile/test/test_acs_rbac.py,sha256=lvNd8GY0-GHzcOdOn13QWdrqbBXXKzNT7EEDHNH7cjM,28272
 reconcile/test/test_aggregated_list.py,sha256=iiWitQuNYC58aimWaiBoE4NROHjr1NCgQ91MnHEG_Ro,6412
 reconcile/test/test_amtool.py,sha256=vxRhGieeydMBOb9UI2ziMHjJa8puMeGNsUhGhy-yMnk,1032
@@ -666,7 +666,7 @@ reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO6
 reconcile/utils/vcs.py,sha256=o1r0n_IrU2El75CED_6sjR2GZGM-exuWsj5F7jONaMU,6779
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=kjcxLGIMe8oLNFOxZ_bDcClFqGCL7Auwug5is0yNGbw,2555
-reconcile/utils/acs/notifiers.py,sha256=LfWw9LGq7hA90A69n8Ie9f-NozvCGdYwXEXRLIc17rY,3735
+reconcile/utils/acs/notifiers.py,sha256=2n5blP9N1FdGLZuy3do9bpjd8NKg88kmLNNqhAGn8w4,5013
 reconcile/utils/acs/policies.py,sha256=_jAz6cv8KRYtDsXjGoJgNbD8_9PUa5LSwwVlpK4A_cQ,5505
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -777,8 +777,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.1rc737.dist-info/METADATA,sha256=cSDUzKY1nBbpIuGIWfYeQyeIlIvmyU8slP8iVQOiR7Q,2382
-qontract_reconcile-0.10.1rc737.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc737.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc737.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc737.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc739.dist-info/METADATA,sha256=ppwPtbo2DwU3cf6Sl4VRGILrpth1zVtdcQD2eDU70zY,2382
+qontract_reconcile-0.10.1rc739.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc739.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc739.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc739.dist-info/RECORD,,

reconcile/acs_notifiers.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Any
 
 import reconcile.gql_definitions.acs.acs_policies as gql_acs_policies
 from reconcile.gql_definitions.jira.jira_servers import (
@@ -13,7 +12,6 @@ from reconcile.utils.acs.notifiers import (
     AcsNotifiersApi,
     JiraCredentials,
     JiraNotifier,
-    SeverityPriorityMapping,
 )
 from reconcile.utils.differ import diff_iterables
 from reconcile.utils.disabled_integrations import integration_is_enabled
@@ -53,43 +51,11 @@ class AcsNotifiersIntegration(QontractReconcileIntegration[NoParams]):
             }.values()
         )
 
-    def _build_jira_notifier(
-        self, escalation_policy: gql_acs_policies.AppEscalationPolicyV1
-    ) -> JiraNotifier:
-        jira_board = escalation_policy.channels.jira_board[0]
-
-        custom_fields: dict[str, Any] = {}
-        if jira_board.issue_security_id:
-            custom_fields["security"] = {"id": jira_board.issue_security_id}
-        if escalation_policy.channels.jira_component:
-            custom_fields["components"] = [
-                {"name": escalation_policy.channels.jira_component}
-            ]
-        if escalation_policy.channels.jira_labels:
-            custom_fields["labels"] = escalation_policy.channels.jira_labels
-
-        item = JiraNotifier(
-            name=f"jira-{escalation_policy.name}",
-            board=jira_board.name,
-            url=jira_board.server.server_url,
-            issue_type=jira_board.issue_type or "Task",
-            severity_priority_mappings=sorted(
-                [
-                    SeverityPriorityMapping(**vars(sp))
-                    for sp in jira_board.severity_priority_mappings.mappings
-                ],
-                key=lambda m: m.severity,
-            ),
-            custom_fields=custom_fields,
-        )
-
-        return item
-
     def get_desired_state(
         self, acs_policies: list[gql_acs_policies.AcsPolicyV1]
     ) -> list[JiraNotifier]:
         return [
-            self._build_jira_notifier(ep)
+            JiraNotifier.from_escalation_policy(ep)
             for ep in self._get_escalation_policies(acs_policies)
         ]
 
@@ -152,5 +118,9 @@ class AcsNotifiersIntegration(QontractReconcileIntegration[NoParams]):
         ) as acs_api:
             current_state = acs_api.get_jira_notifiers()
             self.reconcile(
-                desired_state, current_state, acs_api, jira_credentials, dry_run
+                current_state=current_state,
+                desired_state=desired_state,
+                acs_api=acs_api,
+                jira_credentials=jira_credentials,
+                dry_run=dry_run,
             )

reconcile/acs_policies.py

@@ -8,6 +8,7 @@ from reconcile.gql_definitions.acs.acs_policies import (
     AcsPolicyV1,
 )
 from reconcile.utils import gql
+from reconcile.utils.acs.notifiers import JiraNotifier
 from reconcile.utils.acs.policies import AcsPolicyApi, Policy, PolicyCondition, Scope
 from reconcile.utils.differ import diff_iterables
 from reconcile.utils.runtime.integration import (
@@ -62,12 +63,21 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
         conditions = [
             pc for c in gql_policy.conditions if (pc := self._build_policy_condition(c))
         ]
+        jira_notifier = (
+            notifier_name_to_id.get(
+                JiraNotifier.from_escalation_policy(
+                    gql_policy.integrations.notifiers.jira.escalation_policy
+                ).name
+            )
+            if gql_policy.integrations
+            and gql_policy.integrations.notifiers
+            and gql_policy.integrations.notifiers.jira
+            else None
+        )
         return Policy(
             name=gql_policy.name,
             description=gql_policy.description,
-            notifiers=sorted([notifier_name_to_id[n] for n in gql_policy.notifiers])
-            if gql_policy.notifiers
-            else [],
+            notifiers=[jira_notifier] if jira_notifier else [],
             severity=f"{gql_policy.severity.upper()}_SEVERITY",  # align with acs api severity value format
             scope=sorted(
                 [

reconcile/gql_definitions/acs/acs_policies.py

@@ -24,7 +24,6 @@ query AcsPolicy {
    	name
     description
     severity
-    notifiers
     integrations {
       notifiers {
         jira {
@@ -211,7 +210,6 @@ class AcsPolicyV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     description: Optional[str] = Field(..., alias="description")
     severity: str = Field(..., alias="severity")
-    notifiers: Optional[list[str]] = Field(..., alias="notifiers")
     integrations: Optional[AcsPolicyIntegrationsV1] = Field(..., alias="integrations")
     categories: list[str] = Field(..., alias="categories")
     scope: Union[AcsPolicyScopeClusterV1, AcsPolicyScopeNamespaceV1, AcsPolicyScopeV1] = Field(..., alias="scope")

reconcile/test/test_acs_notifiers.py

@@ -283,7 +283,6 @@ def acs_policies(
             name="acs-policy-1",
             description="CVEs within app-sre clusters with CVSS score gte to 7 and fixable",
             severity="high",
-            notifiers=[],
             integrations=AcsPolicyIntegrationsV1(
                 notifiers=AcsPolicyIntegrationNotifiersV1(
                     jira=AcsPolicyIntegrationNotifierJiraV1(
@@ -302,7 +301,6 @@ def acs_policies(
             name="acs-policy-2",
             description="image security policy violations of critical severity within app-sre namespaces",
             severity="critical",
-            notifiers=[],
             integrations=AcsPolicyIntegrationsV1(
                 notifiers=AcsPolicyIntegrationNotifiersV1(
                     jira=AcsPolicyIntegrationNotifierJiraV1(
@@ -332,15 +330,11 @@ def test_integration_get_escalation_policies(
     assert result[0] == escalation_policy
 
 
-def test_build_jira_notifier(
-    acs_notifier_integration: AcsNotifiersIntegration,
+def test_build_jira_notifier_from_ecalation_policy(
     escalation_policy: AppEscalationPolicyV1,
     jira_notifier: JiraNotifier,
 ) -> None:
-    assert (
-        acs_notifier_integration._build_jira_notifier(escalation_policy)
-        == jira_notifier
-    )
+    assert JiraNotifier.from_escalation_policy(escalation_policy) == jira_notifier
 
 
 def test_get_desired_state(

reconcile/test/test_acs_policies.py

@@ -37,7 +37,7 @@ CUSTOM_POLICY_ONE_NAME = "app-sre-clusters-fixable-cve-7-fixable"
 CUSTOM_POLICY_ONE_ID = "365d4e71-3241-4448-9f3d-eb0eed1c1820"
 CUSTOM_POLICY_TWO_NAME = "app-sre-namespaces-severity-critical"
 CUSTOM_POLICY_TWO_ID = "2200245e-b700-46c2-8793-3e437fca6aa0"
-JIRA_NOTIFIER_NAME = "app-sre-jira"
+JIRA_NOTIFIER_NAME = "jira-test-ep"
 JIRA_NOTIFIER_ID = "54170627-da34-40cb-839a-af9fbeac10fb"
 
 
@@ -49,12 +49,11 @@ def query_data_desired_state() -> AcsPolicyQueryData:
                 name=CUSTOM_POLICY_ONE_NAME,
                 description="CVEs within app-sre clusters with CVSS score gte to 7 and fixable",
                 severity="high",
-                notifiers=[JIRA_NOTIFIER_NAME],
                 integrations=AcsPolicyIntegrationsV1(
                     notifiers=AcsPolicyIntegrationNotifiersV1(
                         jira=AcsPolicyIntegrationNotifierJiraV1(
                             escalationPolicy=AppEscalationPolicyV1(
-                                name="test-ep",
+                                name=JIRA_NOTIFIER_NAME.replace("jira-", ""),
                                 channels=AppEscalationPolicyChannelsV1(
                                     jiraBoard=[
                                         JiraBoardV1(
@@ -99,37 +98,7 @@ def query_data_desired_state() -> AcsPolicyQueryData:
                 name=CUSTOM_POLICY_TWO_NAME,
                 description="image security policy violations of critical severity within app-sre namespaces",
                 severity="critical",
-                notifiers=[],
-                integrations=AcsPolicyIntegrationsV1(
-                    notifiers=AcsPolicyIntegrationNotifiersV1(
-                        jira=AcsPolicyIntegrationNotifierJiraV1(
-                            escalationPolicy=AppEscalationPolicyV1(
-                                name="test-ep",
-                                channels=AppEscalationPolicyChannelsV1(
-                                    jiraBoard=[
-                                        JiraBoardV1(
-                                            name="board",
-                                            server=JiraServerV1(
-                                                serverUrl="server",
-                                            ),
-                                            severityPriorityMappings=JiraSeverityPriorityMappingsV1(
-                                                name="sp",
-                                                mappings=[],
-                                            ),
-                                            issueType="Task",
-                                            issueSecurityId="0",
-                                            disable=DisableJiraBoardAutomationsV1(
-                                                integrations=[]
-                                            ),
-                                        )
-                                    ],
-                                    jiraComponent="",
-                                    jiraLabels=[],
-                                ),
-                            ),
-                        ),
-                    ),
-                ),
+                integrations=None,
                 categories=["vulnerability-management", "devops-best-practices"],
                 scope=AcsPolicyScopeNamespaceV1(
                     level="namespace",

reconcile/utils/acs/notifiers.py

@@ -3,6 +3,7 @@ from typing import Any, Optional
 
 from pydantic import BaseModel
 
+from reconcile.gql_definitions.acs.acs_policies import AppEscalationPolicyV1
 from reconcile.utils.acs.base import AcsBaseApi
 
 
@@ -74,6 +75,37 @@ class JiraNotifier(BaseModel):
             },
         }
 
+    @staticmethod
+    def from_escalation_policy(
+        escalation_policy: AppEscalationPolicyV1,
+    ) -> "JiraNotifier":
+        jira_board = escalation_policy.channels.jira_board[0]
+
+        custom_fields: dict[str, Any] = {}
+        if jira_board.issue_security_id:
+            custom_fields["security"] = {"id": jira_board.issue_security_id}
+        if escalation_policy.channels.jira_component:
+            custom_fields["components"] = [
+                {"name": escalation_policy.channels.jira_component}
+            ]
+        if escalation_policy.channels.jira_labels:
+            custom_fields["labels"] = escalation_policy.channels.jira_labels
+
+        return JiraNotifier(
+            name=f"jira-{escalation_policy.name}",
+            board=jira_board.name,
+            url=jira_board.server.server_url,
+            issue_type=jira_board.issue_type or "Task",
+            severity_priority_mappings=sorted(
+                [
+                    SeverityPriorityMapping(**vars(sp))
+                    for sp in jira_board.severity_priority_mappings.mappings
+                ],
+                key=lambda m: m.severity,
+            ),
+            custom_fields=custom_fields,
+        )
+
 
 class AcsNotifiersApi(AcsBaseApi):
     """