qontract-reconcile 0.10.2.dev207__tar.gz → 0.10.2.dev209__tar.gz

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev207
+Version: 0.10.2.dev209
 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

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/reconcile/automated_actions/config/integration.py

@@ -17,10 +17,12 @@ from pydantic import BaseModel
 import reconcile.openshift_base as ob
 from reconcile.gql_definitions.automated_actions.instance import (
     AutomatedActionActionListV1,
+    AutomatedActionExternalResourceRdsRebootV1,
     AutomatedActionOpenshiftWorkloadRestartArgumentV1,
     AutomatedActionOpenshiftWorkloadRestartV1,
     AutomatedActionsInstanceV1,
     AutomatedActionV1,
+    AWSAccountV1,
 )
 from reconcile.gql_definitions.automated_actions.instance import query as instance_query
 from reconcile.utils import expiration, gql
@@ -165,6 +167,15 @@ class AutomatedActionsConfigIntegration(
                         arg.dict(exclude_none=True, exclude_defaults=True)
                         for arg in action.action_list_arguments or []
                     )
+                case AutomatedActionExternalResourceRdsRebootV1():
+                    for arg in action.external_resource_rds_reboot_arguments:
+                        for er in arg.namespace.external_resources or []:
+                            if not isinstance(er.provisioner, AWSAccountV1):
+                                continue
+                            parameters.append({
+                                "account": f"^{er.provisioner.name}$",
+                                "identifier": arg.identifier,
+                            })
                 case AutomatedActionOpenshiftWorkloadRestartV1():
                     parameters.extend(
                         {

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/reconcile/gql_definitions/automated_actions/instance.py

@@ -84,6 +84,26 @@ query AutomatedActionsInstances {
         }
       }
       maxOps
+      ... on AutomatedActionActionList_v1 {
+        action_list_arguments: arguments {
+          action_user
+          max_age_minutes
+        }
+      }
+      ... on AutomatedActionExternalResourceRdsReboot_v1 {
+        external_resource_rds_reboot_arguments: arguments {
+          namespace {
+            externalResources {
+              provisioner {
+                ... on AWSAccount_v1 {
+                  name
+                }
+              }
+            }
+          }
+          identifier
+        }
+      }
       ... on AutomatedActionOpenshiftWorkloadRestart_v1 {
         openshift_workload_restart_arguments: arguments {
           namespace {
@@ -100,12 +120,6 @@ query AutomatedActionsInstances {
           name
         }
       }
-      ... on AutomatedActionActionList_v1 {
-        action_list_arguments: arguments {
-          action_user
-          max_age_minutes
-        }
-      }
     }
   }
 }
@@ -150,6 +164,40 @@ class AutomatedActionV1(ConfiguredBaseModel):
     max_ops: int = Field(..., alias="maxOps")
 
 
+class AutomatedActionActionListArgumentV1(ConfiguredBaseModel):
+    action_user: Optional[str] = Field(..., alias="action_user")
+    max_age_minutes: Optional[int] = Field(..., alias="max_age_minutes")
+
+
+class AutomatedActionActionListV1(AutomatedActionV1):
+    action_list_arguments: Optional[list[AutomatedActionActionListArgumentV1]] = Field(..., alias="action_list_arguments")
+
+
+class ExternalResourcesProvisionerV1(ConfiguredBaseModel):
+    ...
+
+
+class AWSAccountV1(ExternalResourcesProvisionerV1):
+    name: str = Field(..., alias="name")
+
+
+class NamespaceExternalResourceV1(ConfiguredBaseModel):
+    provisioner: Union[AWSAccountV1, ExternalResourcesProvisionerV1] = Field(..., alias="provisioner")
+
+
+class AutomatedActionExternalResourceArgumentV1_NamespaceV1(ConfiguredBaseModel):
+    external_resources: Optional[list[NamespaceExternalResourceV1]] = Field(..., alias="externalResources")
+
+
+class AutomatedActionExternalResourceArgumentV1(ConfiguredBaseModel):
+    namespace: AutomatedActionExternalResourceArgumentV1_NamespaceV1 = Field(..., alias="namespace")
+    identifier: str = Field(..., alias="identifier")
+
+
+class AutomatedActionExternalResourceRdsRebootV1(AutomatedActionV1):
+    external_resource_rds_reboot_arguments: list[AutomatedActionExternalResourceArgumentV1] = Field(..., alias="external_resource_rds_reboot_arguments")
+
+
 class DisableClusterAutomationsV1(ConfiguredBaseModel):
     integrations: Optional[list[str]] = Field(..., alias="integrations")
 
@@ -175,19 +223,10 @@ class AutomatedActionOpenshiftWorkloadRestartV1(AutomatedActionV1):
     openshift_workload_restart_arguments: list[AutomatedActionOpenshiftWorkloadRestartArgumentV1] = Field(..., alias="openshift_workload_restart_arguments")
 
 
