qontract-reconcile 0.10.2.dev185__py3-none-any.whl → 0.10.2.dev186__py3-none-any.whl

{qontract_reconcile-0.10.2.dev185.dist-info → qontract_reconcile-0.10.2.dev186.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev185
+Version: 0.10.2.dev186
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -99,7 +99,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
 `qontract-reconcile` includes the following integrations:
 
 ```text
-  acs-notifiers                   Manages RHACS notifier configurations
   acs-policies                    Manages RHACS security policy configurations
   acs-rbac                        Manages RHACS rbac configuration
   advanced-upgrade-scheduler      Manage Cluster Upgrade Policy schedules in

{qontract_reconcile-0.10.2.dev185.dist-info → qontract_reconcile-0.10.2.dev186.dist-info}/RECORD

@@ -1,6 +1,5 @@
 reconcile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/acs_notifiers.py,sha256=YIV9TrgWjBD8nFbrBvvU8-9s-AdezY4X5t90bFROCtM,4451
-reconcile/acs_policies.py,sha256=xNbhIlwE1u2URbEQcX-3C-pTu--XjrKAqGj0-Wd85dY,9152
+reconcile/acs_policies.py,sha256=pwFKP3afmRbpRq-7FRAosI-A60yfufE2vvXBjOMgsCU,8653
 reconcile/acs_rbac.py,sha256=15vNfNzdG_DeXaJ-f5m8DSaJh__LUK766_xAECqyTsg,22657
 reconcile/aws_ami_share.py,sha256=M_gT7y3cSAyT_Pm90PBCNDSmbZtqREqe2jNETh0i9Qs,3808
 reconcile/aws_ecr_image_pull_secrets.py,sha256=F58PtX1GlB9XHqj8hGy9ItiTznXLAAKTNlWD9iT2MWI,2593
@@ -10,7 +9,7 @@ reconcile/aws_iam_password_reset.py,sha256=O0JX2N5kNRKs3u2xzu4NNrI6p0ag5JWy3MTsv
 reconcile/aws_support_cases_sos.py,sha256=PDhilxQ4TBxVnxUPIUdTbKEaNUI0wzPiEsB91oHT2fY,3384
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=xyVnxNyq3IPISWwFlB9j4HAFjowXYv3EdsEGIMFhTy0,108438
+reconcile/cli.py,sha256=-WTtuEtxDuHdZ-GIGtklu4p6r8YdR7QfRqdK6rHl2gY,108163
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=al7m8EgnnYx90rY1REryW3byN_ItfJfAzEeLtjbCfi0,4921
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4767
@@ -230,7 +229,7 @@ reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 reconcile/gql_definitions/introspection.json,sha256=MT1HCR90ZahZxjrgaBEp34JNhjaEiDRblQK-qfSrfF0,2316277
 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=9IFpGAcrZ8nTFC05q3-12nwkNOEkquHB2-XbVq5_jy4,7219
+reconcile/gql_definitions/acs/acs_policies.py,sha256=Ygpfl2-VkYLSlJvHgp_dJBfb66K_Rwfdfpsa18w1v1s,4338
 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=230uwBoBaaVz686d_WNZT9eAw6BX2VpoQX0mKhf5UcM,4390
@@ -675,7 +674,6 @@ reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5
 reconcile/utils/vcs.py,sha256=AK35vIjx9bXYclKmvNekpaG_OETt-ZybibwV-m123xc,10186
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2532
-reconcile/utils/acs/notifiers.py,sha256=DlzTDM9arWQlBSiDy70y5Mf38OKVs9V0FzFe2LfOKXA,5046
 reconcile/utils/acs/policies.py,sha256=jpbi3qpGkBD_X6MfzsX12dPajUbmACmhIOz_0rDvYzs,5489
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -807,7 +805,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev185.dist-info/METADATA,sha256=-GBtujthD8qi9Bdj1oIRUOc5iAeTf-Xa5Lp5jpTyTPE,24627
-qontract_reconcile-0.10.2.dev185.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev185.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev185.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev186.dist-info/METADATA,sha256=0hGybBCljHc9z_10Wcq6RvjgFFVSF7GPG9w5yhdMTTM,24555
+qontract_reconcile-0.10.2.dev186.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev186.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev186.dist-info/RECORD,,

reconcile/acs_policies.py

@@ -8,7 +8,6 @@ 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 (
@@ -63,21 +62,10 @@ 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=[jira_notifier] if jira_notifier else [],
+            notifiers=[],
             severity=f"{gql_policy.severity.upper()}_SEVERITY",  # align with acs api severity value format
             scope=sorted(
                 [

reconcile/cli.py

@@ -3719,17 +3719,6 @@ def acs_policies(ctx):
     )
 
 
-@integration.command(short_help="Manages RHACS notifier configurations")
-@click.pass_context
-def acs_notifiers(ctx):
-    from reconcile import acs_notifiers
-
-    run_class_integration(
-        integration=acs_notifiers.AcsNotifiersIntegration(),
-        ctx=ctx.obj,
-    )
-
-
 @integration.command(short_help="Manage Unleash feature toggles.")
 @click.option("--instance", help="Reconcile just this Unlash instance.", default=None)
 @click.pass_context

reconcile/gql_definitions/acs/acs_policies.py

@@ -24,40 +24,6 @@ query AcsPolicy {
     name
     description
     severity
-    integrations {
-      notifiers {
-        jira {
-          escalationPolicy {
-            name
-            channels {
-              jiraBoard {
-                name
-                server {
-                  serverUrl
-                }
-                severityPriorityMappings {
-                  name
-                  mappings {
-                    severity
-                    priority
-                  }
-                }
-                issueType
-                issueFields {
-                  name
-                  value
-                }
-                disable {
-                  integrations
-                }
-              }
-              jiraComponent
-              jiraLabels
-            }
-          }
-        }
-      }
-    }
     categories
     scope {
       level
@@ -107,61 +73,6 @@ class ConfiguredBaseModel(BaseModel):
         extra=Extra.forbid
 
 
-class JiraServerV1(ConfiguredBaseModel):
-    server_url: str = Field(..., alias="serverUrl")
-
-
-class SeverityPriorityMappingV1(ConfiguredBaseModel):
-    severity: str = Field(..., alias="severity")
-    priority: str = Field(..., alias="priority")
-
-
-class JiraSeverityPriorityMappingsV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    mappings: list[SeverityPriorityMappingV1] = Field(..., alias="mappings")
-
-
-class JiraBoardIssueFieldV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    value: str = Field(..., alias="value")
-
-
-class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
-    integrations: Optional[list[str]] = Field(..., alias="integrations")
-
-
-class JiraBoardV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    server: JiraServerV1 = Field(..., alias="server")
-    severity_priority_mappings: JiraSeverityPriorityMappingsV1 = Field(..., alias="severityPriorityMappings")
-    issue_type: Optional[str] = Field(..., alias="issueType")
-    issue_fields: Optional[list[JiraBoardIssueFieldV1]] = Field(..., alias="issueFields")
-    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):
-    name: str = Field(..., alias="name")
-    channels: AppEscalationPolicyChannelsV1 = Field(..., alias="channels")
-
-
-class AcsPolicyIntegrationNotifierJiraV1(ConfiguredBaseModel):
-    escalation_policy: AppEscalationPolicyV1 = Field(..., alias="escalationPolicy")
-
-
-class AcsPolicyIntegrationNotifiersV1(ConfiguredBaseModel):
-    jira: Optional[AcsPolicyIntegrationNotifierJiraV1] = Field(..., alias="jira")
-
-
-class AcsPolicyIntegrationsV1(ConfiguredBaseModel):
-    notifiers: Optional[AcsPolicyIntegrationNotifiersV1] = Field(..., alias="notifiers")
-
-
 class AcsPolicyScopeV1(ConfiguredBaseModel):
     level: str = Field(..., alias="level")
 
@@ -218,7 +129,6 @@ class AcsPolicyV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     description: Optional[str] = Field(..., alias="description")
     severity: str = Field(..., alias="severity")
-    integrations: Optional[AcsPolicyIntegrationsV1] = Field(..., alias="integrations")
     categories: list[str] = Field(..., alias="categories")
     scope: Union[AcsPolicyScopeClusterV1, AcsPolicyScopeNamespaceV1, AcsPolicyScopeV1] = Field(..., alias="scope")
     conditions: list[Union[AcsPolicyConditionsCvssV1, AcsPolicyConditionsSeverityV1, AcsPolicyConditionsImageTagV1, AcsPolicyConditionsCveV1, AcsPolicyConditionsImageAgeV1, AcsPolicyConditionsV1]] = Field(..., alias="conditions")

reconcile/acs_notifiers.py

@@ -1,126 +0,0 @@
-import logging
-
-import reconcile.gql_definitions.acs.acs_policies as gql_acs_policies
-from reconcile.gql_definitions.jira.jira_servers import (
-    JiraServerV1,
-)
-from reconcile.gql_definitions.jira.jira_servers import (
-    query as query_jira_servers,
-)
-from reconcile.utils import gql
-from reconcile.utils.acs.notifiers import (
-    AcsNotifiersApi,
-    JiraCredentials,
-    JiraNotifier,
-)
-from reconcile.utils.differ import diff_iterables
-from reconcile.utils.disabled_integrations import integration_is_enabled
-from reconcile.utils.runtime.integration import (
-    NoParams,
-    QontractReconcileIntegration,
-)
-from reconcile.utils.semver_helper import make_semver
-
-
-class AcsNotifiersIntegration(QontractReconcileIntegration[NoParams]):
-    def __init__(self) -> None:
-        super().__init__(NoParams())
-        self.qontract_integration = "acs-notifiers"
-        self.qontract_integration_version = make_semver(0, 1, 0)
-
-    @property
-    def name(self) -> str:
-        return self.qontract_integration
-
-    def _get_escalation_policies(
-        self, acs_policies: list[gql_acs_policies.AcsPolicyV1]
-    ) -> list[gql_acs_policies.AppEscalationPolicyV1]:
-        return list(
-            {
-                p.integrations.notifiers.jira.escalation_policy.name: p.integrations.notifiers.jira.escalation_policy
-                for p in acs_policies
-                if p.integrations
-                and p.integrations.notifiers
-                and p.integrations.notifiers.jira
-                and integration_is_enabled(
-                    self.qontract_integration,
-                    p.integrations.notifiers.jira.escalation_policy.channels.jira_board[
-                        0
-                    ],
-                )
-            }.values()
-        )
-
-    def get_desired_state(
-        self, acs_policies: list[gql_acs_policies.AcsPolicyV1]
-    ) -> list[JiraNotifier]:
-        return [
-            JiraNotifier.from_escalation_policy(ep)
-            for ep in self._get_escalation_policies(acs_policies)
-        ]
-
-    def get_jira_credentials(
-        self, jira_servers: list[JiraServerV1]
-    ) -> dict[str, JiraCredentials]:
-        return {
-            server.server_url: JiraCredentials(
-                url=server.server_url,
-                username=server.username,
-                token=self.secret_reader.read_secret(server.token),
-            )
-            for server in jira_servers
-        }
-
-    def reconcile(
-        self,
-        current_state: list[JiraNotifier],
-        desired_state: list[JiraNotifier],
-        acs_api: AcsNotifiersApi,
-        jira_credentials: dict[str, JiraCredentials],
-        dry_run: bool,
-    ) -> None:
-        diff = diff_iterables(
-            current=current_state, desired=desired_state, key=lambda x: x.name
-        )
-        for a in diff.add.values():
-            logging.info(f"Create Jira notifier: {a.name}")
-            if not dry_run:
-                acs_api.create_jira_notifier(
-                    a,
-                    jira_credentials=jira_credentials[a.url],
-                )
-        for c in diff.change.values():
-            logging.info(f"Update Jira notifier: {c.desired.name}")
-            if not dry_run:
-                acs_api.update_jira_notifier(
-                    c.desired,
-                    jira_credentials=jira_credentials[c.desired.url],
-                )
-        for d in diff.delete.values():
-            logging.info(f"Delete Jira notifier: {d.name}")
-            if not dry_run:
-                acs_api.delete_jira_notifier(d)
-
-    def run(
-        self,
-        dry_run: bool,
-    ) -> None:
-        gql_api_query = gql.get_api().query
-        jira_credentials = self.get_jira_credentials(
-            query_jira_servers(query_func=gql_api_query).jira_servers or []
-        )
-        desired_state = self.get_desired_state(
-            gql_acs_policies.query(query_func=gql_api_query).acs_policies or []
-        )
-        instance = AcsNotifiersApi.get_acs_instance(query_func=gql_api_query)
-        with AcsNotifiersApi(
-            url=instance.url, token=self.secret_reader.read_secret(instance.credentials)
-        ) as acs_api:
-            current_state = acs_api.get_jira_notifiers()
-            self.reconcile(
-                current_state=current_state,
-                desired_state=desired_state,
-                acs_api=acs_api,
-                jira_credentials=jira_credentials,
-                dry_run=dry_run,
-            )

reconcile/utils/acs/notifiers.py

@@ -1,145 +0,0 @@
-import json
-from typing import Any
-
-from pydantic import BaseModel
-
-from reconcile.gql_definitions.acs.acs_policies import AppEscalationPolicyV1
-from reconcile.utils.acs.base import AcsBaseApi
-
-
-class JiraCredentials(BaseModel):
-    url: str
-    username: str
-    token: str
-
-
-class SeverityPriorityMapping(BaseModel):
-    severity: str
-    priority: str
-
-    @staticmethod
-    def from_api(mapping: dict[str, str]) -> "SeverityPriorityMapping":
-        return SeverityPriorityMapping(
-            severity=mapping["severity"].replace("_SEVERITY", "").lower(),
-            priority=mapping["priorityName"],
-        )
-
-    def to_api(self) -> Any:
-        return {
-            "severity": f"{self.severity.upper()}_SEVERITY",
-            "priorityName": self.priority,
-        }
-
-
-class JiraNotifier(BaseModel):
-    name: str
-    board: str
-    url: str
-    issue_type: str | None
-    severity_priority_mappings: list[SeverityPriorityMapping]
-    custom_fields: dict[str, Any] | None
-
-    @staticmethod
-    def from_api(notifier: dict[str, Any]) -> "JiraNotifier":
-        notifier_jira = notifier["jira"]
-        return JiraNotifier(
-            name=notifier["name"],
-            board=notifier["labelDefault"],
-            url=notifier_jira["url"],
-            issue_type=notifier_jira["issueType"],
-            severity_priority_mappings=sorted(
-                [
-                    SeverityPriorityMapping.from_api(mapping)
-                    for mapping in notifier_jira["priorityMappings"]
-                ],
-                key=lambda m: m.severity,
-            ),
-            custom_fields=json.loads(notifier_jira.get("defaultFieldsJson") or "{}"),
-        )
-
-    def to_api(self, ui_endpoint: str, jira_credentials: JiraCredentials) -> Any:
-        return {
-            "name": self.name,
-            "type": "jira",
-            "uiEndpoint": ui_endpoint,
-            "labelDefault": self.board,
-            "jira": {
-                "url": jira_credentials.url,
-                "username": jira_credentials.username,
-                "password": jira_credentials.token,
-                "issueType": self.issue_type or "Task",
-                "priorityMappings": [
-                    mapping.to_api() for mapping in self.severity_priority_mappings
-                ],
-                "defaultFieldsJson": json.dumps(self.custom_fields or {}),
-            },
-        }
-
-    @staticmethod
-    def from_escalation_policy(
-        escalation_policy: AppEscalationPolicyV1,
-    ) -> "JiraNotifier":
-        jira_board = escalation_policy.channels.jira_board[0]
-
-        custom_fields: dict[str, Any] = {}
-        for field in jira_board.issue_fields or []:
-            if field.name == "Security Level":
-                custom_fields["security"] = {"name": field.value}
-
-        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):
-    """
-    Implements methods to support reconcile operations against the ACS NotifiersService api
-    """
-
-    def get_notifiers(self) -> list[Any]:
-        return self.generic_request_json("/v1/notifiers", "GET")["notifiers"]
-
-    def get_jira_notifiers(self) -> list[JiraNotifier]:
-        return [
-            JiraNotifier.from_api(notifier)
-            for notifier in self.get_notifiers()
-            if notifier["type"] == "jira"
-        ]
-
-    def get_notifier_id_by_name(self, name: str) -> str:
-        return next(n["id"] for n in self.get_notifiers() if n["name"] == name)
-
-    def update_jira_notifier(
-        self, jira_notifier: JiraNotifier, jira_credentials: JiraCredentials
-    ) -> None:
-        notifier_id = self.get_notifier_id_by_name(jira_notifier.name)
-        body = jira_notifier.to_api(self.url, jira_credentials)
-        self.generic_request(f"/v1/notifiers/{notifier_id}", "PUT", body)
-
-    def create_jira_notifier(
-        self, jira_notifier: JiraNotifier, jira_credentials: JiraCredentials
-    ) -> None:
-        body = jira_notifier.to_api(self.url, jira_credentials)
-        self.generic_request("/v1/notifiers", "POST", body)
-
-    def delete_jira_notifier(self, jira_notifier: JiraNotifier) -> None:
-        notifier_id = self.get_notifier_id_by_name(jira_notifier.name)
-        self.generic_request(f"/v1/notifiers/{notifier_id}", "DELETE")