qontract-reconcile 0.10.1rc1005__py3-none-any.whl → 0.10.1rc1006__py3-none-any.whl

{qontract_reconcile-0.10.1rc1005.dist-info → qontract_reconcile-0.10.1rc1006.dist-info}/METADATA

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

@@ -99,7 +99,7 @@ reconcile/query_validator.py,sha256=BAjGrU8_VhzTOv5k0-uz0hY9ziZyconv8VAhgre1Auc,
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
 reconcile/resource_template_tester.py,sha256=DsKvBuNLPxm4Fa-e1YHHySnhThm5i_j-nF3G4b02Mz0,2416
-reconcile/saas_file_validator.py,sha256=ckQL14SfzRLiv1SA_0zB5A-a11Anvsgxp-1NbP8A_8Q,1938
+reconcile/saas_file_validator.py,sha256=QH8tPi2DrU2n9SIVfNEdDJXHPtlbwzlvklcB9RWPhOU,2521
 reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9D8,4773
 reconcile/service_dependencies.py,sha256=PMKP9vc6oL-78rzyF_RE8DzLSQMSqN8vCqt9sWpBLAM,4470
 reconcile/signalfx_endpoint_monitoring.py,sha256=Nqgsg1cflSd2nNnm89y_e8c--7xLUqTrKOHkDs-qADE,2868
@@ -262,6 +262,7 @@ reconcile/gql_definitions/common/pagerduty_instances.py,sha256=CqHMNyI0O1knfzLJo
 reconcile/gql_definitions/common/pgp_reencryption_settings.py,sha256=NPLmO6J-zSu5B9QiYbDezLHY3TuOO9ihRBV-Zr84R9w,2259
 reconcile/gql_definitions/common/pipeline_providers.py,sha256=JJgmmghqLIwjKOdcWYHPnf4PDgAq4GF7046i0ozrqgI,9127
 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=JZdFKBygaZVxGwBUYMki9EbnsGdmfmxuAreMZ3dchwo,16702
 reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=4VYP2VbwY8WVwtSFk2-jsUNhSmRD3X4FWKxetOKvmd0,2835
@@ -545,7 +546,7 @@ reconcile/test/test_quay_repos.py,sha256=TdkcRF_a8PLp01Kti9eZZN-vGup2yPBT4Iba3k0
 reconcile/test/test_queries.py,sha256=SpH3RmNpBjEr_ne3VjAMCgKK8RE1z1zo7bypkT5uoO4,1946
 reconcile/test/test_repo_owners.py,sha256=uRYMLbMmh-9usF0TerabZTZV-Z1CS4I6ybT-LQqCLe8,1423
 reconcile/test/test_requests_sender.py,sha256=7fd9C2kEFS0-CYtlsif66N1kO9c44pzuBPAJKR9igqU,5385
-reconcile/test/test_saasherder.py,sha256=EMzqoAOFVbeFPuz4oG81srkuNfInHSu4smoArLheUa4,57234
+reconcile/test/test_saasherder.py,sha256=SXhjDhpmWNM3xWtOGWn5j6BeznuXDwlttVcUtp9drpo,58014
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=pTUGvJ2S2wF3PhJyGWmiNXG52QtXKy2cbu-G8Ymrv6I,5019
@@ -618,7 +619,7 @@ reconcile/typed_queries/namespaces.py,sha256=vItPrn7sfcHOix-VvkzQkf54_ljzI_ymyxh
 reconcile/typed_queries/namespaces_minimal.py,sha256=rUtqNQ0ORXXUTQfnpsMURymAJ4gYtE77V-Lb3LiJFEY,278
 reconcile/typed_queries/ocm.py,sha256=aTXW9NaMpMq-90sBUAUQmGPtk6Hnsk2rzSbXv3pD8dY,312
 reconcile/typed_queries/pagerduty_instances.py,sha256=zxCNxMak4iikryePaRi71lTADV2k8UXPZvwz8bFFy_U,486
-reconcile/typed_queries/quay.py,sha256=OvkSDDbS3o4a4W5MqVxTAVmo47p5XegeoEVNiuqsevg,242
+reconcile/typed_queries/quay.py,sha256=3IMy9jjHF2f9t47EXZOQVA3p0nFkWFhaFhxhvib-71o,644
 reconcile/typed_queries/repos.py,sha256=8A93dKDt6igT4ClqMjt7YUTsoP4qh1Wnm0W3xsMgj48,824
 reconcile/typed_queries/reserved_networks.py,sha256=-f_CIrTn8u-dotj5VKFlAcD7TX1CSSuR7Ko2zC8OKEM,358
 reconcile/typed_queries/saas_files.py,sha256=lPJNh5F2ThJUjW2zvsCKPLm2DVNBnbHFbzWByqTg2uM,14012
@@ -806,7 +807,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=8yKSNuwLVJaJnOxGOHjhFaRqEmEbJxKqBj1-phI618o,84863
+reconcile/utils/saasherder/saasherder.py,sha256=vaTQtDrJdm5wU8z0ROqEI-ewbzCkKAlHsEpP01Royvg,85048
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -857,8 +858,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1005.dist-info/METADATA,sha256=ghM_m_o_Ig_BZqOUBeZmvzWuu4Lj4lnA-XiPOnYv7mk,2263
-qontract_reconcile-0.10.1rc1005.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc1005.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1005.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1005.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1006.dist-info/METADATA,sha256=N8FEuHE8ofYd2AbKUrxdFAxGzP86kKKawj2bbGdt_QM,2263
+qontract_reconcile-0.10.1rc1006.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc1006.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1006.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1006.dist-info/RECORD,,