-class AutomatedActionActionListArgumentV1(ConfiguredBaseModel):
-    action_user: Optional[str] = Field(..., alias="action_user")
-    max_age_minutes: Optional[int] = Field(..., alias="max_age_minutes")
-
-
-class AutomatedActionActionListV1(AutomatedActionV1):
-    action_list_arguments: Optional[list[AutomatedActionActionListArgumentV1]] = Field(..., alias="action_list_arguments")
-
-
 class AutomatedActionsInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     deployment: NamespaceV1 = Field(..., alias="deployment")
-    actions: Optional[list[Union[AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionActionListV1, AutomatedActionV1]]] = Field(..., alias="actions")
+    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
 
 
 class AutomatedActionsInstancesQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/reconcile/gql_definitions/introspection.json

@@ -5737,6 +5737,11 @@
                             "name": "AutomatedActionCreateToken_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "AutomatedActionExternalResourceRdsReboot_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "AutomatedActionNoOp_v1",
@@ -27339,6 +27344,11 @@
                             "name": "AutomatedActionCreateToken_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "AutomatedActionExternalResourceRdsReboot_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "AutomatedActionNoOp_v1",
@@ -53500,6 +53510,215 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "AutomatedActionExternalResourceRdsReboot_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "schema",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "type",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "description",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "maxOps",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "Int",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "instances",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "AutomatedActionsInstance_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "permissions",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "PermissionAutomatedActions_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "arguments",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "AutomatedActionExternalResourceArgument_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "AutomatedAction_v1",
+                            "ofType": null
+                        },
+                        {
+                            "kind": "INTERFACE",
+                            "name": "DatafileObject_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
+                {
+                    "kind": "OBJECT",
+                    "name": "AutomatedActionExternalResourceArgument_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "namespace",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "OBJECT",
+                                    "name": "Namespace_v1",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "identifier",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "AutomatedActionNoOp_v1",

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/reconcile/utils/saasherder/interfaces.py

@@ -7,6 +7,7 @@ from typing import (
     runtime_checkable,
 )
 
+from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
 from reconcile.utils import oc_connection_parameters
 from reconcile.utils.secret_reader import HasSecret
 
@@ -326,6 +327,9 @@ class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
     @property
     def images(self) -> Sequence[SaasResourceTemplateTargetImage] | None: ...
 
+    @property
+    def slos(self) -> list[SLODocument] | None: ...
+
     def uid(
         self, parent_saas_file_name: str, parent_resource_template_name: str
     ) -> str: ...

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/reconcile/utils/saasherder/models.py

@@ -12,6 +12,9 @@ from pydantic import (
     Field,
 )
 
+from reconcile.gql_definitions.fragments.saas_slo_document import (
+    SLODocument,
+)
 from reconcile.utils.oc_connection_parameters import Cluster
 from reconcile.utils.saasherder.interfaces import (
     HasParameters,
@@ -66,8 +69,18 @@ class TriggerSpecBase:
         raise NotImplementedError("implement this function in inheriting classes")
 
 
+@dataclass(frozen=True)
+class SLOKey:
+    slo_document_name: str
+    namespace_name: str
+    cluster_name: str
+
+
 @dataclass
 class TriggerSpecConfig(TriggerSpecBase):
+    resource_template_url: str
+    target_ref: str
+    slos: list[SLODocument] | None = None
     target_name: str | None = None
     reason: str | None = None
 
@@ -81,6 +94,19 @@ class TriggerSpecConfig(TriggerSpecBase):
             key += f"/{self.target_name}"
         return key
 
+    def extract_slo_keys(self) -> list[SLOKey]:
+        return [
+            SLOKey(
+                slo_document_name=slo_document.name,
+                namespace_name=namespace.namespace.name,
+                cluster_name=namespace.namespace.cluster.name,
+            )
+            for slo_document in self.slos or []
+            for namespace in slo_document.namespaces
+            if namespace.namespace.name == self.namespace_name
+            and namespace.namespace.cluster.name == self.cluster_name
+        ]
+
 
 @dataclass
 class TriggerSpecMovingCommit(TriggerSpecBase):

{qontract_reconcile-0.10.2.dev207 → qontract_reconcile-0.10.2.dev209}/reconcile/utils/saasherder/saasherder.py

@@ -71,6 +71,7 @@ from reconcile.utils.saasherder.models import (
     ImageAuth,
     Namespace,
     Promotion,
+    SLOKey,
     TargetSpec,
     TriggerSpecConfig,
     TriggerSpecContainerImage,
@@ -81,6 +82,7 @@ from reconcile.utils.saasherder.models import (
     UpstreamJob,
 )
 from reconcile.utils.secret_reader import SecretReaderBase
+from reconcile.utils.slo_document_manager import SLODetails, SLODocumentManager
 from reconcile.utils.state import State
 from reconcile.utils.vcs import VCS
 
@@ -1040,19 +1042,19 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         return channel_map
 
     def _collect_blocked_versions(self) -> dict[str, set[str]]:
-        blocked_versions: dict[str, set[str]] = {}
+        blocked_versions: dict[str, set[str]] = defaultdict(set[str])
         for saas_file in self.saas_files:
             for cc in saas_file.app.code_components or []:
                 for v in cc.blocked_versions or []:
-                    blocked_versions.setdefault(cc.url, set()).add(v)
+                    blocked_versions[cc.url].add(v)
         return blocked_versions
 
     def _collect_hotfix_versions(self) -> dict[str, set[str]]:
-        hotfix_versions: dict[str, set[str]] = {}
+        hotfix_versions: dict[str, set[str]] = defaultdict(set[str])
         for saas_file in self.saas_files:
             for cc in saas_file.app.code_components or []:
                 for v in cc.hotfix_versions or []:
-                    hotfix_versions.setdefault(cc.url, set()).add(v)
+                    hotfix_versions[cc.url].add(v)
         return hotfix_versions
 
     @staticmethod
@@ -1273,6 +1275,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     cluster_name=target.namespace.cluster.name,
                     namespace_name=target.namespace.name,
                     target_name=target.name,
+                    resource_template_url=rt.url,
+                    target_ref=target.ref,
                     state_content=None,
                 ).state_key
                 digest = SaasHerder.get_target_config_hash(
@@ -1691,7 +1695,82 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         results = threaded.run(
             self.get_configs_diff_saas_file, self.saas_files, self.thread_pool_size
         )
-        return list(itertools.chain.from_iterable(results))
+        trigger_config_spec_list = list(itertools.chain.from_iterable(results))
+        return self.filter_slo_breached_triggers(trigger_config_spec_list)
+
+    def filter_slo_breached_triggers(
+        self, trigger_config_spec_list: list[TriggerSpecConfig]
+    ) -> list[TriggerSpecConfig]:
+        trigger_config_specs_to_validate: list[TriggerSpecConfig] = [
+            trigger_config_spec
+            for trigger_config_spec in trigger_config_spec_list
+            if trigger_config_spec.slos
+            and trigger_config_spec.target_ref
+            not in self.hotfix_versions[trigger_config_spec.resource_template_url]
+        ]
+        if not trigger_config_specs_to_validate:
+            return trigger_config_spec_list
+
+        slo_documents = [
+            slo
+            for trigger_spec in trigger_config_specs_to_validate
+            for slo in trigger_spec.slos or []
+        ]
+        slo_document_manager = SLODocumentManager(
+            slo_documents=slo_documents,
+            thread_pool_size=self.thread_pool_size,
+            secret_reader=self.secret_reader,
+        )
+        breached_slos = slo_document_manager.get_breached_slos()
+        if not breached_slos:
+            return trigger_config_spec_list
+
+        breached_slos_map = self.make_breached_slos_map(breached_slos)
+        valid_trigger_config_specs = [
+            trigger_config_spec
+            for trigger_config_spec in trigger_config_spec_list
+            if not self.has_breached_slos(trigger_config_spec, breached_slos_map)
+        ]
+        return valid_trigger_config_specs
+
+    @staticmethod
+    def make_breached_slos_map(
+        breached_slos: list[SLODetails],
+    ) -> dict[SLOKey, list[SLODetails]]:
+        breached_slos_map: dict[SLOKey, list[SLODetails]] = defaultdict(
+            list[SLODetails]
+        )
+        for breached_slo in breached_slos:
+            breached_slos_map[
+                SLOKey(
+                    slo_document_name=breached_slo.slo_document_name,
+                    namespace_name=breached_slo.namespace_name,
+                    cluster_name=breached_slo.cluster_name,
+                )
+            ].append(breached_slo)
+        return breached_slos_map
+
+    @staticmethod
+    def has_breached_slos(
+        trigger_spec: TriggerSpecConfig,
+        breached_slo_map: dict[SLOKey, list[SLODetails]],
+    ) -> bool:
+        matching_slo_keys = [
+            slo_key
+            for slo_key in trigger_spec.extract_slo_keys()
+            if slo_key in breached_slo_map
+        ]
+        if not matching_slo_keys:
+            return False
+        logging.info(
+            f"Skipping target from saas file {trigger_spec.saas_file_name} due to following breached SLOs."
+        )
+        for matching_key in matching_slo_keys:
+            for breached_slo in breached_slo_map[matching_key]:
+                logging.info(
+                    f"SLO: {breached_slo.slo.name} of document {breached_slo.slo_document_name} is breached. Current value: {breached_slo.current_slo_value} Expected: {breached_slo.slo.slo_target}"
+                )
+        return True
 
     @staticmethod
     def remove_none_values(d: dict[Any, Any] | None) -> dict[Any, Any]:
@@ -1725,7 +1804,6 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             dtc = SaasHerder.remove_none_values(trigger_spec.state_content)
             if ctc == dtc:
                 continue
-
             if self.include_trigger_trace:
                 trigger_spec.reason = f"{self.repo_url}/commit/{RunningState().commit}"
                 # For now we count every saas config change as an auto-promotion
@@ -1820,6 +1898,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     namespace_name=target.namespace.name,
                     target_name=target.name,
                     state_content=serializable_target_config,
+                    resource_template_url=rt.url,
+                    target_ref=target.ref,
+                    slos=target.slos or None,
                 )
                 configs[trigger_spec.state_key] = trigger_spec