qontract-reconcile 0.10.2.dev167__py3-none-any.whl → 0.10.2.dev169__py3-none-any.whl

{qontract_reconcile-0.10.2.dev167.dist-info → qontract_reconcile-0.10.2.dev169.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev167
+Version: 0.10.2.dev169
 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.dev167.dist-info → qontract_reconcile-0.10.2.dev169.dist-info}/RECORD

@@ -17,12 +17,12 @@ reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4
 reconcile/dashdotdb_cso.py,sha256=QRK0YfIqO4rehs8btD3l_GXIO2ZIycTQEKEthBdB0xA,3639
 reconcile/dashdotdb_dora.py,sha256=olQnGp4JYpoh1lQEf9kHc2y3bMaAIUXEB6eFohWH8Io,17859
 reconcile/dashdotdb_dvo.py,sha256=lCkZ0iby6HrNQb-3kYb6xrt8wCjVUZYxKzz9SiStfHU,8946
-reconcile/dashdotdb_slo.py,sha256=PU1GzT6Uy07IIO3Y62cFfRfaBJYUPrMkMp71Up80_bg,8334
+reconcile/dashdotdb_slo.py,sha256=TvKdMOtUZcZP9QydcUJMKh0zURHgOMN_RTpQpCkD1Z8,3960
 reconcile/database_access_manager.py,sha256=Z3aAmw2LsmMIIor-bOGzziVZdVNC82Gmw8oHBUAFf-8,25577
 reconcile/deadmanssnitch.py,sha256=n-5W-djUgwzpmdDM4eQIZpkkDmHY0vndt-42LJXI4Y8,7491
 reconcile/email_sender.py,sha256=38Wvl6WHqCwlqLx4oxVJOIeDmoJsyitD3g1F4jTkAj8,4246
 reconcile/gabi_authorized_users.py,sha256=Jwvo97nzUX3NIl2VHKuZlT0-I40qk2VnACbafe91T2o,4854
-reconcile/gcp_image_mirror.py,sha256=M5pimd0j13BBWCa8vX0fftWO0pHBfQCATIIpOGggDSA,10332
+reconcile/gcp_image_mirror.py,sha256=1ThuUff_04ZdF6uxcLoDuHhoNA3OIw0V-z0-CwdPE2w,9538
 reconcile/github_org.py,sha256=Wc5cZamatuWsW2ZJT2ib5ps8l3iY3RXHwNUxVJerqz0,14173
 reconcile/github_owners.py,sha256=viE1KJ-zaTxuZ5yItg2C263J0brn-Q-3hR_DkYDMbhY,3122
 reconcile/github_repo_invites.py,sha256=U9UCzNVwrZ7MqODtFah8ogH0NNY-XjBin7G9gqHtCUY,2690
@@ -90,7 +90,7 @@ reconcile/openshift_users.py,sha256=JUWLb13USlQ4KvXZVsi3JES4csZnXlH0plhxskg_p6A,
 reconcile/openshift_vault_secrets.py,sha256=9rTqV6wzCQx2Oh712E_Xj8wMG7u8Oh-pY8DWjlv4mZw,1660
 reconcile/quay_base.py,sha256=h5xNjb7EZm8L2JgpO42r6w0UA4im5dabZXJSIW69zKU,1987
 reconcile/quay_membership.py,sha256=cmeoRdr3-wVlymNHVhzhW0W-Tq6qt1hd2OOIhGXsmrY,6398