reconcile/gql_definitions/common/quay_orgs.py

@@ -0,0 +1,68 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query QuayOrgs {
+  orgs: quay_orgs_v1 {
+    name
+    instance {
+      url
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class QuayInstanceV1(ConfiguredBaseModel):
+    url: str = Field(..., alias="url")
+
+
+class QuayOrgV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    instance: QuayInstanceV1 = Field(..., alias="instance")
+
+
+class QuayOrgsQueryData(ConfiguredBaseModel):
+    orgs: Optional[list[QuayOrgV1]] = Field(..., alias="orgs")
+
+
+def query(query_func: Callable, **kwargs: Any) -> QuayOrgsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        QuayOrgsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return QuayOrgsQueryData(**raw_data)

reconcile/saas_file_validator.py

@@ -7,6 +7,7 @@ from reconcile.status import ExitCodes
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
+from reconcile.typed_queries.quay import get_quay_instances, get_quay_orgs
 from reconcile.typed_queries.repos import get_repos
 from reconcile.typed_queries.saas_files import (
     get_saas_files,
@@ -48,6 +49,18 @@ def run(dry_run: bool, defer: Callable | None = None) -> None:
     missing_repos = [r for r in saasherder.repo_urls if r not in app_int_repos]
     for r in missing_repos:
         logging.error(f"repo is missing from codeComponents: {r}")
+    app_int_quay_instances = {i.url for i in get_quay_instances()}
+    app_int_quay_orgs = {(o.instance.url, o.name) for o in get_quay_orgs()}
+    missing_image_patterns = [
+        p
+        for p in saasherder.image_patterns
+        if (parts := p.split("/"))
+        and parts[0] in app_int_quay_instances
+        and len(parts) >= 2
+        and (parts[0], parts[1]) not in app_int_quay_orgs
+    ]
+    for p in missing_image_patterns:
+        logging.error(f"image pattern is missing from quayOrgs: {p}")
     jjb: JJB = init_jjb(secret_reader)
     saasherder.validate_upstream_jobs(jjb)
     if not saasherder.valid or missing_repos:

reconcile/test/test_saasherder.py

@@ -910,6 +910,27 @@ class TestCollectRepoUrls(TestCase):
         self.assertEqual({repo_url}, saasherder.repo_urls)
 
 
+@pytest.mark.usefixtures("inject_gql_class_factory")
+class TestCollectImagePatterns(TestCase):
+    def setUp(self) -> None:
+        self.saas_file = self.gql_class_factory(  # type: ignore[attr-defined] # it's set in the fixture
+            SaasFile, Fixtures("saasherder").get_anymarkup("saas.gql.yml")
+        )
+
+    def test_collect_image_patterns(self) -> None:
+        image_pattern = "quay.io/centos/centos:centos8"
+        saasherder = SaasHerder(
+            [self.saas_file],
+            secret_reader=MockSecretReader(),
+            thread_pool_size=1,
+            integration="",
+            integration_version="",
+            hash_length=7,
+            repo_url="https://repo-url.com",
+        )
+        self.assertEqual({image_pattern}, saasherder.image_patterns)
+
+
 @pytest.mark.usefixtures("inject_gql_class_factory")
 class TestGetSaasFileAttribute(TestCase):
     def setUp(self) -> None:

reconcile/typed_queries/quay.py

@@ -1,7 +1,23 @@
-from reconcile.gql_definitions.common.quay_instances import QuayInstanceV1, query
+from reconcile.gql_definitions.common.quay_instances import (
+    QuayInstanceV1,
+)
+from reconcile.gql_definitions.common.quay_instances import (
+    query as quay_instances_query,
+)
+from reconcile.gql_definitions.common.quay_orgs import (
+    QuayOrgV1,
+)
+from reconcile.gql_definitions.common.quay_orgs import (
+    query as quay_orgs_query,
+)
 from reconcile.utils import gql
 
 
 def get_quay_instances() -> list[QuayInstanceV1]:
-    data = query(gql.get_api().query)
+    data = quay_instances_query(gql.get_api().query)
     return list(data.instances or [])
+
+
+def get_quay_orgs() -> list[QuayOrgV1]:
+    data = quay_orgs_query(gql.get_api().query)
+    return list(data.orgs or [])

reconcile/utils/saasherder/saasherder.py

@@ -124,6 +124,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         self.error_registered = False
         self.saas_files = saas_files
         self.repo_urls = self._collect_repo_urls()
+        self.image_patterns = self._collect_image_patterns()
         self.resolve_templated_parameters(self.saas_files)
         if validate:
             self._validate_saas_files()
@@ -707,6 +708,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             for rt in saas_file.resource_templates
         }
 
+    def _collect_image_patterns(self) -> set[str]:
+        return {p for sf in self.saas_files for p in sf.image_patterns}
+
     @staticmethod
     def _get_file_contents_github(repo: Repository, path: str, commit_sha: str) -> str:
         f = repo.get_contents(path, commit_sha)