qontract-reconcile 0.10.2.dev185__tar.gz → 0.10.2.dev186__tar.gz

{qontract_reconcile-0.10.2.dev185 → qontract_reconcile-0.10.2.dev186}/PKG-INFO

@@ -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 → qontract_reconcile-0.10.2.dev186}/README.md

@@ -34,7 +34,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 → qontract_reconcile-0.10.2.dev186}/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(
                 [

{qontract_reconcile-0.10.2.dev185 → qontract_reconcile-0.10.2.dev186}/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

{qontract_reconcile-0.10.2.dev185 → qontract_reconcile-0.10.2.dev186}/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")

qontract_reconcile-0.10.2.dev185/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,
-            )

qontract_reconcile-0.10.2.dev185/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")