-reconcile/quay_mirror.py,sha256=0KtQFwrvMNtlsPJ9F_-ICaVIjgIUjFxqipvAPcvyg3Q,15338
+reconcile/quay_mirror.py,sha256=PBooiA0ShZpWYfO6oeKFqYYT6Syi7Q8JJD9kj0wRRLg,14030
 reconcile/quay_mirror_org.py,sha256=tXKuF6JtmaNRwu8_g_65U_Vpd6sFBYeXmJA-flVhylE,10764
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
@@ -227,7 +227,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=wNGZv8V6ivviCcwPLw34nzTR5fgwKRyE68Z93HbmBBs,2296576
+reconcile/gql_definitions/introspection.json,sha256=zD5QWpv9KYduZHr8a6dFoGz-oSHM1ItN1Trn02Lh7XQ,2297479
 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=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -295,7 +295,7 @@ reconcile/gql_definitions/common/pipeline_providers.py,sha256=9rpsqPuvj82B4ki56x
 reconcile/gql_definitions/common/quay_instances.py,sha256=toBkdYYVTmEafezAHZKgaW-mQ29xEW6jeronzsAlNyI,1786
 reconcile/gql_definitions/common/quay_orgs.py,sha256=NhA8kqvVUDbrsryEvEL5mlIv5R3T4XNhSRXtfL_yptY,1788
 reconcile/gql_definitions/common/reserved_networks.py,sha256=yP9qSQCaSQcva-ZgTnZp09qH27ur5_qK080ToIs04MY,2560
-reconcile/gql_definitions/common/saas_files.py,sha256=DA6aJspbuoSkVHlFI4HQ-YjdE5iN3eVg1k2lNtW0840,16863
+reconcile/gql_definitions/common/saas_files.py,sha256=d1L_S5LgCMa4QuAqZGQYTWb5L_nPCOxSEjU4O__OeBU,17728
 reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=4VYP2VbwY8WVwtSFk2-jsUNhSmRD3X4FWKxetOKvmd0,2835
 reconcile/gql_definitions/common/saasherder_settings.py,sha256=nqQLcMwYxLseqq0BEcVvmrpIj2eQq0h8XDSpLN6GGCw,1793
 reconcile/gql_definitions/common/slack_workspaces.py,sha256=2o0kgi4QiaRuNmZJnc_By4F6NsKIdRaXkrufRQw7Nok,1753
@@ -307,7 +307,7 @@ reconcile/gql_definitions/cost_report/app_names.py,sha256=fzqYXyiTSll359J1F1o7qa
 reconcile/gql_definitions/cost_report/cost_namespaces.py,sha256=URRozAgSa9OnkqOCZf3MGH21_wcnsqYl0n-olXdjQH0,2286
 reconcile/gql_definitions/cost_report/settings.py,sha256=0nhBDJ5MZ1m7XkNDGrRLmsnUbzqZ4WRh_DDEEzKhcxU,2153
 reconcile/gql_definitions/dashdotdb_slo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py,sha256=MYYpVOc8Ze9w7k6-tlUkp5OaPG_5bqHPS5FhfWTw00U,4335
+reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py,sha256=a1zLeL_NCbK25fOeT1gZOch8HNPFcHhzVXQty3jKT_s,2430
 reconcile/gql_definitions/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/dynatrace_token_provider/dynatrace_bootstrap_tokens.py,sha256=5gTuAnR2rnx2k6Rn7FMEAzw6GCZ6F5HZbqkmJ9-3NI4,2244
 reconcile/gql_definitions/dynatrace_token_provider/token_specs.py,sha256=XGsMuB8gowRpqJjkD_KRomx-1OswzyWbF4qjVdhionk,2555
@@ -350,6 +350,7 @@ reconcile/gql_definitions/fragments/prometheus_instance.py,sha256=12ltnV9kdEw6Ln
 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
 reconcile/gql_definitions/fragments/resource_values.py,sha256=-N2lNRhWp8PgocmIeX3U9f3l90Q97N2lXoq1pXdb_LE,742
+reconcile/gql_definitions/fragments/saas_slo_document.py,sha256=6Ko_Kqny9gixPLKwr8RHL6DNx32rkNV24myurCVko-Q,2635
 reconcile/gql_definitions/fragments/saas_target_namespace.py,sha256=6f6WaerElaRi9_Ro-0CyWUkMHsbXlm0h9YXklftBwag,3991
 reconcile/gql_definitions/fragments/serviceaccount_token.py,sha256=2pG4rxAjvT-YsFBnm4zl301i7DCYznp99HOEGA-216I,1117
 reconcile/gql_definitions/fragments/terraform_state.py,sha256=S5QuTR9YlvUObiU7hevS9ybxZEssWoRGqCR9YtGwePs,1024
