qontract-reconcile 0.10.1rc707__py3-none-any.whl → 0.10.1rc709__py3-none-any.whl

{qontract_reconcile-0.10.1rc707.dist-info → qontract_reconcile-0.10.1rc709.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ reconcile/dashdotdb_dora.py,sha256=n9EJXhxCoMYuldj4Fa5s0TqfiiolSrqDEOCaLBV3uag,1
 reconcile/dashdotdb_dvo.py,sha256=YXqpI6fBQAql-ybGI0grj9gWMzmKiAvPE__pNju6obk,8996
 reconcile/dashdotdb_slo.py,sha256=bf1WSh5JP9obHVQsMy0OO71_VTYZgwAopElFZM6DmRo,6714
 reconcile/database_access_manager.py,sha256=42dBJyihdwx4WjEBjwi3lUiDzQ1t_2ZFViJri2c4_aE,25716
-reconcile/deadmanssnitch.py,sha256=lePZWxya1Xz_EqKxyBXoeTeFSWuJEn0-mU91SEHs93g,7707
+reconcile/deadmanssnitch.py,sha256=ET4gUX1WvmWsILI10GgcPDOuJL2f3bDwwvKORWvyFhc,7339
 reconcile/dynatrace_token_provider.py,sha256=P5jvMavremWp64LVknz1kCZI4aagwLrDDfXkmJ9diwY,17212
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
 reconcile/gabi_authorized_users.py,sha256=9kpSJGyMe_qYVHIgTFHhYf8E3lKSLO0Ia1WwK9ADNIE,4502
@@ -77,7 +77,7 @@ reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw
 reconcile/openshift_saas_deploy.py,sha256=fmhopPEbyZsGQHRPzyzpKEvoBXEGN3aPxFi7Utq0emU,12788
 reconcile/openshift_saas_deploy_change_tester.py,sha256=fMmPDz-ZRO-WH8OIiDo4e4sBK4-zzpvFXmVCKGY1l-I,8837
 reconcile/openshift_saas_deploy_trigger_base.py,sha256=p1Mv7dbw_K7TVFv-M-DDq6r1ltuW9VAF6PCNnEng_zM,14291
-reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=aT8wqoXGyZEeXUA7Q6reaL9v5j5UnPLoYVe70D31HUg,2917
+reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=gU226N1JUvgEbTgDf7ouJ6QzZGMI_BLwXdS67UCukRk,3554
 reconcile/openshift_saas_deploy_trigger_configs.py,sha256=uWzUV5D5CW0frdi1ys7BObNg-rA-VZKlefd4TD_Z-pY,959
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=Yl4lMtxqab-c04I2Ju8isAJuYuNTbHN01Bk3dF9nTos,967
 reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=VqjwgRhA-yOSq0WFPqGIJVgYkdq_UrTHcVusBzOFgMY,973
@@ -234,7 +234,7 @@ reconcile/gql_definitions/common/ocm_env_telemeter.py,sha256=jW0Q9WazDQVOxh4u0LM
 reconcile/gql_definitions/common/ocm_environments.py,sha256=2Szg8VSIM4a9ZbjktDjSY6I1enih2Cx1tjYXoUFiZX0,2002
 reconcile/gql_definitions/common/pagerduty_instances.py,sha256=qcbOSUNwmeRcBetJ2FktUu6Mn4CPE2iNoevt3fY_xig,1988
 reconcile/gql_definitions/common/pgp_reencryption_settings.py,sha256=NPLmO6J-zSu5B9QiYbDezLHY3TuOO9ihRBV-Zr84R9w,2259
-reconcile/gql_definitions/common/pipeline_providers.py,sha256=AmEgemURPRQhsleaVbwxmEcbuymC6SH_3DO09sHl-b0,9115
+reconcile/gql_definitions/common/pipeline_providers.py,sha256=JJgmmghqLIwjKOdcWYHPnf4PDgAq4GF7046i0ozrqgI,9127
 reconcile/gql_definitions/common/saas_files.py,sha256=B7HE_jV5ky8AFxOCleSg2RYDrtUaV99DYa2If8wyvHs,15926
 reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=gcTU9jrsNq9-HX-oOkj-nEZKYFTRytDHLs4SpEs93aw,2755
 reconcile/gql_definitions/common/saasherder_settings.py,sha256=nqQLcMwYxLseqq0BEcVvmrpIj2eQq0h8XDSpLN6GGCw,1793
@@ -262,7 +262,7 @@ reconcile/gql_definitions/fragments/membership_source.py,sha256=rVjAIAhhAoH0_fUf
 reconcile/gql_definitions/fragments/minimal_ocm_organization.py,sha256=G7uEwGR2qjtXl3yUUMWAzbihNKor0jj1_fcSd9qQOjw,731
 reconcile/gql_definitions/fragments/oc_connection_cluster.py,sha256=GO4v0q7urQt2G6fU6HJSgHmFOPxNCc3oO0zAwz9bU7o,1530
 reconcile/gql_definitions/fragments/ocm_environment.py,sha256=mEbBooD-SAxe7l73sja0ELiByGkTiqxuca9vmxfIISw,1075
-reconcile/gql_definitions/fragments/pipeline_provider_retention.py,sha256=hjqsTf95evcZn3BBKpF9dUJVBhpy2tq6r_rEbaF6cy4,757
+reconcile/gql_definitions/fragments/pipeline_provider_retention.py,sha256=nIGIaeuBDw5emBdDJvajl27pGULQ2fYG5SkQ0AYTr7E,814
 reconcile/gql_definitions/fragments/prometheus_instance.py,sha256=12ltnV9kdEw6LnHgevdM6Ms-lCPY802RC-CrYOoRRgY,1575
 reconcile/gql_definitions/fragments/resource_limits_requirements.py,sha256=ucskQ_a8RxvFl5-IWxz5kk3g4-5Pvh_W4N3nLmuKxi0,744
 reconcile/gql_definitions/fragments/resource_requests_requirements.py,sha256=TFKO4YALFPanSvZvIJFz0dCioBU7i73Q6hkDtGMvs9I,736
@@ -439,7 +439,7 @@ reconcile/test/test_cli.py,sha256=qx_iBwh4Z-YkK3sbjK1wEziPTgn060EN-baf9DNvR3k,10
 reconcile/test/test_closedbox_endpoint_monitoring.py,sha256=isMHYwRWMFARU2nbJgbl69kD6H0eA86noCM4MPVI1fo,7151
 reconcile/test/test_dashdotdb_dora.py,sha256=MfHGAsX2eSQSvBVt9_1Sah3aQKNJBXA9Iu86X0NWD6c,7705
 reconcile/test/test_database_access_manager.py,sha256=-9fYo8wMNhbJUTK_bd7g_fS5zYsAlqQ0rBDDYBMZvZQ,19595
-reconcile/test/test_deadmanssnitch.py,sha256=tSeFRG9JUOR-Y7W4S5adv9ZqfgAhbQOgnqW-EhCXggU,9445
+reconcile/test/test_deadmanssnitch.py,sha256=3AiarCKkSPU1cEkVwooglwU3sQgDifMAiXuJb1P9_vI,9220
 reconcile/test/test_gabi_authorized_users.py,sha256=6XnV5Q9inxP81ktGMVKyWucjBTUj8Imy2L0HG3YHyUE,2496
 reconcile/test/test_gcr_mirror.py,sha256=A0y8auKZzr62-mGoxSQ__JnN0-ijZUltzjwR5miBgso,490
 reconcile/test/test_github_org.py,sha256=j3KeB4OnSln1gm2hidce49xdMru-j75NS3cM-AEgzZc,4511
@@ -468,6 +468,7 @@ reconcile/test/test_openshift_resource.py,sha256=lbTf48jX1q6rGnRiA5pPvfU0uPfY8zh
 reconcile/test/test_openshift_resources_base.py,sha256=LtlR9x3o7KkSEw0JN0fZhinFeAAxBAQlB_9PpBnKwOM,14353
 reconcile/test/test_openshift_saas_deploy.py,sha256=YLJGkc--u5aP0UkQ-b9ZGEFGS2gw25jjcSgknQdI3Ic,5892
 reconcile/test/test_openshift_saas_deploy_change_tester.py,sha256=1yVe54Hx9YdVjn6qdnKge5Sa_s732c-8uZqCnuT1gGI,12871
+reconcile/test/test_openshift_saas_deploy_trigger_cleaner.py,sha256=cha3bUiXAWPCwrp8XwVC3RNJtJHLcsGTE-F8Zn6XxsU,2852
 reconcile/test/test_openshift_tekton_resources.py,sha256=RtRWsdm51S13OSkENC9nY_rOH0QELSCaO5tjF0XqIDI,11222
 reconcile/test/test_openshift_upgrade_watcher.py,sha256=0GDQ_YFHIX8DbkbDYSuLv9uZeeg4NwP1vlOqvSaZvN4,7183
 reconcile/test/test_prometheus_rules_tester.py,sha256=Qc9J4k0lSVie361lGr_cOy0EaBTD5LDqGZf7CYVFKr8,5677
@@ -761,8 +762,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 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.1rc707.dist-info/METADATA,sha256=2sMuicUof6ZemdDsl2x77zDnjVZkgPZowU7C4iUrFPk,2382
-qontract_reconcile-0.10.1rc707.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc707.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc707.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc707.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc709.dist-info/METADATA,sha256=LWgfuyiC1vMk_M3JnVI9i54gC6OTe2glD6StNzN4X5s,2382
+qontract_reconcile-0.10.1rc709.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc709.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc709.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc709.dist-info/RECORD,,

reconcile/deadmanssnitch.py

@@ -4,6 +4,8 @@ from typing import (
     cast,
 )
 
+from pydantic import BaseModel
+
 from reconcile.gql_definitions.common.clusters_with_dms import ClusterV1
 from reconcile.typed_queries.app_interface_deadmanssnitch_settings import (
     get_deadmanssnitch_settings,
@@ -32,6 +34,17 @@ QONTRACT_INTEGRATION = "deadmanssnitch"
 SECRET_NOT_FOUND = "SECRET_NOT_FOUND"
 
 
+class SnitchSpec(BaseModel):
+    """Class to hold values from cluster file and settings"""
+
+    name: str
+    alert_email: list[str]
+    alert_type: str
+    interval: str
+    tags: list[str]
+    notes: str
+
+
 class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
     """Integration to automate deadmanssnitch snitch api during cluster dressup."""
 
@@ -45,6 +58,10 @@ class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
         self.settings = get_deadmanssnitch_settings()
         self.vault_client = cast(_VaultClient, VaultClient())
 
+    @staticmethod
+    def get_snitch_name(cluster: ClusterV1) -> str:
+        return cluster.prometheus_url.replace("https://", "")
+
     def write_snitch_to_vault(
         self, cluster_name: str, snitch_url: Optional[str]
     ) -> None:
@@ -71,15 +88,18 @@ class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
         return snitch
 
     def create_snitch(
-        self, cluster_name: str, snitch: Snitch, deadmanssnitch_api: DeadMansSnitchApi
+        self,
+        cluster_name: str,
+        snitch_spec: SnitchSpec,
+        deadmanssnitch_api: DeadMansSnitchApi,
     ) -> None:
         payload = {
-            "name": snitch.name,
-            "alert_type": snitch.alert_type,
-            "interval": snitch.interval,
-            "tags": snitch.tags,
-            "alert_email": snitch.alert_email,
-            "notes": snitch.notes,
+            "name": snitch_spec.name,
+            "alert_type": snitch_spec.alert_type,
+            "interval": snitch_spec.interval,
+            "tags": snitch_spec.tags,
+            "alert_email": snitch_spec.alert_email,
+            "notes": snitch_spec.notes,
         }
         snitch_data = deadmanssnitch_api.create_snitch(payload=payload)
         self.write_snitch_to_vault(
@@ -90,34 +110,40 @@ class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
         self,
         dry_run: bool,
         current_state: dict[str, Snitch],
-        desired_state: dict[str, Snitch],
+        desired_state: dict[str, SnitchSpec],
         deadmanssnitch_api: DeadMansSnitchApi,
     ) -> None:
-        diffs = diff_mappings(current=current_state, desired=desired_state)
+        diffs = diff_mappings(
+            current=current_state,
+            desired=desired_state,
+            equal=lambda current, desired: current.name == desired.name,
+        )
         errors = []
         for cluster_name, snitch in diffs.add.items():
             logging.info("[cluster_name:%s] [Action:create_snitch]", cluster_name)
-            try:
-                if not dry_run:
+            if not dry_run:
+                try:
                     self.create_snitch(cluster_name, snitch, deadmanssnitch_api)
-            except Exception as e:
-                errors.append(e)
-        for cluster_name, snitch in diffs.delete.items():
+                except Exception as e:
+                    errors.append(e)
+        for cluster_name, snitch_value in diffs.delete.items():
             logging.info("[cluster_name:%s] [Action:delete_snitch]", cluster_name)
-            try:
-                if not dry_run:
-                    deadmanssnitch_api.delete_snitch(snitch.token)
-            except Exception as e:
-                errors.append(e)
+            if not dry_run:
+                try:
+                    deadmanssnitch_api.delete_snitch(snitch_value.token)
+                except Exception as e:
+                    errors.append(e)
         for cluster_name, diff_pair in diffs.identical.items():
-            try:
-                if diff_pair.desired.needs_vault_update():
-                    self.write_snitch_to_vault(
-                        cluster_name=cluster_name,
-                        snitch_url=diff_pair.desired.check_in_url,
-                    )
-            except Exception as e:
-                errors.append(e)
+            if diff_pair.current.needs_vault_update():
+                logging.info("[cluster_name:%s] [Action:update_vault]", cluster_name)
+                if not dry_run:
+                    try:
+                        self.write_snitch_to_vault(
+                            cluster_name=cluster_name,
+                            snitch_url=diff_pair.current.check_in_url,
+                        )
+                    except Exception as e:
+                        errors.append(e)
         if errors:
             raise ExceptionGroup("Errors occurred while reconcile", errors)
 
@@ -125,63 +151,40 @@ class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
         self,
         deadmanssnitch_api: DeadMansSnitchApi,
         clusters: list[ClusterV1],
-        snitch_secret_path: str,
-        cluster_to_prometheus_mapping: dict[str, str],
     ) -> dict[str, Snitch]:
+        snitch_name_to_cluster_name_mapping = {
+            self.get_snitch_name(cluster): cluster.name for cluster in clusters
+        }
         # current state includes for deadmanssnithch response and associated secret in vault
         snitches = deadmanssnitch_api.get_snitches(tags=self.settings.tags)
         # create snitch_map only for  the desired clusters
-        snitches_with_cluster_mapping = {
-            cluster.name: snitch
-            for snitch in snitches
-            for cluster in clusters
-            if (cluster_to_prometheus_mapping.get(cluster.name) == snitch.name)
-        }
         current_state = {
-            cluster.name: self.add_vault_data(cluster.name, snitch, snitch_secret_path)
-            for cluster in clusters
-            if (snitch := snitches_with_cluster_mapping.get(cluster.name))
+            cluster_name: self.add_vault_data(
+                cluster_name, snitch, self.settings.snitches_path
+            )
+            for snitch in snitches
+            if (cluster_name := snitch_name_to_cluster_name_mapping.get(snitch.name))
         }
         return current_state
 
     def get_desired_state(
         self,
         clusters: list[ClusterV1],
-        current_state: dict[str, Snitch],
-        cluster_to_prometheus_mapping: dict[str, str],
-    ) -> dict[str, Snitch]:
+    ) -> dict[str, SnitchSpec]:
         desired_state = {
-            cluster.name: self.map_desired_snitch_value(
-                cluster.name, current_state, cluster_to_prometheus_mapping
+            cluster.name: SnitchSpec(
+                name=self.get_snitch_name(cluster),
+                alert_email=self.settings.alert_mail_addresses,
+                interval=self.settings.interval,
+                tags=self.settings.tags,
+                notes=self.settings.notes_link,
+                alert_type=self.settings.alert_type,
             )
             for cluster in clusters
             if cluster.enable_dead_mans_snitch
         }
         return desired_state
 
-    # get snitch in case snitch available for desired state cluster
-    # return new snitch object in case  of new cluster
-    def map_desired_snitch_value(
-        self,
-        cluster_name: str,
-        current_state: dict[str, Snitch],
-        cluster_to_prometheus_mapping: dict[str, str],
-    ) -> Snitch:
-        if (snitch := current_state.get(cluster_name)) is not None:
-            return snitch
-        return Snitch(
-            name=cluster_to_prometheus_mapping.get(cluster_name),
-            check_in_url="",
-            status="",
-            href="",
-            token="",
-            alert_email=self.settings.alert_mail_addresses,
-            alert_type=self.settings.alert_type,
-            interval=self.settings.interval,
-            tags=self.settings.tags,
-            notes=self.settings.notes_link,
-        )
-
     def run(self, dry_run: bool) -> None:
         # Initialize deadmanssnitch_api
         token = self.secret_reader.read({
@@ -191,18 +194,15 @@ class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
         with DeadMansSnitchApi(token=token) as deadmanssnitch_api:
             # desired state - get the  clusters having enableDeadMansSnitch field
             clusters = get_clusters_with_dms()
-            # create a mapping between prometheus url without the https:// and cluster name
-            cluster_to_prometheus_mapping = {
-                cluster.name: cluster.prometheus_url.replace("https://", "")
-                for cluster in clusters
-            }
+            desired_state = self.get_desired_state(clusters)
+            # create current state from deadmanssnitch and vault
             current_state = self.get_current_state(
                 deadmanssnitch_api,
                 clusters,
-                self.settings.snitches_path,
-                cluster_to_prometheus_mapping,
             )
-            desired_state = self.get_desired_state(
-                clusters, current_state, cluster_to_prometheus_mapping
+            self.reconcile(
+                dry_run,
+                current_state=current_state,
+                desired_state=desired_state,
+                deadmanssnitch_api=deadmanssnitch_api,
             )
-            self.reconcile(dry_run, current_state, desired_state, deadmanssnitch_api)

reconcile/gql_definitions/common/pipeline_providers.py

@@ -39,6 +39,7 @@ fragment CommonJumphostFields on ClusterJumpHost_v1 {
 fragment PipelineProviderRetention on PipelinesProviderRetention_v1 {
     days
     minimum
+    maximum
 }
 
 fragment ResourceLimitsRequirements on ResourceLimitsRequirements_v1 {

reconcile/gql_definitions/fragments/pipeline_provider_retention.py

@@ -27,3 +27,4 @@ class ConfiguredBaseModel(BaseModel):
 class PipelineProviderRetention(ConfiguredBaseModel):
     days: Optional[int] = Field(..., alias="days")
     minimum: Optional[int] = Field(..., alias="minimum")
+    maximum: Optional[int] = Field(..., alias="maximum")

reconcile/openshift_saas_deploy_trigger_cleaner.py

@@ -12,6 +12,9 @@ from typing import (
 
 from dateutil import parser
 
+from reconcile.gql_definitions.fragments.pipeline_provider_retention import (
+    PipelineProviderRetention,
+)
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
@@ -30,15 +33,36 @@ QONTRACT_INTEGRATION = "openshift-saas-deploy-trigger-cleaner"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
-def within_retention_days(resource: dict[str, Any], days: int) -> bool:
+def within_retention_days(
+    resource: dict[str, Any], days: int, now_date: datetime
+) -> bool:
     metadata = resource["metadata"]
     creation_date = parser.parse(metadata["creationTimestamp"])
-    now_date = datetime.now(timezone.utc)
     interval = now_date.timestamp() - creation_date.timestamp()
 
     return interval < timedelta(days=days).total_seconds()
 
 
+def get_pipeline_runs_to_delete(
+    pipeline_runs: list[dict[str, Any]],
+    retention: PipelineProviderRetention,
+    now_date: datetime,
+) -> list[dict[str, Any]]:
+    pipeline_runs_to_delete = []
+    if retention.minimum:
+        pipeline_runs = pipeline_runs[retention.minimum :]
+    elif retention.maximum:
+        pipeline_runs_to_delete = pipeline_runs[retention.maximum :]
+        pipeline_runs = pipeline_runs[: retention.maximum]
+
+    for pr in pipeline_runs:
+        if retention.days and within_retention_days(pr, retention.days, now_date):
+            continue
+        pipeline_runs_to_delete.append(pr)
+
+    return pipeline_runs_to_delete
+
+
 @defer
 def run(
     dry_run: bool,
@@ -47,6 +71,7 @@ def run(
     use_jump_host: bool = True,
     defer: Optional[Callable] = None,
 ) -> None:
+    now_date = datetime.now(timezone.utc)
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     pipeline_providers = get_tekton_pipeline_providers()
@@ -77,14 +102,8 @@ def run(
             reverse=True,
         )
 
-        if pp.retention.minimum:
-            pipeline_runs = pipeline_runs[pp.retention.minimum :]
-
-        for pr in pipeline_runs:
+        for pr in get_pipeline_runs_to_delete(pipeline_runs, pp.retention, now_date):
             name = pr["metadata"]["name"]
-            if pp.retention.days and within_retention_days(pr, pp.retention.days):
-                continue
-
             logging.info([
                 "delete_trigger",
                 pp.namespace.cluster.name,

reconcile/test/test_deadmanssnitch.py

@@ -102,11 +102,6 @@ def test_get_current_state(
     current_state = dms_integration.get_current_state(
         deadmanssnitch_api=deadmanssnitch_api,
         clusters=clusters,
-        snitch_secret_path="test_path",
-        cluster_to_prometheus_mapping={
-            "test_cluster_1": "prometheus.test_cluster_1.net",
-            "test_cluster_2": "https://prometheus.test_cluster_2.net",
-        },
     )
     assert current_state["test_cluster_1"].vault_data == "secret"
 

reconcile/test/test_openshift_saas_deploy_trigger_cleaner.py

@@ -0,0 +1,65 @@
+from datetime import datetime, timezone
+from typing import Any
+
+import pytest
+
+from reconcile.gql_definitions.fragments.pipeline_provider_retention import (
+    PipelineProviderRetention,
+)
+from reconcile.openshift_saas_deploy_trigger_cleaner import get_pipeline_runs_to_delete
+
+from .fixtures import Fixtures
+
+fxt = Fixtures("openshift_saas_deploy_trigger_cleaner")
+
+
+@pytest.fixture
+def now() -> datetime:
+    return datetime(2024, 4, 4, 0, 0, 0, 0, tzinfo=timezone.utc)
+
+
+# A fixture simulating the output of getting PipelineRuns from a namespace, simplified
+# as it contains only the fields relevant for get_pipeline_runs_to_delete, reversed
+# sorted by creationTimestamp
+@pytest.fixture
+def pipeline_runs() -> list[dict[str, Any]]:
+    return fxt.get_anymarkup("pipeline_runs.yaml")
+
+
+# No min/max settings, we go with whatever "days" says
+def test_days(now: datetime, pipeline_runs: list[dict[str, Any]]) -> None:
+    retention = PipelineProviderRetention(days=1, minimum=None, maximum=None)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 4
+
+    retention = PipelineProviderRetention(days=2, minimum=None, maximum=None)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 2
+
+
+# Minimum set, it takes precedence over "days"
+def test_days_and_minimum(now: datetime, pipeline_runs: list[dict[str, Any]]) -> None:
+    retention = PipelineProviderRetention(days=1, minimum=5, maximum=None)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 1
+    # We would have removed four from the "days" setting, we can only remove one
+
+    retention = PipelineProviderRetention(days=1, minimum=3, maximum=None)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 3
+    # We would have removed four from the "days" setting, we can only remove three
+
+    retention = PipelineProviderRetention(days=1, minimum=1, maximum=None)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 4
+    # Removing 4 we still have two, we're fine.
+
+
+# Maximum set, it takes precedence over "days"
+def test_days_and_maximum(now: datetime, pipeline_runs: list[dict[str, Any]]) -> None:
+    retention = PipelineProviderRetention(days=1, minimum=None, maximum=1)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 5
+    # we have a max of 1, no matter what "days" says.
+
+    retention = PipelineProviderRetention(days=1, minimum=None, maximum=3)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 4
+    # by removing 4 we comply with the max setting of three.
+
+    retention = PipelineProviderRetention(days=2, minimum=None, maximum=3)
+    assert len(get_pipeline_runs_to_delete(pipeline_runs, retention, now)) == 3
+    # We would have remove only two following "days", but max tells us otherwise.