qontract-reconcile 0.10.2.dev168__tar.gz → 0.10.2.dev170__tar.gz

{qontract_reconcile-0.10.2.dev168 → qontract_reconcile-0.10.2.dev170}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev168
+Version: 0.10.2.dev170
 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.dev168 → qontract_reconcile-0.10.2.dev170}/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)
 

{qontract_reconcile-0.10.2.dev168 → qontract_reconcile-0.10.2.dev170}/reconcile/quay_mirror.py

@@ -28,9 +28,9 @@ from reconcile.utils import (
     metrics,
     sharding,
 )
-from reconcile.utils.helpers import match_patterns
 from reconcile.utils.instrumented_wrappers import InstrumentedImage as Image
 from reconcile.utils.instrumented_wrappers import InstrumentedSkopeo as Skopeo
+from reconcile.utils.quay_mirror import record_timestamp, sync_tag
 from reconcile.utils.secret_reader import SecretReader
 
 _LOG = logging.getLogger(__name__)
@@ -136,7 +136,7 @@ class QuayMirror:
                     _LOG.error("skopeo command error message: '%s'", details)
 
         if self.is_compare_tags and not self.dry_run:
-            self.record_timestamp(self.control_file_path)
+            record_timestamp(self.control_file_path)
 
     @classmethod
     def process_repos_query(
@@ -203,40 +203,6 @@ class QuayMirror:
                     })
         return summary
 
-    @staticmethod
-    def sync_tag(
-        tags: Iterable[str] | None,
-        tags_exclude: Iterable[str] | None,
-        candidate: str,
-    ) -> bool:
-        """
-        Determine if the candidate tag should sync, tags_exclude check take precedence.
-        :param tags: regex patterns to filter, match means to sync, None means no filter
-        :param tags_exclude: regex patterns to filter, match means not to sync, None means no filter
-        :param candidate: tag to check
-        :return: bool, True means to sync, False means not to sync
-        """
-        if not tags and not tags_exclude:
-            return True
-
-        if not tags:
-            # only tags_exclude provided
-            assert tags_exclude  # mypy can't infer not None
-            return not match_patterns(tags_exclude, candidate)
-
-        if not tags_exclude:
-            # only tags provided
-            return match_patterns(tags, candidate)
-
-        # both tags and tags_exclude provided
-        return not match_patterns(
-            tags_exclude,
-            candidate,
-        ) and match_patterns(
-            tags,
-            candidate,
-        )
-
     def process_sync_tasks(self):
         if self.is_compare_tags:
             _LOG.warning("Making a compare-tags run. This is a slow operation.")
@@ -282,7 +248,7 @@ class QuayMirror:
                 tags_exclude = item["mirror"].get("tagsExclude")
 
                 for tag in image_mirror:
-                    if not self.sync_tag(
+                    if not sync_tag(
                         tags=tags, tags_exclude=tags_exclude, candidate=tag
                     ):
                         continue
@@ -390,11 +356,6 @@ class QuayMirror:
         next_compare_tags = last_compare_tags + interval
         return time.time() >= next_compare_tags
 
-    @staticmethod
-    def record_timestamp(path) -> None:
-        with open(path, "w", encoding="locale") as file_object:
-            file_object.write(str(time.time()))
-
     def _get_push_creds(self):
         result = self.gqlapi.query(self.QUAY_ORG_CATALOG_QUERY)
 

qontract_reconcile-0.10.2.dev170/reconcile/utils/quay_mirror.py

@@ -0,0 +1,42 @@
+import time
+from collections.abc import Iterable
+
+from reconcile.utils.helpers import match_patterns
+
+
+def record_timestamp(path: str) -> None:
+    with open(path, "w", encoding="locale") as file_object:
+        file_object.write(str(time.time()))
+
+
+def sync_tag(
+    tags: Iterable[str] | None,
+    tags_exclude: Iterable[str] | None,
+    candidate: str,
+) -> bool:
+    """
+    Determine if the candidate tag should sync, tags_exclude check take precedence.
+    :param tags: regex patterns to filter, match means to sync, None means no filter
+    :param tags_exclude: regex patterns to filter, match means not to sync, None means no filter
+    :param candidate: tag to check
+    :return: bool, True means to sync, False means not to sync
+    """
+    if tags:
+        if tags_exclude:
+            # both tags and tags_exclude provided
+            return not match_patterns(
+                tags_exclude,
+                candidate,
+            ) and match_patterns(
+                tags,
+                candidate,
+            )
+        else:
+            # only tags provided
+            return match_patterns(tags, candidate)
+    elif tags_exclude:
+        # only tags_exclude provided
+        return not match_patterns(tags_exclude, candidate)
+    else:
+        # neither tags nor tags_exclude provided
+        return True

{qontract_reconcile-0.10.2.dev168 → qontract_reconcile-0.10.2.dev170}/reconcile/utils/saasherder/interfaces.py

@@ -367,6 +367,8 @@ class ManagedResourceName(Protocol):
     resource: str
     resource_names: list[str]
 
+    def dict(self) -> dict[str, str]: ...
+
 
 class SaasFile(HasParameters, HasSecretParameters, Protocol):
     path: str

{qontract_reconcile-0.10.2.dev168 → qontract_reconcile-0.10.2.dev170}/reconcile/utils/saasherder/saasherder.py

@@ -1784,6 +1784,11 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 desired_target_config["saas_file_managed_resource_types"] = (
                     saas_file.managed_resource_types
                 )
+                if saas_file.managed_resource_names:
+                    desired_target_config["saas_file_managed_resource_names"] = [
+                        m.dict() for m in saas_file.managed_resource_names
+                    ]
+
                 desired_target_config["url"] = rt.url
                 desired_target_config["path"] = rt.path
                 # before the GQL classes are introduced, the parameters attribute