@@ -650,6 +651,7 @@ reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs
 reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
 reconcile/utils/promtool.py,sha256=xmPBWEApkk0L2qZBAvTxakNXxfTz-tVLPFxGnpsxXnM,2831
 reconcile/utils/quay_api.py,sha256=uE_jxcdy3ViHtYFAfwDQuFDaO7Pr6AAPoVnmORbyHio,7822
+reconcile/utils/quay_mirror.py,sha256=dpWCNv5lITwIk6Q9RkmqaQKHNk_JPy27UQEribJ7E-U,1324
 reconcile/utils/raw_github_api.py,sha256=2WKtE8ABYYB9UGOAh9N_kLkksBWL3320Z2_scteZddI,2805
 reconcile/utils/repo_owners.py,sha256=BHrAXxKyvn4qWJwFPWYGTtfgnLmYnWtYFEJGFeD__FE,6573
 reconcile/utils/rest_api_base.py,sha256=MT7tp6CQO2S5aKfVOzw_hipWg7wAGoOqkm4qurI1hEU,4342
@@ -658,6 +660,7 @@ reconcile/utils/secret_reader.py,sha256=MaP56KZaAE35EyYbgAitdm6fUSxdzWeGFSOym9qi
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
 reconcile/utils/sharding.py,sha256=DDBHfs5TT9UgjmzewiXUjbncnrPuceAZWeOA4veGa7s,843
 reconcile/utils/slack_api.py,sha256=iaOFzv3wiZRhcgYK2NB4lsG6ymNsGk2MEuj0PgZVp7w,17355
+reconcile/utils/slo_document_manager.py,sha256=CPgM2oH4AVzBqenakWo59R5yfwB62tnxSnSOHgir7l8,9500
 reconcile/utils/smtp_client.py,sha256=0xefB4I9E5eBB-FlxFJYjvz3Kvuqi_K3Ma_Wk0NAQKM,2779
 reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41Fg,2265
 reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,16378
@@ -804,7 +807,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.dev167.dist-info/METADATA,sha256=gC7vJiajfAcAoktNwpvYbj0FZ0-Lje0pXtytx7-S-Tc,24627
-qontract_reconcile-0.10.2.dev167.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev167.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev167.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev169.dist-info/METADATA,sha256=4jU4ZsBrELF7np1OLiyWn5SGED63Y6QaiZhwOVGyvh4,24627
+qontract_reconcile-0.10.2.dev169.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev169.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev169.dist-info/RECORD,,

reconcile/dashdotdb_slo.py

@@ -1,11 +1,6 @@
-from collections.abc import Iterable
-from dataclasses import dataclass
-from math import isnan
 from typing import Any
 
-import jinja2
 import requests
