qontract-reconcile 0.10.2.dev18__py3-none-any.whl → 0.10.2.dev20__py3-none-any.whl

{qontract_reconcile-0.10.2.dev18.dist-info → qontract_reconcile-0.10.2.dev20.dist-info}/METADATA

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

@@ -185,7 +185,7 @@ reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_G
 reconcile/cna/assets/null.py,sha256=85mVh97atCoC0aLuX47poTZiyOthmziJeBsUw0c924w,1658
 reconcile/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/dynatrace_token_provider/dependencies.py,sha256=FuRUnK18EyJIIgFwQBZSskIG08mN2VQAcAcaJFTf8zc,2812
-reconcile/dynatrace_token_provider/integration.py,sha256=mfcfCKFTMehiXaClMXJHXe_GFsa9nCfgjnAl_T4a3P8,26267
+reconcile/dynatrace_token_provider/integration.py,sha256=usNTif2yrzWp7V24QHmMI1bd4QxwObYbxsqfJAYREXc,26576
 reconcile/dynatrace_token_provider/metrics.py,sha256=oP-6NTZENFdvWiS0krnmX6tq3xyOzQ8e6vS0CZWYUuw,1496
 reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU65TRI8zpdb8GJ0A,241
 reconcile/dynatrace_token_provider/ocm.py,sha256=MwYCZIxW4f-1jzFTxxN__sity6S8O7bbKUdyTFEVO7U,4325
@@ -197,12 +197,12 @@ reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRatta
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=NSaOeHqFEcMaMxNjJwuQZosolgsJ8XRVvwkEEBj9vrw,7730
 reconcile/external_resources/factories.py,sha256=TyJMaijDfPIFYks9i6dhKN7nSR1BoCkoBs1iPExKpcE,5493
-reconcile/external_resources/integration.py,sha256=gBVO5dE8JyZ3xYcYik-MTIp_18oU7_hpYc_oztyfElQ,6753
+reconcile/external_resources/integration.py,sha256=JF38M7R0Z4ADUTx57TZqSZH9k_xpPlbAxQAcGyIISuM,6925
 reconcile/external_resources/integration_secrets_sync.py,sha256=dX09O3r6KURziUYYfiki10orNjOGVma-XojhVqd0ww4,1667
-reconcile/external_resources/manager.py,sha256=eVaaGCaKDkc897xt5cA5-B4yYuS9VWR-Z7Uom0uSsG0,15971
+reconcile/external_resources/manager.py,sha256=q7Ezp-g3MhpH_t8zpNMH5wCzHvh-nERpHzvBPA1G1ng,17031
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
 reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMcVdISlxhzXE,3898
-reconcile/external_resources/model.py,sha256=YJylbAhetN9szpLUFd9jFqxCRMvSWXVxSC9OMQNV-wg,11316
+reconcile/external_resources/model.py,sha256=KdB3eYlopWOLQmvL1aICjm-kAPIlY2N_zSikcCFBQpk,11751
 reconcile/external_resources/reconciler.py,sha256=K9QvbQCIOCuOHnPIxQE_P_jFtrkF3dGo8d_cCCh08Ys,8973
 reconcile/external_resources/secrets_sync.py,sha256=50fK4fzgSz-K8uy5_DQQWA_ju_rTDYAC2HRymgfY7TA,16344
 reconcile/external_resources/state.py,sha256=ye8yjMoCtTHSRhDH7skFLDIHIuYTjisWYCTJrwnmbEw,9565
@@ -766,7 +766,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.dev18.dist-info/METADATA,sha256=vxQFz-cgRhQ5es2GJgtvVjOXk3OWWfS7nMbp4DAWsi0,24665
-qontract_reconcile-0.10.2.dev18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev18.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
-qontract_reconcile-0.10.2.dev18.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev20.dist-info/METADATA,sha256=dMYY6LBhL21XhtZxss8dwyRBMyK2ce1Yh7UvoUBK2bM,24665
+qontract_reconcile-0.10.2.dev20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev20.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
+qontract_reconcile-0.10.2.dev20.dist-info/RECORD,,

reconcile/dynatrace_token_provider/integration.py

@@ -37,12 +37,17 @@ from reconcile.utils.ocm.base import (
     OCMServiceLogSeverity,
 )
 from reconcile.utils.ocm.labels import subscription_label_filter
-from reconcile.utils.openshift_resource import QONTRACT_ANNOTATION_INTEGRATION
+from reconcile.utils.openshift_resource import (
+    QONTRACT_ANNOTATION_INTEGRATION,
+    QONTRACT_ANNOTATION_INTEGRATION_VERSION,
+)
 from reconcile.utils.runtime.integration import (
     NoParams,
     QontractReconcileIntegration,
 )
+from reconcile.utils.semver_helper import make_semver
 
+QONTRACT_INTEGRATION_VERSION = make_semver(2, 0, 1)
 QONTRACT_INTEGRATION = "dynatrace-token-provider"
 SYNCSET_AND_MANIFEST_ID = "ext-dynatrace-tokens-dtp"
 
@@ -65,10 +70,11 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
     def get_early_exit_desired_state(self, *args: Any, **kwargs: Any) -> dict[str, Any]:
         """Return the desired state for early exit."""
         return {
+            "version": QONTRACT_INTEGRATION_VERSION,
             "specs": {
                 spec.name: spec.dict()
                 for spec in get_dynatrace_token_provider_token_specs()
-            }
+            },
         }
 
     @property
@@ -577,6 +583,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                     "namespace": secret.namespace_name,
                     "annotations": {
                         QONTRACT_ANNOTATION_INTEGRATION: QONTRACT_INTEGRATION,
+                        QONTRACT_ANNOTATION_INTEGRATION_VERSION: QONTRACT_INTEGRATION_VERSION,
                     },
                 },
                 "data": data,

reconcile/external_resources/integration.py

@@ -3,6 +3,7 @@ from collections.abc import Callable
 from typing import Any
 
 from reconcile.external_resources.manager import (
+    ExternalResourceDryRunsValidator,
     ExternalResourcesInventory,
     ExternalResourcesManager,
     setup_factories,
@@ -89,6 +90,10 @@ def create_er_manager(
     m_inventory = load_module_inventory(get_modules())
     namespaces = [ns for ns in get_namespaces() if ns.external_resources]
     er_inventory = ExternalResourcesInventory(namespaces)
+    state_manager = ExternalResourcesStateDynamoDB(
+        aws_api=aws_api,
+        table_name=er_settings.state_dynamodb_table,
+    )
 
     if not workers_cluster:
         workers_cluster = er_settings.workers_cluster.name
@@ -104,10 +109,7 @@ def create_er_manager(
         ),
         er_inventory=er_inventory,
         module_inventory=m_inventory,
-        state_manager=ExternalResourcesStateDynamoDB(
-            aws_api=aws_api,
-            table_name=er_settings.state_dynamodb_table,
-        ),
+        state_manager=state_manager,
         reconciler=K8sExternalResourcesReconciler(
             controller=build_job_controller(
                 integration=QONTRACT_INTEGRATION,
@@ -128,6 +130,9 @@ def create_er_manager(
             thread_pool_size=thread_pool_size,
             dry_run=dry_run,
         ),
+        dry_runs_validator=ExternalResourceDryRunsValidator(
+            state_manager, er_inventory
+        ),
     )
 
 

reconcile/external_resources/manager.py

@@ -1,4 +1,5 @@
 import logging
+from collections import Counter
 from collections.abc import Iterable
 from datetime import UTC, datetime
 
@@ -19,6 +20,7 @@ from reconcile.external_resources.model import (
     ExternalResourceKey,
     ExternalResourceModuleConfiguration,
     ExternalResourceOrphanedResourcesError,
+    ExternalResourceOutputResourceNameDuplications,
     ExternalResourcesInventory,
     ExternalResourceValidationError,
     ModuleInventory,
@@ -73,6 +75,41 @@ def setup_factories(
     return of
 
 
+class ExternalResourceDryRunsValidator:
+    def __init__(
+        self,
+        state_manager: ExternalResourcesStateDynamoDB,
+        er_inventory: ExternalResourcesInventory,
+    ):
+        self.state_mgr = state_manager
+        self.er_inventory = er_inventory
+
+    def _check_output_resource_name_duplications(
+        self,
+    ) -> None:
+        specs = Counter(
+            (
+                spec.cluster_name,
+                spec.namespace_name,
+                spec.output_resource_name,
+            )
+            for spec in self.er_inventory.values()
+        )
+        if duplicates := [key for key, count in specs.items() if count > 1]:
+            raise ExternalResourceOutputResourceNameDuplications(duplicates)
+
+    def _check_orphaned_objects(self) -> None:
+        state_keys = self.state_mgr.get_all_resource_keys()
+        inventory_keys = set(self.er_inventory.keys())
+        orphans = state_keys - inventory_keys
+        if len(orphans) > 0:
+            raise ExternalResourceOrphanedResourcesError(orphans)
+
+    def validate(self) -> None:
+        self._check_orphaned_objects()
+        self._check_output_resource_name_duplications()
+
+
 class ExternalResourcesManager:
     def __init__(
         self,
@@ -84,6 +121,7 @@ class ExternalResourcesManager:
         er_inventory: ExternalResourcesInventory,
         factories: ObjectFactory[ExternalResourceFactory],
         secrets_reconciler: InClusterSecretsReconciler,
+        dry_runs_validator: ExternalResourceDryRunsValidator,
         thread_pool_size: int,
     ) -> None:
         self.state_mgr = state_manager
@@ -96,6 +134,7 @@ class ExternalResourcesManager:
         self.secrets_reconciler = secrets_reconciler
         self.errors: dict[ExternalResourceKey, ExternalResourceValidationError] = {}
         self.thread_pool_size = thread_pool_size
+        self.dry_runs_validator = dry_runs_validator
 
     def _get_reconcile_action(
         self, reconciliation: Reconciliation, state: ExternalResourceState
@@ -199,13 +238,6 @@ class ExternalResourcesManager:
             to_reconcile.add(r)
         return to_reconcile
 
-    def _check_orphaned_objects(self) -> None:
-        state_keys = self.state_mgr.get_all_resource_keys()
-        inventory_keys = set(self.er_inventory.keys())
-        orphans = state_keys - inventory_keys
-        if len(orphans) > 0:
-            raise ExternalResourceOrphanedResourcesError(orphans)
-
     def _get_reconciliation_status(
         self,
         r: Reconciliation,
@@ -374,7 +406,7 @@ class ExternalResourcesManager:
             self._sync_secrets(to_sync_keys=to_sync_keys | pending_sync_keys)
 
     def handle_dry_run_resources(self) -> None:
-        self._check_orphaned_objects()
+        self.dry_runs_validator.validate()
         desired_r = self._get_desired_objects_reconciliations()
         deleted_r = self._get_deleted_objects_reconciliations()
         reconciliations = desired_r.union(deleted_r)

reconcile/external_resources/model.py

@@ -45,6 +45,17 @@ class ExternalResourceOrphanedResourcesError(Exception):
         super().__init__("".join(msg))
 
 
+class ExternalResourceOutputResourceNameDuplications(Exception):
+    def __init__(self, duplicates: Iterable[tuple[str, str, str]]) -> None:
+        msg = [
+            "There are output_resource_name attribute duplications. ",
+            "output_resource_name must be unique within a cluster/namespace.\n"
+            "Duplications:\n",
+            "\n".join(map(str, duplicates)),
+        ]
+        super().__init__("".join(msg))
+
+
 class ExternalResourceValidationError(Exception):
     errors: list[str] = []