-from requests import Response
 from sretoolbox.utils import threaded
 
 from reconcile.dashdotdb_base import (
@@ -13,9 +8,9 @@ from reconcile.dashdotdb_base import (
     DashdotdbBase,
 )
 from reconcile.gql_definitions.dashdotdb_slo.slo_documents_query import (
-    SLODocumentV1,
     query,
 )
+from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
@@ -24,40 +19,22 @@ from reconcile.utils.secret_reader import (
     SecretReaderBase,
     create_secret_reader,
 )
+from reconcile.utils.slo_document_manager import (
+    SLODetails,
+    SLODocumentManager,
+)
 
 QONTRACT_INTEGRATION = "dashdotdb-slo"
+READ_TIMEOUT = 300
+MAX_RETRIES = 2
 
 
-def get_slo_documents() -> list[SLODocumentV1]:
+def get_slo_documents() -> list[SLODocument]:
     gqlapi = gql.get_api()
     data = query(gqlapi.query)
     return list(data.slo_documents or [])
 
 
-@dataclass
-class ServiceSLO:
-    name: str
-    sli_type: str
-    slo_doc_name: str
-    namespace_name: str
-    cluster_name: str
-    service_name: str
-    value: float
-    target: float
-
-    def dashdot_payload(self) -> dict[str, Any]:
-        return {
-            "name": self.name,
-            "SLIType": self.sli_type,
-            "SLODoc": {"name": self.slo_doc_name},
-            "namespace": {"name": self.namespace_name},
-            "cluster": {"name": self.cluster_name},
-            "service": {"name": self.service_name},
-            "value": self.value,
-            "target": self.target,
-        }
-
-
 class DashdotdbSLO(DashdotdbBase):
     def __init__(
         self, dry_run: bool, thread_pool_size: int, secret_reader: SecretReaderBase
@@ -70,19 +47,28 @@ class DashdotdbSLO(DashdotdbBase):
             secret_reader=secret_reader,
         )
 
-    def _post(self, service_slos: Iterable[ServiceSLO]) -> Response | None:
-        for item in service_slos:
-            LOG.debug(f"About to POST SLO JSON item to dashdotDB:\n{item}\n")
-
-        response = None
-
-        for item in service_slos:
-            slo_name = item.name
-            endpoint = f"{self.dashdotdb_url}/api/v1/serviceslometrics/{slo_name}"
-            payload = item.dashdot_payload()
-            if self.dry_run:
-                continue
+    @staticmethod
+    def get_dash_dot_db_payload(slo: SLODetails) -> dict[str, Any]:
+        return {
+            "name": slo.slo.name,
+            "SLIType": slo.slo.sli_type,
+            "SLODoc": {"name": slo.slo_document_name},
+            "namespace": {"name": slo.namespace_name},
+            "cluster": {"name": slo.cluster_name},
+            "service": {"name": slo.service_name},
+            "value": slo.current_slo_value,
+            "target": slo.slo.slo_target,
+        }
 
+    def _post(self, service_slo: SLODetails) -> None:
+        LOG.debug(f"About to POST SLO JSON item to dashdotDB:\n{service_slo}\n")
+        slo_name = service_slo.slo.name
+        endpoint = f"{self.dashdotdb_url}/api/v1/serviceslometrics/{slo_name}"
+        if service_slo.slo.slo_target_unit == "percent_0_1":
+            service_slo.current_slo_value *= 100
+            service_slo.slo.slo_target *= 100
+        payload = self.get_dash_dot_db_payload(service_slo)
+        if not self.dry_run:
             LOG.info("%s syncing slo %s", self.logmarker, slo_name)
             try:
                 response = self._do_post(endpoint, payload)
@@ -94,127 +80,30 @@ class DashdotdbSLO(DashdotdbBase):
                 LOG.error("%s error posting %s - %s", self.logmarker, slo_name, details)
 
             LOG.info("%s slo %s synced", self.logmarker, slo_name)
-        return response
-
-    def _get_service_slo(self, slo_document: SLODocumentV1) -> list[ServiceSLO]:
-        LOG.debug("SLO: processing %s", slo_document.name)
-        result: list[ServiceSLO] = []
-        for namespace_access in slo_document.namespaces:
-            if (
-                namespace_access.slo_namespace
-                and namespace_access.prometheus_access is None
-            ):
-                continue
-
-            ns = namespace_access.namespace
-            promtoken: str | None = None
-            username: str | None = None
-            password: str | None = None
-            if namespace_access.prometheus_access:
-                promurl = namespace_access.prometheus_access.url
-                if (
-                    namespace_access.prometheus_access.username
-                    and namespace_access.prometheus_access.password
-                ):
-                    username = self.secret_reader.read_secret(
-                        namespace_access.prometheus_access.username
-                    )
-                    password = self.secret_reader.read_secret(
-                        namespace_access.prometheus_access.password
-                    )
-            else:
-                promurl = ns.cluster.prometheus_url
-                if not ns.cluster.automation_token:
-                    LOG.error(
-                        "namespace does not have automation token set %s - skipping", ns
-                    )
-                    continue
-                promtoken = self._get_automation_token(ns.cluster.automation_token)
-            for slo in slo_document.slos or []:
-                unit = slo.slo_target_unit
-                expr = slo.expr
-                template = jinja2.Template(expr)
-                window = slo.slo_parameters.window
-                promquery = template.render({"window": window})
-
-                try:
-                    prom_response = self._promget(
-                        url=promurl,
-                        params={"query": (f"{promquery}")},
-                        token=promtoken,
-                        username=username,
-                        password=password,
-                    )
-                except requests.exceptions.ConnectionError as error:
-                    # This can happen when prometheus is unreachable, or when running locally
-                    # and some prometheus URL are openshift service names. The trick is to run
-                    # with `oc port-forward` and update the local hosts file if we need to query those.
-                    LOG.error(
-                        f"{self.logmarker} Could not reach prometheus at {promurl}: {error}."
-                        f"Skipping SLOs from SLO doc {slo_document.name}"
-                    )
-                    # cannot connect to this prometheus, skip all
-                    raise
-                except requests.exceptions.HTTPError as error:
-                    LOG.error(
-                        f"{self.logmarker} Error wile querying {promurl}: {error}."
-                        f"Skipping SLO '{slo.name} from SLO doc {slo_document.name}"
-                    )
-                    # it could be a query issue, keep processing other SLOs from this doc
-                    continue
-
-                prom_result = prom_response["data"]["result"]
-                if not prom_result:
-                    continue
-
-                slo_value = prom_result[0]["value"]
-                if not slo_value:
-                    continue
-
-                slo_value = float(slo_value[1])
-                if isnan(slo_value):
-                    LOG.warning(
-                        f"{self.logmarker} Skipping SLO '{slo.name}' in SLO doc '{slo_document.name}'"
-                        "as the obtained value is not a number (maybe a division by 0?)"
-                    )
-                    continue
-                slo_target = float(slo.slo_target)
-
-                # In Dash.DB we want to always store SLOs in percentages
-                if unit == "percent_0_1":
-                    slo_value *= 100
-                    slo_target *= 100
-
-                result.append(
-                    ServiceSLO(
-                        name=slo.name,
-                        sli_type=slo.sli_type,
-                        namespace_name=ns.name,
-                        cluster_name=ns.cluster.name,
-                        service_name=ns.app.name,
-                        value=slo_value,
-                        target=slo_target,
-                        slo_doc_name=slo_document.name,
-                    )
-                )
-        return result
 
     def run(self) -> None:
         slo_documents = get_slo_documents()
 
-        service_slos: list[list[ServiceSLO]] = threaded.run(
-            func=self._get_service_slo,
-            iterable=slo_documents,
+        slo_document_manager = SLODocumentManager(
+            slo_documents=slo_documents,
+            secret_reader=self.secret_reader,
             thread_pool_size=self.thread_pool_size,
+            read_timeout=READ_TIMEOUT,
+            max_retries=MAX_RETRIES,
         )
 
+        slo_details_list = slo_document_manager.get_current_slo_list()
+        valid_slo_list = [slo for slo in slo_details_list if slo]
+
         self._get_token()
-        threaded.run(
-            func=self._post,
-            iterable=service_slos,
-            thread_pool_size=self.thread_pool_size,
-        )
-        self._close_token()
+        try:
+            threaded.run(
+                func=self._post,
+                iterable=valid_slo_list,
+                thread_pool_size=self.thread_pool_size,
+            )
+        finally:
+            self._close_token()
 
 
 def run(dry_run: bool = False, thread_pool_size: int = 10) -> None:

reconcile/gcp_image_mirror.py

@@ -1,7 +1,6 @@
 import base64
 import logging
 import os
-import re
 import tempfile
 import time
 from typing import Any, Self
@@ -23,6 +22,7 @@ from reconcile.gql_definitions.fragments.container_image_mirror import (
 )
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 from reconcile.utils import gql
+from reconcile.utils.quay_mirror import record_timestamp, sync_tag
 from reconcile.utils.secret_reader import SecretReader
 
 QONTRACT_INTEGRATION = "gcp-image-mirror"
@@ -112,25 +112,6 @@ class QuayMirror:
 
         return summary
 
-    @staticmethod
-    def sync_tag(
-        tags: list[str] | None, tags_exclude: list[str] | None, candidate: str
-    ) -> bool:
-        if tags is not None:
-            # When tags is defined, we don't look at tags_exclude
-            return any(re.match(tag, candidate) for tag in tags)
-
-        if tags_exclude is not None:
-            return any(re.match(tag, candidate) for tag in tags_exclude)
-            for tag_exclude in tags_exclude:
-                if re.match(tag_exclude, candidate):
-                    return False
-            return True
-
-        # Both tags and tags_exclude are None, so
-        # tag must be synced
-        return True
-
     # second layer of processing that matches up pull/push creds with each repo and determines what tags need to be synced
     def process_sync_tasks(self, repos_to_sync: list[ImageSyncItem]) -> list[SyncTask]:
         eight_hours = 28800  # 60 * 60 * 8
@@ -165,7 +146,7 @@ class QuayMirror:
             )
 
             for tag in image_mirror:
-                if not self.sync_tag(
+                if not sync_tag(
                     tags=item.mirror.tags,
                     tags_exclude=item.mirror.tags_exclude,
                     candidate=tag,
@@ -234,12 +215,12 @@ class QuayMirror:
             with open(control_file_path, encoding="locale") as file_obj:
                 last_deep_sync = float(file_obj.read())
         except FileNotFoundError:
-            self._record_timestamp(control_file_path)
+            record_timestamp(control_file_path)
             return True
 
         next_deep_sync = last_deep_sync + interval
         if time.time() >= next_deep_sync:
-            self._record_timestamp(control_file_path)
+            record_timestamp(control_file_path)
             return True
 
         return False
@@ -249,11 +230,6 @@ class QuayMirror:
         token = base64.b64decode(raw_data["token"]).decode()
         return f"{raw_data['user']}:{token}"
 
-    @staticmethod
-    def _record_timestamp(path: str) -> None:
-        with open(path, "w", encoding="locale") as file_object:
-            file_object.write(str(time.time()))
-
     def _get_push_creds(self) -> dict[str, str]:
         result = gql_gcp_projects.query(query_func=self.gqlapi.query)
 

reconcile/gql_definitions/common/saas_files.py

@@ -18,6 +18,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 )
 
 from reconcile.gql_definitions.fragments.oc_connection_cluster import OcConnectionCluster
+from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
 from reconcile.gql_definitions.fragments.saas_target_namespace import SaasTargetNamespace
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
@@ -53,6 +54,50 @@ fragment OcConnectionCluster on Cluster_v1 {
   }
 }
 
+fragment SLODocument on SLODocument_v1 {
+    name
+    namespaces {
+      prometheusAccess {
+         url
+         username {
+         ... VaultSecret
+         }
+         password {
+           ... VaultSecret
+         }
+      }
+      namespace {
+        name
+        app {
+          name
+        }
+        cluster {
+          name
+          automationToken {
+          ... VaultSecret
+          }
+          prometheusUrl
+          spec {
+            private
+          }
+        }
+      }
+      SLONamespace {
+        name
+      }
+    }
+    slos {
+      name
+      expr
+      SLIType
+      SLOParameters {
+        window
+      }
+      SLOTarget
+      SLOTargetUnit
+    }
+}
+
 fragment SaasTargetNamespace on Namespace_v1 {
   name
   labels
@@ -253,6 +298,9 @@ query SaasFiles {
         namespace {
           ...SaasTargetNamespace
         }
+        slos {
+         ...SLODocument 
+        }
         namespaceSelector {
           jsonPathSelectors {
             include
@@ -512,6 +560,7 @@ class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     path: Optional[str] = Field(..., alias="path")
     name: Optional[str] = Field(..., alias="name")
     namespace: Optional[SaasTargetNamespace] = Field(..., alias="namespace")
+    slos: Optional[list[SLODocument]] = Field(..., alias="slos")
     namespace_selector: Optional[SaasResourceTemplateTargetNamespaceSelectorV1] = Field(..., alias="namespaceSelector")
     provider: Optional[str] = Field(..., alias="provider")
     ref: str = Field(..., alias="ref")

reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py

@@ -17,19 +17,11 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
+from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
 
 
 DEFINITION = """
-fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
-}
-
-query SLODocuments {
-  slo_documents: slo_document_v1 {
+fragment SLODocument on SLODocument_v1 {
     name
     namespaces {
       prometheusAccess {
@@ -71,6 +63,18 @@ query SLODocuments {
       SLOTarget
       SLOTargetUnit
     }
+}
+
+fragment VaultSecret on VaultSecret_v1 {
+    path
+    field
+    version
+    format
+}
+
+query SLODocuments {
+  slo_documents: slo_document_v1 {
+  ... SLODocument
   }
 }
 """
@@ -82,64 +86,8 @@ class ConfiguredBaseModel(BaseModel):
         extra=Extra.forbid
 
 
-class SLOExternalPrometheusAccessV1(ConfiguredBaseModel):
-    url: str = Field(..., alias="url")
-    username: Optional[VaultSecret] = Field(..., alias="username")
-    password: Optional[VaultSecret] = Field(..., alias="password")
-
-
-class AppV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-
-
-class ClusterSpecV1(ConfiguredBaseModel):
-    private: bool = Field(..., alias="private")
-
-
-class ClusterV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    automation_token: Optional[VaultSecret] = Field(..., alias="automationToken")
-    prometheus_url: str = Field(..., alias="prometheusUrl")
-    spec: Optional[ClusterSpecV1] = Field(..., alias="spec")
-
-
-class NamespaceV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    app: AppV1 = Field(..., alias="app")
-    cluster: ClusterV1 = Field(..., alias="cluster")
-
-
-class SLONamespacesV1_NamespaceV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-
-
-class SLONamespacesV1(ConfiguredBaseModel):
-    prometheus_access: Optional[SLOExternalPrometheusAccessV1] = Field(..., alias="prometheusAccess")
-    namespace: NamespaceV1 = Field(..., alias="namespace")
-    slo_namespace: Optional[SLONamespacesV1_NamespaceV1] = Field(..., alias="SLONamespace")
-
-
-class SLODocumentSLOSLOParametersV1(ConfiguredBaseModel):
-    window: str = Field(..., alias="window")
-
-
-class SLODocumentSLOV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    expr: str = Field(..., alias="expr")
-    sli_type: str = Field(..., alias="SLIType")
-    slo_parameters: SLODocumentSLOSLOParametersV1 = Field(..., alias="SLOParameters")
-    slo_target: float = Field(..., alias="SLOTarget")
-    slo_target_unit: str = Field(..., alias="SLOTargetUnit")
-
-
-class SLODocumentV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    namespaces: list[SLONamespacesV1] = Field(..., alias="namespaces")
-    slos: Optional[list[SLODocumentSLOV1]] = Field(..., alias="slos")
-
-
 class SLODocumentsQueryData(ConfiguredBaseModel):
-    slo_documents: Optional[list[SLODocumentV1]] = Field(..., alias="slo_documents")
+    slo_documents: Optional[list[SLODocument]] = Field(..., alias="slo_documents")
 
 
 def query(query_func: Callable, **kwargs: Any) -> SLODocumentsQueryData: